arbre2 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66fd31e6deecb33fd6421abc61f4ac53513b0964
-  data.tar.gz: c2a175e9c2b22df524ba2704c95254b0fae99f71
+  metadata.gz: 2a1f9811843c3bcfd91a24ddc44e76515421653d
+  data.tar.gz: 86ff8a7501ba4da8f51f1eb0fd025d2f8c8f7789
 SHA512:
-  metadata.gz: 8a640b9624f022b05324e720306b1fa6875b2061e686a5f6b37ba50c7745e62a3ab8b6f498ac0c2e85b232c5fcb7bd8a9b7d24ce2bd1a5a8db87bf479057623b
-  data.tar.gz: cae1590fd832a6287d548c61b6c149539facf9f80fee23d71d6474ba2be93e5ac3ed96dde47e7e87501c3d773b2db4539850021b13f9e4f34a4c74f7eee95316
+  metadata.gz: db0e2106409aed13d4486c913d1b5883906ce8185305b67f4c39a0e9536874d1b33edd07a25ffb818e6fd4c0cc045a5d61b70a28599ac6bad1e7f31f9557e6d4
+  data.tar.gz: 66e3d422569768883676c183b531c5b22165eb95be4a9baeafef2232cfdec0791d398c7b351c87b016527f199324271f0df5aacde3279c333cadcadc7738c498

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arbre2 (2.2.1)
+    arbre2 (2.2.2)
       activesupport
 
 GEM

data/lib/arbre.rb

@@ -18,6 +18,7 @@ require 'arbre/child_element_collection'
 
 require 'arbre/html/attributes'
 require 'arbre/html/class_list'
+require 'arbre/html/style_hash'
 require 'arbre/html/querying'
 require 'arbre/html/tag'
 require 'arbre/html/comment'

data/lib/arbre/html/attributes.rb

@@ -20,18 +20,18 @@ module Arbre
 
       def [](attribute)
         if attribute.to_s == 'class'
-          @attributes['class'] ||= ClassList.new
+          classes
+        elsif attribute.to_s == 'style'
+          style
         else
           @attributes[attribute.to_s]
         end
       end
       def []=(attribute, value)
         if attribute.to_s == 'class'
-          if value.present?
-            @attributes['class'] = ClassList.new(value)
-          else
-            remove 'class'
-          end
+          self.classes = value
+        elsif attribute.to_s == 'style'
+          self.style = value
         elsif value == true
           @attributes[attribute.to_s] = attribute.to_s
         elsif value
@@ -41,6 +41,30 @@ module Arbre
         end
       end
 
+      def classes
+        @attributes['class'] ||= ClassList.new
+      end
+
+      def classes=(value)
+        if value.present?
+          @attributes['class'] = ClassList.new(value)
+        else
+          remove 'class'
+        end
+      end
+
+      def style
+        @attributes['style'] ||= StyleHash.new
+      end
+
+      def style=(value)
+        if value.present?
+          @attributes['style'] = StyleHash.new(value)
+        else
+          remove 'style'
+        end
+      end
+
       def remove(attribute)
         @attributes.delete attribute.to_s
       end
@@ -67,6 +91,7 @@ module Arbre
       def pairs
         map do |name, value|
           next if name == 'class' && value.blank?
+          next if name == 'style' && value.blank?
           "#{html_escape(name)}=\"#{html_escape(value)}\""
         end
       end

data/lib/arbre/html/style_hash.rb

@@ -0,0 +1,55 @@
+module Arbre
+  module Html
+
+    # A style definition for an HTML element.
+    class StyleHash < Hash
+
+      def initialize(value = nil)
+        super()
+
+        case value
+        when String
+          parse value
+        when Hash
+          update value
+        end
+      end
+
+      def parse(value)
+        value.split(';').reject(&:blank?).each do |pair|
+          name, value = pair.split(':', 2)
+          next unless name && value
+          self[name.strip] = value.strip
+        end
+      end
+      private :parse
+
+      # Alias to the hash itself.
+      def style
+        self
+      end
+
+      # Make sure to store everything as dasherized values.
+      def []=(name, value)
+        super name.to_s.underscore.dasherize, value
+      end
+      def [](name)
+        super name.to_s.underscore.dasherize
+      end
+
+      def update(value)
+        value.each { |name, value| self[name] = value }
+      end
+
+      def delete(name)
+        super name.to_s.underscore.dasherize
+      end
+
+      def to_s
+        map{ |n, v| "#{n}: #{v};" }.join(' ')
+      end
+
+    end
+
+  end
+end

