arbre 1.0.0 → 1.0.2

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

@@ -9,52 +9,54 @@ describe Arbre::HTML::Tag, "Attributes" do
     before { tag.build :id => "my_id" }
 
     it "should have an attributes hash" do
-      tag.attributes.should == {:id => "my_id"}
+      expect(tag.attributes).to eq({:id => "my_id"})
     end
 
     it "should render the attributes to html" do
-      tag.to_s.should == <<-HTML
-<tag id="my_id"></tag>
-HTML
+      expect(tag.to_s).to eq "<tag id=\"my_id\"></tag>\n"
+    end
+
+    it "shouldn't render attributes that are empty" do
+      tag.class_list # initializes an empty ClassList
+      tag.set_attribute :foo, ''
+      tag.set_attribute :bar, nil
+
+      expect(tag.to_s).to eq "<tag id=\"my_id\"></tag>\n"
     end
 
     it "should get an attribute value" do
-      tag.attr(:id).should == "my_id"
+      expect(tag.attr(:id)).to eq("my_id")
     end
 
     describe "#has_attribute?" do
       context "when the attribute exists" do
         it "should return true" do
-          tag.has_attribute?(:id).should == true
+          expect(tag.has_attribute?(:id)).to eq(true)
         end
       end
 
       context "when the attribute does not exist" do
         it "should return false" do
-          tag.has_attribute?(:class).should == false
+          expect(tag.has_attribute?(:class)).to eq(false)
         end
       end
     end
 
     it "should remove an attribute" do
-      tag.attributes.should == {:id => "my_id"}
-      tag.remove_attribute(:id).should == "my_id"
-      tag.attributes.should == {}
+      expect(tag.attributes).to eq({:id => "my_id"})
+      expect(tag.remove_attribute(:id)).to eq("my_id")
+      expect(tag.attributes).to eq({})
     end
   end
 
   describe "rendering attributes" do
     it "should html safe the attribute values" do
-      tag.set_attribute(:class, "\">bad things!")
-      tag.to_s.should == <<-HTML
-<tag class="&quot;&gt;bad things!"></tag>
-HTML
+      tag.set_attribute(:class, '">bad things!')
+      expect(tag.to_s).to eq "<tag class=\"&quot;&gt;bad things!\"></tag>\n"
     end
     it "should should escape the attribute names" do
       tag.set_attribute(">bad", "things")
-      tag.to_s.should == <<-HTML
-<tag &gt;bad="things"></tag>
-HTML
+      expect(tag.to_s).to eq "<tag &gt;bad=\"things\"></tag>\n"
     end
   end
 end

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

@@ -8,44 +8,44 @@ describe Arbre::HTML::Tag do
     before { tag.build "Hello World", :id => "my_id" }
 
     it "should set the contents to a string" do
-      tag.content.should == "Hello World"
+      expect(tag.content).to eq("Hello World")
     end
 
     it "should set the hash of options to the attributes" do
-      tag.attributes.should == { :id => "my_id" }
+      expect(tag.attributes).to eq({ :id => "my_id" })
     end
   end
 
   describe "creating a tag 'for' an object" do
-    let(:model_name){ mock(:singular => "resource_class")}
-    let(:resource_class){ mock(:model_name => model_name) }
-    let(:resource){ mock(:class => resource_class, :to_key => ['5'])}
+    let(:model_name){ double(:singular => "resource_class")}
+    let(:resource_class){ double(:model_name => model_name) }
+    let(:resource){ double(:class => resource_class, :to_key => ['5'])}
 
     before do
       tag.build :for => resource
     end
     it "should set the id to the type and id" do
-      tag.id.should == "resource_class_5"
+      expect(tag.id).to eq("resource_class_5")
     end
 
     it "should add a class name" do
-      tag.class_list.should include("resource_class")
+      expect(tag.class_list).to include("resource_class")
     end
 
 
     describe "for an object that doesn't have a model_name" do
-      let(:resource_class){ mock(:name => 'ResourceClass') }
+      let(:resource_class){ double(:name => 'ResourceClass') }
 
       before do
         tag.build :for => resource
       end
 
       it "should set the id to the type and id" do
-        tag.id.should == "resource_class_5"
+        expect(tag.id).to eq("resource_class_5")
       end
 
       it "should add a class name" do
-        tag.class_list.should include("resource_class")
+        expect(tag.class_list).to include("resource_class")
       end
     end
 
