arbre 1.0.0.rc4 → 1.2.1

data/spec/rails/integration/rendering_spec.rb

@@ -25,49 +25,75 @@ 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
 
 
-describe TestController, "Rendering with Arbre", :type => :request do
+describe TestController, "Rendering with Arbre", type: :request do
   let(:body){ response.body }
 
+  before do
+    Rails.application.routes.draw do
+      get 'test/render_empty', controller: "test"
+      get 'test/render_simple_page', controller: "test"
+      get 'test/render_partial', controller: "test"
+      get 'test/render_erb_partial', controller: "test"
+      get 'test/render_with_instance_variable', controller: "test"
+      get 'test/render_partial_with_instance_variable', controller: "test"
+      get 'test/render_page_with_helpers', controller: "test"
+    end
+  end
+
+  after do
+    Rails.application.reload_routes!
+  end
+
   it "should render the empty template" do
     get "/test/render_empty"
-    response.should be_success
+    expect(response).to be_successful
   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_successful
+    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
-<h1>Before Partial</h1>
-<p>Hello from a partial</p>
-<h2>After Partial</h2>
-EOS
+    expect(response).to be_successful
+    expect(body).to eq <<~HTML
+      <h1>Before Partial</h1>
+      <p>Hello from a partial</p>
+      <h2>After Partial</h2>
+    HTML
   end
 
   it "should render an erb (or other) partial" do
     get "/test/render_erb_partial"
-    response.should be_success
-    body.should == <<-EOS
-<h1>Before Partial</h1>
-<p>Hello from an erb partial</p>
-<h2>After Partial</h2>
-EOS
+    expect(response).to be_successful
+    expect(body).to eq <<~HTML
+      <h1>Before Partial</h1>
+      <p>Hello from an erb partial</p>
+      <h2>After Partial</h2>
+    HTML
   end
 
   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")
+    get "/test/render_with_instance_variable"
+    expect(response).to be_successful
+    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_successful
+    expect(body).to have_selector("p", text: "Partial: From Instance Var")
+  end
 
 end

data/spec/rails/rails_spec_helper.rb

@@ -1,33 +1,30 @@
-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'
 
+require 'rails/support/mock_person'
+
 # Ensure that the rails plugin is installed
 require 'arbre/rails'
 
-Rails.application.routes.draw do
-  match 'test/:action', :controller => "test"
-end
-
 module AdditionalHelpers
 
   def protect_against_forgery?
     true
   end
 
-  def form_authenticity_token
+  def form_authenticity_token(form_options: {})
     "AUTH_TOKEN"
   end
 

data/spec/rails/stub_app/log/.gitignore

@@ -1 +1 @@
-*.log
+*.log

data/spec/rails/support/mock_person.rb

@@ -0,0 +1,15 @@
+require 'active_model'
+
+class MockPerson
+  extend ActiveModel::Naming
+
+  attr_accessor :name
+
+  def persisted?
+    false
+  end
+
+  def to_key
+    []
+  end
+end

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"

data/tasks/lint.rake

@@ -0,0 +1,69 @@
+require "open3"
+
+#
+# Common stuff for a linter
+#
+module LinterMixin
+  def run
+    offenses = []
+
+    applicable_files.each do |file|
+      if clean?(file)
+        print "."
+      else
+        offenses << file
+        print "F"
+      end
+    end
+
+    print "\n"
+
+    return if offenses.empty?
+
+    raise failure_message_for(offenses)
+  end
+
+  private
+
+  def applicable_files
+    Open3.capture2("git grep -Il ''")[0].split
+  end
+
+  def failure_message_for(offenses)
+    msg = "#{self.class.name} detected offenses. "
+
+    msg += if respond_to?(:fixing_cmd)
+             "Run `#{fixing_cmd(offenses)}` to fix them."
+           else
+             "Affected files: #{offenses.join(' ')}"
+           end
+
+    msg
+  end
+end
+
+#
+# Checks trailing new lines in files
+#
+class MissingTrailingCarriageReturn
+  include LinterMixin
+
+  def clean?(file)
+    File.read(file) =~ /\n\Z/m
+  end
+end
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
+desc "Lints ActiveAdmin code base"
+task lint: ["rubocop", "lint:missing_trailing_carriage_return"]
+
+namespace :lint do
+  desc "Check for missing trailing new lines"
+  task :missing_trailing_carriage_return do
+    puts "Checking for missing trailing carriage returns..."
+
+    MissingTrailingCarriageReturn.new.run
+  end
+end

data/tasks/release.rake