data/lib/arbre/html/tag.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/array/extract_options'
 require 'erb'
 
 module Arbre
@@ -239,6 +240,13 @@ module Arbre
           klass.split(' ').all? { |cls| classes.include?(cls) }
         end
 
+        def style
+          self[:style]
+        end
+        def style=(value)
+          self[:style] = value
+        end
+
       ######
       # Rendering
 

data/lib/arbre/version.rb

@@ -1,3 +1,3 @@
 module Arbre
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/spec/arbre/html/style_hash_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+include Arbre::Html
+
+describe StyleHash do
+
+  describe "initializer" do
+    it "should be able to be initialized without arguments" do
+      hash = StyleHash.new
+      expect(hash).to be_empty
+    end
+
+    it "should be able to be initialized with a hash" do
+      hash = StyleHash.new('one' => 'two')
+      expect(hash.to_s).to eql('one: two;')
+    end
+
+    it "should be able to be initialized with a string containing a style definition" do
+      hash = StyleHash.new('one: two; three:four;')
+      expect(hash.to_s).to eql('one: two; three: four;')
+    end
+
+    it "should convert to dash-case when initialized with a hash" do
+      hash = StyleHash.new('styleOne' => 'two')
+      expect(hash.to_s).to eql('style-one: two;')
+    end
+
+  end
+
+  describe '#style' do
+    it "should be an alias to itself" do
+      hash = StyleHash.new('one:two;')
+      expect(hash.style).to be(hash)
+    end
+  end
+
+  describe '[]=' do
+    it "should convert the used name to dash-case" do
+      hash = StyleHash.new
+      hash[:style_one] = 'one'
+      hash[:style_two] = 'two'
+      hash['style-three'] = 'three'
+      hash['styleFour'] = 'four'
+      expect(hash.to_s).to eql('style-one: one; style-two: two; style-three: three; style-four: four;')
+    end
+  end
+
+  describe '[]' do
+    it "should convert the used name to dash-case" do
+      hash = StyleHash.new('style-one: one; style-two: two; style-three: three; style-four: four;')
+      expect(hash[:style_one]).to eql('one')
+      expect(hash[:style_two]).to eql('two')
+      expect(hash['style-three']).to eql('three')
+      expect(hash['styleFour']).to eql('four')
+    end
+  end
+
+end

data/spec/arbre/integration/html_spec.rb

@@ -10,6 +10,15 @@ describe Arbre do
     expect(arbre).to be_rendered_as("<span>Hello World</span>")
   end
 
+  it "should render all attributes properly" do
+    arbre do
+      div "test", :class => %w(one two), :style => {'one' => 'two'}, 'one' => 'two'
+    end
+    expect(arbre).to be_rendered_as(<<-HTML)
+      <div class="one two" one="two" style="one: two;">test</div>
+    HTML
+  end
+
   it "should access assigns through instance variables" do
     assigns[:my_var] = 'Hello World'
     arbre { span @my_var }

data/spec/arbre/unit/html/attributes_spec.rb

@@ -106,6 +106,32 @@ describe Attributes do
 
   end
 
+  describe "style attribute" do
+
+    it "should return a StyleHash when the class attribute is accessed" do
+      expect(attributes[:style]).to be_a(StyleHash)
+      expect(attributes[:style]).to be_empty
+      expect(attributes['style']).to be_a(StyleHash)
+      expect(attributes['style']).to be_empty
+    end
+
+    it "should wrap things into a style when the attribute is set" do
+      attributes[:style] = 'one: two;'
+      expect(attributes[:style]).to eql(StyleHash.new('one: two;'))
+
+      attributes[:style] = {'one' => 'two'}
+      expect(attributes[:style]).to eql(StyleHash.new('one' => 'two'))
+    end
+
+    it "should not set the attribute if a nil or empty hash is passed" do
+      attributes[:style] = nil
+      expect(attributes).not_to have_key(:style)
+      attributes[:style] = []
+      expect(attributes).not_to have_key(:style)
+    end
+
+  end
+
   describe '#remove' do
 
     it "should remove the attribute with the given name" do

data/spec/arbre/unit/html/tag_spec.rb