@@ -60,7 +60,7 @@ describe Arbre::HTML::Tag do
       end
 
       it "should set the id to the type and id" do
-        tag.id.should == "a_prefix_resource_class_5"
+        expect(tag.id).to eq("a_prefix_resource_class_5")
       end
 
     end
@@ -70,25 +70,32 @@ describe Arbre::HTML::Tag do
 
     it "should add a class" do
       tag.add_class "hello_world"
-      tag.class_names.should == "hello_world"
+      expect(tag.class_names).to eq("hello_world")
     end
 
     it "should remove_class" do
       tag.add_class "hello_world"
-      tag.class_names.should == "hello_world"
+      expect(tag.class_names).to eq("hello_world")
       tag.remove_class "hello_world"
-      tag.class_names.should == ""
+      expect(tag.class_names).to eq("")
     end
 
     it "should not add a class if it already exists" do
       tag.add_class "hello_world"
       tag.add_class "hello_world"
-      tag.class_names.should == "hello_world"
+      expect(tag.class_names).to eq("hello_world")
     end
 
     it "should seperate classes with space" do
       tag.add_class "hello world"
-      tag.class_list.size.should == 2
+      expect(tag.class_list.size).to eq(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"
+      expect(tag.class_list.size).to eq(2)
     end
 
   end

data/spec/rails/integration/forms_spec.rb

@@ -18,19 +18,19 @@ describe "Building forms" do
     end
 
     it "should build a form" do
-      html.should have_selector("form")
+      expect(html).to have_selector("form")
     end
 
     it "should include the hidden authenticity token" do
-      html.should have_selector("form input[type=hidden][name=authenticity_token]")
+      expect(html).to include '<input name="authenticity_token" type="hidden" value="AUTH_TOKEN" />'
     end
 
     it "should create a label" do
-      html.should have_selector("form label[for=mock_person_name]")
+      expect(html).to have_selector("form label[for=mock_person_name]")
     end
 
     it "should create a text field" do
-      html.should have_selector("form input[type=text]")
+      expect(html).to have_selector("form input[type=text]")
     end
 
   end
@@ -51,15 +51,15 @@ describe "Building forms" do
     end
 
     it "should render nested label" do
-      html.should have_selector("form label[for=mock_person_permission_admin]", :text => "Admin")
+      expect(html).to have_selector("form label[for=mock_person_permission_admin]", :text => "Admin")
     end
 
     it "should render nested label" do
-      html.should have_selector("form input[type=checkbox][name='mock_person[permission][admin]']")
+      expect(html).to have_selector("form input[type=checkbox][name='mock_person[permission][admin]']")
     end
 
     it "should not render a div for the proxy" do
-      html.should_not have_selector("form div.fields_for_proxy")
+      expect(html).not_to have_selector("form div.fields_for_proxy")
     end
 
   end
@@ -93,11 +93,11 @@ describe "Building forms" do
     end
 
     it "should correctly nest elements" do
-      html.should have_selector("form > p > label")
+      expect(html).to have_selector("form > p > label")
     end
 
     it "should correnctly nest elements within fields for" do
-      html.should have_selector("form > div.permissions > div.permissions_label label")
+      expect(html).to have_selector("form > div.permissions > div.permissions_label label")
     end
   end
 

data/spec/rails/integration/rendering_spec.rb

@@ -25,6 +25,11 @@ class TestController < ActionController::Base
     @my_instance_var = "From Instance Var"
     render "arbre/page_with_assignment"
   end
+
+  def render_partial_with_instance_variable
+    @my_instance_var = "From Instance Var"
+    render "arbre/page_with_arb_partial_and_assignment"
+  end
 end
 
 
@@ -33,20 +38,20 @@ describe TestController, "Rendering with Arbre", :type => :request do
 
   it "should render the empty template" do
     get "/test/render_empty"
-    response.should be_success
+    expect(response).to be_success
   end
 
   it "should render a simple page" do
     get "/test/render_simple_page"
-    response.should be_success
-    body.should have_selector("h1", :text => "Hello World")
-    body.should have_selector("p", :text => "Hello again!")
+    expect(response).to be_success
+    expect(body).to have_selector("h1", :text => "Hello World")
+    expect(body).to have_selector("p", :text => "Hello again!")
   end
 
   it "should render an arb partial" do
     get "/test/render_partial"
-    response.should be_success
-    body.should == <<-EOS
+    expect(response).to be_success
+    expect(body).to eq <<-EOS
 <h1>Before Partial</h1>
 <p>Hello from a partial</p>
 <h2>After Partial</h2>
@@ -55,8 +60,8 @@ EOS
 
   it "should render an erb (or other) partial" do
     get "/test/render_erb_partial"
-    response.should be_success
-    body.should == <<-EOS
+    expect(response).to be_success
+    expect(body).to eq <<-EOS
 <h1>Before Partial</h1>
 <p>Hello from an erb partial</p>
 <h2>After Partial</h2>
@@ -65,9 +70,14 @@ EOS
 
   it "should render with instance variables" do
     get "test/render_with_instance_variable"
-    response.should be_success
-    body.should have_selector("h1", :text => "From Instance Var")
+    expect(response).to be_success
+    expect(body).to have_selector("h1", :text => "From Instance Var")
   end
 
+  it "should render an arbre partial with assignments" do
+    get "test/render_partial_with_instance_variable"
+    expect(response).to be_success
+    expect(body).to have_selector("p", :text => "Partial: From Instance Var")
+  end
 
 end

data/spec/rails/rails_spec_helper.rb

@@ -1,15 +1,14 @@
-require 'support/bundle'
+require 'rubygems'
+require 'bundler/setup'
 
-require 'capybara/rspec'
-
-# Combustion
 require 'combustion'
+
 Combustion.path = 'spec/rails/stub_app'
 Combustion.initialize! :action_controller,
-                       :action_view,
-                       :sprockets
+                       :action_view
 
 require 'rspec/rails'
+require 'capybara/rspec'
 require 'capybara/rails'
 
 require 'spec_helper'
@@ -20,7 +19,7 @@ require 'rails/support/mock_person'
 require 'arbre/rails'
 
 Rails.application.routes.draw do
-  match 'test/:action', :controller => "test"
+  get 'test/:action', :controller => "test"
 end
 
 module AdditionalHelpers

data/spec/rails/templates/arbre/_partial_with_assignment.arb

@@ -0,0 +1 @@
+para "Partial: #{my_instance_var}"

data/spec/rails/templates/arbre/page_with_arb_partial_and_assignment.arb

@@ -0,0 +1,3 @@
+h1 "Before Partial"
+render "arbre/partial_with_assignment"
+h2 "After Partial"

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70180007616740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70180007616740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: An Object Oriented DOM Tree in Ruby
 email:
 - gregdbell@gmail.com
@@ -29,11 +31,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- README.rdoc
+- LICENSE
+- README.md
 - Rakefile
 - arbre.gemspec
 - lib/arbre.rb
@@ -41,6 +44,7 @@ files:
 - lib/arbre/context.rb
 - lib/arbre/element.rb
 - lib/arbre/element/builder_methods.rb
+- lib/arbre/element/proxy.rb
 - lib/arbre/element_collection.rb
 - lib/arbre/html/attributes.rb
 - lib/arbre/html/class_list.rb
@@ -58,6 +62,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
@@ -71,7 +76,9 @@ files:
 - spec/rails/stub_app/public/favicon.ico
 - spec/rails/support/mock_person.rb
 - spec/rails/templates/arbre/_partial.arb
+- spec/rails/templates/arbre/_partial_with_assignment.arb
 - spec/rails/templates/arbre/empty.arb
+- spec/rails/templates/arbre/page_with_arb_partial_and_assignment.arb
 - spec/rails/templates/arbre/page_with_assignment.arb
 - spec/rails/templates/arbre/page_with_erb_partial.arb
 - spec/rails/templates/arbre/page_with_partial.arb
@@ -80,28 +87,28 @@ files:
 - spec/spec_helper.rb
 - spec/support/bundle.rb
 homepage: ''
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An Object Oriented DOM Tree in Ruby
 test_files:
 - spec/arbre/integration/html_spec.rb
@@ -109,6 +116,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
@@ -122,7 +130,9 @@ test_files:
 - spec/rails/stub_app/public/favicon.ico
 - spec/rails/support/mock_person.rb
 - spec/rails/templates/arbre/_partial.arb
+- spec/rails/templates/arbre/_partial_with_assignment.arb
 - spec/rails/templates/arbre/empty.arb
+- spec/rails/templates/arbre/page_with_arb_partial_and_assignment.arb
 - spec/rails/templates/arbre/page_with_assignment.arb
 - spec/rails/templates/arbre/page_with_erb_partial.arb
 - spec/rails/templates/arbre/page_with_partial.arb