Make Element#[] return nil for empty attributes #39

adambeynon · adambeynon · commit 2b3dded3a754 · 2014-11-01T12:25:53.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## edge
 
+*   `Element#[]` and `Element#attr` now return `nil` for empty attributes,
+    instead of returning an empty string.
+
 *   Add `HTTP.setup` and `HTTP.setup=` to access `$.ajaxSetup`
 
 *   Add PATCH and HEAD support to `HTTP`
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'opal', github: 'opal/opal'
-# gem 'opal', path: '../opal'
+gem 'opal',       github: 'opal/opal'
+gem 'opal-rspec', github: 'opal/opal-rspec'
diff --git a/opal/opal-jquery/element.rb b/opal/opal-jquery/element.rb
@@ -90,14 +90,18 @@ def to_n
   end
 
   def [](name)
-    `self.attr(name) || ""`
+    `self.attr(name) || nil`
   end
 
-  def add_attribute name
-    self[name] = ''
+  def attr(name, value=nil)
+    if value.nil?
+      `self.attr(name) || nil`
+    else
+      `self.attr(name, value)`
+    end
   end
 
-  def has_attribute? name
+  def has_attribute?(name)
     `!!self.attr(name)`
   end
 
diff --git a/spec/element/attributes_spec.rb b/spec/element/attributes_spec.rb
@@ -45,19 +45,30 @@
       Element.find('#attr-foo')[:title].should == "Hello there!"
     end
 
-    it 'should return an empty string for an empty attribute value' do
-      Element.find('#attr-bar')[:title].should == ""
-      Element.find('#attr-baz')[:title].should == ""
+    it 'should return nil for an empty attribute' do
+      expect(Element.find('#attr-bar')[:title]).to be_nil
+      expect(Element.find('#attr-baz')[:title]).to be_nil
+    end
+  end
+
+  describe '#attr' do
+    it 'returns attributes from elements' do
+      expect(Element.find('#attr-foo').attr(:title)).to eq('Hello there!')
+    end
+
+    it 'returns nil for empty attributes' do
+      expect(Element.find('#attr-bar').attr(:title)).to be_nil
+      expect(Element.find('#attr-baz').attr(:title)).to be_nil
     end
   end
 
   describe '#[]=' do
     it 'should set the attr value on the element' do
       woosh = Element.find '#attr-woosh'
-      woosh[:title].should == ""
+      expect(woosh[:title]).to be_nil
 
       woosh[:title] = "Oranges"
-      woosh[:title].should == "Oranges"
+      expect(woosh[:title]).to eq('Oranges')
     end
 
     it 'should replace the old value for the attribute' do