@@ -76,7 +76,7 @@ describe Tag do
       end
     end
 
-    describe '.classes' do
+    describe '.tag_classes' do
       it "should add the given classes to the tag" do
         klass = Class.new(Arbre::Html::Div) { classes 'time-input' }
         expect(klass.new.tag_classes).to eql(%w[time-input])
@@ -105,33 +105,33 @@ describe Tag do
     specify { expect(tag.attributes).to be_a(Attributes) }
 
     it "should allow setting an attribute through #set_attribute" do
-      tag.set_attribute :style, 'display: none;'
+      tag.set_attribute :autocomplete, 'off'
       tag.set_attribute 'placeholder', '(test)'
-      expect(tag.attributes).to eq('style' => 'display: none;', 'placeholder' => '(test)')
+      expect(tag.attributes).to eq('autocomplete' => 'off', 'placeholder' => '(test)')
     end
 
     it "should allow getting an attribute through #get_attribute" do
-      tag.set_attribute :style, 'display: none;'
-      expect(tag.get_attribute(:style)).to eql('display: none;')
-      expect(tag.get_attribute('style')).to eql('display: none;')
+      tag.set_attribute :autocomplete, 'off'
+      expect(tag.get_attribute(:autocomplete)).to eql('off')
+      expect(tag.get_attribute('autocomplete')).to eql('off')
     end
 
     it "should allow setting an attribute through an indexer" do
-      tag[:style] = 'display: none;'
+      tag[:autocomplete] = 'off'
       tag['placeholder'] = '(test)'
-      expect(tag.attributes).to eq('style' => 'display: none;', 'placeholder' => '(test)')
+      expect(tag.attributes).to eq('autocomplete' => 'off', 'placeholder' => '(test)')
     end
 
     it "should allow getting an attribute through an indexer" do
-      tag[:style] = 'display: none;'
-      expect(tag[:style]).to eql('display: none;')
-      expect(tag['style']).to eql('display: none;')
+      tag[:autocomplete] = 'off'
+      expect(tag[:autocomplete]).to eql('off')
+      expect(tag['autocomplete']).to eql('off')
     end
 
     it "should check whether an attribute is set through has_attribute?" do
-      tag[:style] = 'display: none;'
-      expect(tag).to have_attribute(:style)
-      expect(tag).to have_attribute('style')
+      tag[:autocomplete] = 'off'
+      expect(tag).to have_attribute(:autocomplete)
+      expect(tag).to have_attribute('autocomplete')
       expect(tag).not_to have_attribute(:placeholder)
     end
 
@@ -206,7 +206,7 @@ describe Tag do
     end
 
   ######
-  # ID & classes
+  # ID, classes & style
 
     describe '#generate_id' do
       it "should generate an ID for the tag using its object_id" do
@@ -261,6 +261,18 @@ describe Tag do
       end
     end
 
+    describe '#style' do
+      it "should be the same as the :style attribute" do
+        expect(tag.style).to be(tag[:style])
+      end
+    end
+    describe '#style=' do
+      it "should set the style attribute" do
+        tag.style = 'float: left;'
+        expect(tag[:style]).to eql('float' => 'left')
+      end
+    end
+
   ## Rendering is exemplified in the integration HTML spec.
 
   ######

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arbre2
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Greg Bell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,6 +142,7 @@ files:
 - lib/arbre/html/document.rb
 - lib/arbre/html/html_tags.rb
 - lib/arbre/html/querying.rb
+- lib/arbre/html/style_hash.rb
 - lib/arbre/html/tag.rb
 - lib/arbre/rails.rb
 - lib/arbre/rails/layouts.rb
@@ -156,6 +157,7 @@ files:
 - lib/arbre/rspec/contain_script_matcher.rb
 - lib/arbre/text_node.rb
 - lib/arbre/version.rb
+- spec/arbre/html/style_hash_spec.rb
 - spec/arbre/integration/html_document_spec.rb
 - spec/arbre/integration/html_spec.rb
 - spec/arbre/integration/querying_spec.rb
@@ -216,6 +218,7 @@ signing_key:
 specification_version: 4
 summary: An Object Oriented DOM Tree in Ruby
 test_files:
+- spec/arbre/html/style_hash_spec.rb
 - spec/arbre/integration/html_document_spec.rb
 - spec/arbre/integration/html_spec.rb
 - spec/arbre/integration/querying_spec.rb