@@ -0,0 +1,6 @@
+require "chandler/tasks"
+
+#
+# Add chandler as a prerequisite for `rake release`
+#
+task "release:rubygem_push" => "chandler:push"

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
-  prerelease: 6
+  version: 1.2.1
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70152551527460 !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: *70152551527460
+  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,19 +31,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
-- .gitignore
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- README.rdoc
+- Gemfile.lock
+- LICENSE
+- README.md
 - Rakefile
 - arbre.gemspec
-- lib/.DS_Store
+- docs/Gemfile
+- docs/_config.yml
+- docs/_includes/footer.html
+- docs/_includes/google-analytics.html
+- docs/_includes/head.html
+- docs/_includes/toc.html
+- docs/_includes/top-menu.html
+- docs/_layouts/default.html
+- docs/index.md
+- docs/stylesheets/main.css
 - lib/arbre.rb
 - lib/arbre/component.rb
 - 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
@@ -59,9 +74,11 @@ 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
+- spec/changelog_spec.rb
 - spec/rails/integration/forms_spec.rb
 - spec/rails/integration/rendering_spec.rb
 - spec/rails/rails_spec_helper.rb
@@ -70,8 +87,11 @@ files:
 - spec/rails/stub_app/db/schema.rb
 - spec/rails/stub_app/log/.gitignore
 - 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
@@ -79,53 +99,29 @@ files:
 - spec/rails/templates/erb/_partial.erb
 - spec/spec_helper.rb
 - spec/support/bundle.rb
+- tasks/lint.rake
+- tasks/release.rake
 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'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An Object Oriented DOM Tree in Ruby
-test_files:
-- spec/arbre/integration/html_spec.rb
-- spec/arbre/unit/component_spec.rb
-- spec/arbre/unit/context_spec.rb
-- spec/arbre/unit/element_finder_methods_spec.rb
-- spec/arbre/unit/element_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
-- spec/rails/integration/forms_spec.rb
-- spec/rails/integration/rendering_spec.rb
-- spec/rails/rails_spec_helper.rb
-- spec/rails/stub_app/config/database.yml
-- spec/rails/stub_app/config/routes.rb
-- spec/rails/stub_app/db/schema.rb
-- spec/rails/stub_app/log/.gitignore
-- spec/rails/stub_app/public/favicon.ico
-- spec/rails/templates/arbre/_partial.arb
-- spec/rails/templates/arbre/empty.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
-- spec/rails/templates/arbre/simple_page.arb
-- spec/rails/templates/erb/_partial.erb
-- spec/spec_helper.rb
-- spec/support/bundle.rb
+test_files: []

data/README.rdoc

@@ -1,69 +0,0 @@
-= Arbre - Ruby Object Oriented HTML Views
-
-Arbre is the DOM implemented in Ruby. This project is primarily used as
-the object oriented view layer in Active Admin.
-
-== Simple Usage
-
-A simple example of setting up an Arbre context and creating some html
-
-    html = Arbre::Context.new do
-      h2 "Why Arbre is awesome?"
-
-      ul do
-        li "The DOM is implemented in ruby"
-        li "You can create object oriented views"
-        li "Templates suck"
-      end
-    end
-
-    puts html.to_s #=> <h2>Why</h2><ul><li></li></ul>
-
-
-== The DOM in Ruby
-
-The purpose of Arbre is to leave the view as ruby objects as long
-as possible. This allows OO Design to be used to implement the view layer.
-
-
-    html = Arbre::Context.new do
-      h2 "Why Arbre is awesome?"
-    end
-
-    html.children.size #=> 1
-    html.children.first #=> #<Arbre::HTML::H2>
-
-== Components
-
-The purpose of Arbre is to be able to create shareable and extendable HTML
-components. To do this, you create a subclass of Arbre::Component.
-
-For example:
-
-    class Panel < Arbre::Component
-      builder_method :panel
-
-      def build(title, attributes = {})
-        super(attributes)
-
-        h3(title, :class => "panel-title")
-      end
-    end
-
-The builder_method defines the method that will be called to build this component
-when using the DSL. The arguments passed into the builder_method will be passed 
-into the #build method for you.
-
-You can now use this panel in any Arbre context:
-
-    html = Arbre::Context.new do
-      panel "Hello World", :id => "my-panel" do
-        span "Inside the panel"
-      end
-    end
-
-    html.to_s #=>
-      # <div class='panel' id="my-panel">
-      #   <h3 class='panel-title'>Hello World</h3>
-      #   <span>Inside the panel</span>
-      # </div>