arbre 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.1
+
+* Template handler converts to string to satisfy Rack::Lint (@jpmckinney, #6)
+* Fix to `Tag#add_class` when passing a string of classes to Tag build method
+  (@gregbell, #7)
+* Not longer uses the default separator (@LTe, #4)
+
 ## 1.0.0
 
 * Added support for the use of `:for` with non Active Model objects

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 group :test do
   gem "rspec"
+  gem "rack"
 end
 
 group :rails do

data/lib/arbre/element.rb

@@ -106,7 +106,7 @@ module Arbre
     def get_elements_by_class_name(class_name)
       elements = ElementCollection.new
       children.each do |child|
-        elements << child if child.class_list =~ /#{class_name}/
+        elements << child if child.class_list.include?(class_name)
         elements.concat(child.get_elements_by_tag_name(tag_name))
       end
       elements

data/lib/arbre/element_collection.rb

@@ -18,7 +18,7 @@ module Arbre
     def to_s
       self.collect do |element|
         element.to_s
-      end.join.html_safe
+      end.join('').html_safe
     end
   end
 

data/lib/arbre/html/class_list.rb

@@ -6,6 +6,13 @@ module Arbre
     # Holds a set of classes
     class ClassList < Set
 
+      def self.build_from_string(class_names)
+        list = new
+        list.add(class_names)
+
+        list
+      end
+
       def add(class_names)
         class_names.to_s.split(" ").each do |class_name|
           super(class_name)

data/lib/arbre/html/tag.rb

@@ -77,7 +77,16 @@ module Arbre
       end
 
       def class_list
-        get_attribute(:class) || set_attribute(:class, ClassList.new)
+        list = get_attribute(:class)
+
+        case list
+        when ClassList
+          list
+        when String
+          set_attribute(:class, ClassList.build_from_string(list))
+        else
+          set_attribute(:class, ClassList.new)
+        end
       end
 
       def to_s

data/lib/arbre/rails/template_handler.rb

@@ -4,7 +4,7 @@ module Arbre
     class TemplateHandler
 
       def call(template)
-        "Arbre::Context.new(assigns, self){ #{template.source} }"
+        "Arbre::Context.new(assigns, self){ #{template.source} }.to_s"
       end
 
     end

data/lib/arbre/version.rb

@@ -1,3 +1,3 @@
 module Arbre
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/arbre/unit/element_spec.rb

@@ -164,11 +164,24 @@ describe Arbre::Element do
 
   describe "rendering to html" do
 
+    before  { @separator = $, }
+    after   { $, = @separator }
+    let(:collection){ element + "hello world" }
+
     it "should render the children collection" do
       element.children.should_receive(:to_s).and_return("content")
       element.to_s.should == "content"
     end
 
+    it "should render collection when is set the default separator" do
+      $, = "_"
+      collection.to_s.should == "hello world"
+    end
+
+    it "should render collection when is not set the default separator" do
+      collection.to_s.should == "hello world"
+    end
+
   end
 
   describe "adding elements together" do

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

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Arbre::HTML::ClassList do
+
+  describe ".build_from_string" do
+
+    it "should build a new list from a string of classes" do
+      list = Arbre::HTML::ClassList.build_from_string("first second")
+      list.size.should == 2
+
+      list.to_a.sort.should == %w{first second}
+    end
+
+  end
+
+end

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

@@ -91,6 +91,13 @@ describe Arbre::HTML::Tag do
       tag.class_list.size.should == 2
     end
 
+    it "should create a class list from a string" do
+      tag = Arbre::HTML::Tag.new
+      tag.build(:class => "first-class")
+      tag.add_class "second-class"
+      tag.class_list.size.should == 2
+    end
+
   end
 
 end

data/spec/rails/rails_spec_helper.rb

@@ -4,6 +4,12 @@ require 'capybara/rspec'
 
 # Combustion
 require 'combustion'
+
+# Arbre's Rails integration should satisfy Rack::Lint.
+class Combustion::Application
+  config.middleware.use 'Rack::Lint'
+end
+
 Combustion.path = 'spec/rails/stub_app'
 Combustion.initialize! :action_controller,
                        :action_view,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70180007616740 !ruby/object:Gem::Requirement
+  requirement: &70297377112220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70180007616740
+  version_requirements: *70297377112220
 description: An Object Oriented DOM Tree in Ruby
 email:
 - gregdbell@gmail.com
@@ -58,6 +58,7 @@ files:
 - spec/arbre/unit/context_spec.rb
 - spec/arbre/unit/element_finder_methods_spec.rb
 - spec/arbre/unit/element_spec.rb
+- spec/arbre/unit/html/class_list_spec.rb
 - spec/arbre/unit/html/tag_attributes_spec.rb
 - spec/arbre/unit/html/tag_spec.rb
 - spec/arbre/unit/html/text_node_spec.rb
@@ -109,6 +110,7 @@ test_files:
 - spec/arbre/unit/context_spec.rb
 - spec/arbre/unit/element_finder_methods_spec.rb
 - spec/arbre/unit/element_spec.rb
+- spec/arbre/unit/html/class_list_spec.rb
 - spec/arbre/unit/html/tag_attributes_spec.rb
 - spec/arbre/unit/html/tag_spec.rb
 - spec/arbre/unit/html/text_node_spec.rb