arbre 1.0.0.rc4 → 1.0.0

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 benchmarks
 /.rvmrc
 /tags
+.DS_Store

data/.travis.yml

@@ -0,0 +1,5 @@
+script: bundle exec rake
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.0
+
+* Added support for the use of `:for` with non Active Model objects
+
 ## 1.0.0.rc4
 
 * Fix issue where user could call `symbolize_keys!` on a

data/README.rdoc

@@ -3,6 +3,8 @@
 Arbre is the DOM implemented in Ruby. This project is primarily used as
 the object oriented view layer in Active Admin.
 
+{<img src="https://secure.travis-ci.org/gregbell/arbre.png?branch=master" alt="Build Status" />}[http://travis-ci.org/gregbell/arbre]
+
 == Simple Usage
 
 A simple example of setting up an Arbre context and creating some html

data/Rakefile

@@ -1,2 +1,7 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/arbre/context.rb

@@ -1,8 +1,39 @@
 require 'arbre/element'
 
 module Arbre
+
+  # The Arbre::Context class is the frontend for using Arbre.
+  #
+  # The simplest example possible:
+  #
+  #     html = Arbre::Context.new do
+  #       h1 "Hello World"
+  #     end
+  #
+  #     html.to_s #=> "<h1>Hello World</h1>"
+  #
+  # The contents of the block are instance eval'd within the Context
+  # object. This means that you lose context to the outside world from
+  # within the block. To pass local variables into the Context, use the
+  # assigns param.
+  #
+  #     html = Arbre::Context.new({:one => 1}) do
+  #       h1 "Your number #{one}"
+  #     end
+  #
+  #     html.to_s #=> "Your number 1"
+  #
   class Context < Element
 
+    # Initialize a new Arbre::Context
+    #
+    # @param [Hash] assigns A hash of objecs that you would like to be
+    #                       availble as local variables within the Context
+    #
+    # @param [Object] helpers An object that has methods on it which will become
+    #                         instance methods within the context.
+    #
+    # @yield [] The block that will get instance eval'd in the context
     def initialize(assigns = {}, helpers = nil, &block)
       assigns = assigns || {}
       @_assigns = assigns.symbolize_keys

data/lib/arbre/html/tag.rb

@@ -95,7 +95,7 @@ module Arbre
       end
 
       INDENT_SIZE = 2
-      
+
       def indent(open_tag, child_content, close_tag)
         spaces = ' ' * indent_level * INDENT_SIZE
 
@@ -119,11 +119,11 @@ module Arbre
 
         html
       end
-      
+
       def self_closing_tag?
         %w|meta link|.include?(tag_name)
       end
-      
+
       def no_child?
         children.empty?
       end
@@ -149,7 +149,7 @@ module Arbre
         if record.class.respond_to?(:model_name)
           record.class.model_name.singular
         else
-          record.class.underscore.gsub("/", "_")
+          record.class.name.underscore.gsub("/", "_")
         end
       end
 

data/lib/arbre/rails/forms.rb

@@ -1,92 +1,95 @@
-module SplitOpenAndCloseOn
+module Arbre
+  module Rails
+    module Forms
 
-  def split_open_and_close_on(string, match)
-    return "" unless string && match
-    @opening_tag = string.split(Regexp.new("#{match}\\z")).first
-    @closing_tag = match
-  end
+      class FormBuilderProxy < Arbre::Component
+        attr_reader :form_builder
 
-  def opening_tag
-    @opening_tag || ""
-  end
+        # Since label and select are Arbre Elements already, we must
+        # override it here instead of letting method_missing
+        # deal with it
+        def label(*args)
+          proxy_call_to_form :label, *args
+        end
 
-  def closing_tag
-    @closing_tag || ""
-  end
+        def select(*args)
+          proxy_call_to_form :select, *args
+        end
 
-end
+        def respond_to?(name)
+          if form_builder && form_builder.respond_to?(name)
+            true
+          else
+            super
+          end
+        end
 
-class FormBuilderProxy < Arbre::Component
-  attr_reader :form_builder
+        private
 
-  # Since label and select are Arbre Elements already, we must
-  # override it here instead of letting method_missing
-  # deal with it
-  def label(*args)
-    proxy_call_to_form :label, *args
-  end
+        def proxy_call_to_form(method, *args, &block)
+          text_node form_builder.send(method, *args, &block)
+        end
 
-  def select(*args)
-    proxy_call_to_form :select, *args
-  end
+        def method_missing(method, *args, &block)
+          if form_builder && form_builder.respond_to?(method)
+            proxy_call_to_form(method, *args, &block)
+          else
+            super
+          end
+        end
 
-  def respond_to?(name)
-    if form_builder && form_builder.respond_to?(name)
-      true
-    else
-      super
-    end
-  end
+      end
 
-  private
+      class FormForProxy < FormBuilderProxy
+        builder_method :form_for
 
-  def proxy_call_to_form(method, *args, &block)
-    text_node form_builder.send(method, *args, &block)
-  end
+        def build(resource, form_options = {}, &block)
+          form_string = helpers.form_for(resource, form_options) do |f|
+            @form_builder = f
+          end
 
-  def method_missing(method, *args, &block)
-    if form_builder && form_builder.respond_to?(method)
-      proxy_call_to_form(method, *args, &block)
-    else
-      super
-    end
-  end
+          @opening_tag, @closing_tag = split_string_on(form_string, "</form>")
+          super(&block)
+        end
 
-end
+        def fields_for(*args, &block)
+          insert_tag FieldsForProxy, form_builder, *args, &block
+        end
 
-class FormForProxy < FormBuilderProxy
-  builder_method :form_for
-  include SplitOpenAndCloseOn
+        def split_string_on(string, match)
+          return "" unless string && match
+          part_1 = string.split(Regexp.new("#{match}\\z")).first
+          [part_1, match]
+        end
 
-  def build(resource, form_options = {}, &block)
-    form_string = helpers.form_for(resource, form_options) do |f|
-      @form_builder = f
-    end
+        def opening_tag
+          @opening_tag || ""
+        end
 
-    split_open_and_close_on form_string, "</form>"
+        def closing_tag
+          @closing_tag || ""
+        end
 
-    super(&block)
-  end
+      end
 
-  def fields_for(*args, &block)
-    insert_tag FieldsForProxy, form_builder, *args, &block
-  end
+      class FieldsForProxy < FormBuilderProxy
 
-end
+        def build(form_builder, *args, &block)
+          form_builder.fields_for(*args) do |f|
+            @form_builder = f
+          end
 
-class FieldsForProxy < FormBuilderProxy
+          super(&block)
+        end
 
-  def build(form_builder, *args, &block)
-    form_builder.fields_for(*args) do |f|
-      @form_builder = f
-    end
+        def to_s
+          children.to_s
+        end
 
-    super(&block)
-  end
+      end
 
-  def to_s
-    children.to_s
+    end
   end
-
 end
 
+

data/lib/arbre/version.rb

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

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

@@ -32,6 +32,23 @@ describe Arbre::HTML::Tag do
       tag.class_list.should include("resource_class")
     end
 
+
+    describe "for an object that doesn't have a model_name" do
+      let(:resource_class){ mock(: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"
+      end
+
+      it "should add a class name" do
+        tag.class_list.should include("resource_class")
+      end
+    end
+
     describe "with a default_id_for_prefix" do
 
       let(:tag) do

data/spec/rails/integration/forms_spec.rb

@@ -1,20 +1,4 @@
 require 'rails/rails_spec_helper'
-require 'active_model'
-
-
-class MockPerson
-  extend ActiveModel::Naming
-
-  attr_accessor :name
-
-  def persisted?
-    false
-  end
-
-  def to_key
-    []
-  end
-end
 
 describe "Building forms" do
 

data/spec/rails/rails_spec_helper.rb

@@ -14,6 +14,8 @@ require 'capybara/rails'
 
 require 'spec_helper'
 
+require 'rails/support/mock_person'
+
 # Ensure that the rails plugin is installed
 require 'arbre/rails'
 

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

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70152551527460 !ruby/object:Gem::Requirement
+  requirement: &70180007616740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152551527460
+  version_requirements: *70180007616740
 description: An Object Oriented DOM Tree in Ruby
 email:
 - gregdbell@gmail.com
@@ -29,14 +29,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - README.rdoc
 - Rakefile
 - arbre.gemspec
-- lib/.DS_Store
 - lib/arbre.rb
 - lib/arbre/component.rb
 - lib/arbre/context.rb
@@ -70,6 +69,7 @@ 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/empty.arb
 - spec/rails/templates/arbre/page_with_assignment.arb
@@ -94,9 +94,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 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
@@ -120,6 +120,7 @@ test_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/empty.arb
 - spec/rails/templates/arbre/page_with_assignment.arb