formtastic 2.2.1 → 2.3.0.rc

data/spec/inputs/label_spec.rb

@@ -38,6 +38,17 @@ describe 'Formtastic::FormBuilder#label' do
     end)
     output_buffer.should have_tag('label', /Title/)
   end
+  
+  it 'should use i18n instead of the method name when method given as a String' do
+    with_config :i18n_cache_lookups, true do
+      ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => "I18n title" } } } }
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input("title")
+      end)
+      ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => nil } } } }
+      output_buffer.should have_tag('label', /I18n title/)
+    end
+  end
 
   it 'should humanize the given attribute for date fields' do
     concat(semantic_form_for(@new_post) do |builder|

data/spec/inputs/select_input_spec.rb

@@ -225,7 +225,11 @@ describe 'select input' do
     end
 
     it "should call author.find with association conditions" do
-      ::Author.should_receive(:scoped).with(:conditions => {:active => true})
+      if Formtastic::Util.rails3?
+        ::Author.should_receive(:scoped).with(:conditions => {:active => true})
+      else
+        ::Author.should_receive(:where).with(:conditions => {:active => true})
+      end
 
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
@@ -233,8 +237,15 @@ describe 'select input' do
     end
 
     it "should call author.find with association conditions and find_options conditions" do
-      ::Author.should_receive(:scoped).with(:conditions => {:active => true})
-      ::Author.should_receive(:where).with({:publisher => true})
+      if Formtastic::Util.rails3?
+        ::Author.should_receive(:scoped).with(:conditions => {:active => true})
+        ::Author.should_receive(:where).with({:publisher => true})
+      else
+        proxy = stub
+        ::Author.should_receive(:where).with({:active => true}).and_return(proxy)
+        proxy.should_receive(:where).with({:publisher => true})
+      end
+      
 
       with_deprecation_silenced do
         semantic_form_for(@new_post) do |builder|
@@ -307,7 +318,13 @@ describe 'select input' do
     end
 
     it 'should call find with :include for more optimized queries' do
-      Author.should_receive(:where).with(:include => :continent)
+      if Formtastic::Util.rails3?
+       Author.should_receive(:where).with(:include => :continent)
+      else
+       proxy = author_array_or_scope(@authors)
+       Author.should_receive(:where).and_return(proxy)
+       proxy.should_receive(:includes).with(:continent).and_call_original
+      end
 
       with_deprecation_silenced do 
         semantic_form_for(@new_post) do |builder|

data/spec/inputs/time_select_input_spec.rb

@@ -192,7 +192,7 @@ describe 'time select input' do
           output_buffer.should have_tag('form li.time_select fieldset ol li label', /#{f}/i) unless field == f
         end
       end
-      
+
       it "should not render unsafe HTML when :labels[:#{field}] is false" do 
         output_buffer.replace ''
         concat(semantic_form_for(@new_post) do |builder|
@@ -202,6 +202,14 @@ describe 'time select input' do
       end
       
     end
+
+    it "should not render labels when :labels is falsy" do
+      output_buffer.replace ''
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:created_at, :as => :time_select, :include_seconds => true, :labels => false))
+      end)
+      output_buffer.should have_tag('form li.time_select fieldset ol li label', :count => 0)
+    end
   end
 
   describe ':namespace option' do

data/spec/spec_helper.rb

@@ -36,7 +36,10 @@ module FormtasticSpecHelper
   include ActionView::Helpers::AssetTagHelper
   include ActiveSupport
   include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
-
+  include ActionDispatch::Routing::PolymorphicRoutes 
+  include AbstractController::UrlFor if defined?(AbstractController::UrlFor)
+  include ActionView::RecordIdentifier if defined?(ActionView::RecordIdentifier)
+  
   include Formtastic::Helpers::FormHelper
 
   def default_input_type(column_type, column_name = :generic_column_name)
@@ -148,6 +151,54 @@ module FormtasticSpecHelper
       sym == :options ? false : super
     end
   end
+  
+  # In Rails 3 Model.all returns an array. In Rails 4, it returns an
+  # association proxy, which quacks a lot like an array. We use this in stubs 
+  # or mocks where we need to return the later.
+  # 
+  # TODO try delegate?
+  # delegate :map, :size, :length, :first, :to_ary, :each, :include?, :to => :array
+  class MockScope
+    attr_reader :array
+    
+    def initialize(the_array)
+      @array = the_array
+    end
+    
+    def map(&block)
+      array.map(&block)
+    end
+    
+    def where(*args)
+      # array
+      self
+    end
+    
+    def includes(*args)
+      self
+    end
+    
+    def size
+      array.size
+    end
+    alias_method :length, :size
+    
+    def first
+      array.first
+    end
+    
+    def to_ary
+      array
+    end
+    
+    def each(&block)
+      array.each(&block)
+    end
+    
+    def include?(*args)
+      array.include?(*args)
+    end
+  end
 
   def _routes
     url_helpers = mock('url_helpers')
@@ -185,7 +236,17 @@ module FormtasticSpecHelper
     def author_path(*args); "/authors/1"; end
     def authors_path(*args); "/authors"; end
     def new_author_path(*args); "/authors/new"; end
-
+    
+    # Returns the array for Rails 3 and a thing that looks looks like an 
+    # association proxy for Rails 4+
+    def author_array_or_scope(the_array = [@fred, @bob])
+      if ::Formtastic::Util.rails3?
+        the_array
+      else
+        MockScope.new(the_array)
+      end
+    end
+    
     @fred = ::Author.new
     @fred.stub!(:class).and_return(::Author)
     @fred.stub!(:to_label).and_return('Fred Smith')
@@ -227,9 +288,9 @@ module FormtasticSpecHelper
 
 
     ::Author.stub!(:scoped).and_return(::Author)
-    ::Author.stub!(:find).and_return([@fred, @bob])
-    ::Author.stub!(:all).and_return([@fred, @bob])
-    ::Author.stub!(:where).and_return([@fred, @bob])
+    ::Author.stub!(:find).and_return(author_array_or_scope)
+    ::Author.stub!(:all).and_return(author_array_or_scope)
+    ::Author.stub!(:where).and_return(author_array_or_scope)
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
@@ -247,7 +308,7 @@ module FormtasticSpecHelper
     @new_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @new_post.stub!(:author).and_return(nil)
     @new_post.stub!(:author_attributes=).and_return(nil)
-    @new_post.stub!(:authors).and_return([@fred])
+    @new_post.stub!(:authors).and_return(author_array_or_scope([@fred]))
     @new_post.stub!(:authors_attributes=)
     @new_post.stub!(:reviewer).and_return(nil)
     @new_post.stub!(:main_post).and_return(nil)
@@ -270,7 +331,7 @@ module FormtasticSpecHelper
     @freds_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @freds_post.stub!(:to_key).and_return(nil)
     @freds_post.stub!(:persisted?).and_return(nil)
-    @fred.stub!(:posts).and_return([@freds_post])
+    @fred.stub!(:posts).and_return(author_array_or_scope([@freds_post]))
     @fred.stub!(:post_ids).and_return([@freds_post.id])
 
     ::Post.stub!(:scoped).and_return(::Post)
@@ -301,9 +362,9 @@ module FormtasticSpecHelper
              :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
       end
     end
-    ::Post.stub!(:find).and_return([@freds_post])
-    ::Post.stub!(:all).and_return([@freds_post])
-    ::Post.stub!(:where).and_return([@freds_post])
+    ::Post.stub!(:find).and_return(author_array_or_scope([@freds_post]))
+    ::Post.stub!(:all).and_return(author_array_or_scope([@freds_post]))
+    ::Post.stub!(:where).and_return(author_array_or_scope([@freds_post]))
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
     ::Post.stub!(:to_key).and_return(nil)
     ::Post.stub!(:persisted?).and_return(nil)
@@ -315,9 +376,9 @@ module FormtasticSpecHelper
       :sub_posts => mock('reflection', :options => {:polymorphic => true}, :klass => ::MongoPost, :macro => :has_many),
       :options => []
     })
-    ::MongoPost.stub!(:find).and_return([@freds_post])
-    ::MongoPost.stub!(:all).and_return([@freds_post])
-    ::MongoPost.stub!(:where).and_return([@freds_post])
+    ::MongoPost.stub!(:find).and_return(author_array_or_scope([@freds_post]))
+    ::MongoPost.stub!(:all).and_return(author_array_or_scope([@freds_post]))
+    ::MongoPost.stub!(:where).and_return(author_array_or_scope([@freds_post]))
     ::MongoPost.stub!(:to_key).and_return(nil)
     ::MongoPost.stub!(:persisted?).and_return(nil)
     ::MongoPost.stub!(:to_ary)

data/spec/support/custom_macros.rb

@@ -259,6 +259,7 @@ module CustomMacros
     def it_should_call_find_on_association_class_when_no_collection_is_provided(as)
       it "should call find on the association class when no collection is provided" do
         ::Author.should_receive(:where)
+
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => as))
         end)
@@ -269,7 +270,7 @@ module CustomMacros
       describe 'when the :collection option is provided' do
 
         before do
-          @authors = ::Author.all * 2
+          @authors = ([::Author.all] * 2).flatten
           output_buffer.replace ''
         end
 
@@ -456,7 +457,7 @@ module CustomMacros
             describe "when the collection objects respond to #{label_method}" do
               before do
                 @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
-                ::Author.all.each { |a| a.stub!(label_method).and_return('The Label Text') }
+                [@fred, @bob].each { |a| a.stub!(label_method).and_return('The Label Text') }
 
                 concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:author, :as => as))

data/spec/support/test_environment.rb

@@ -17,6 +17,8 @@ module FormtasticTest
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
     config.active_support.deprecation = :stderr
+    config.secret_key_base = "secret"
+    config.eager_load = false
   end
 end
 FormtasticTest::Application.initialize!

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: formtastic
 version: !ruby/object:Gem::Version
-  version: 2.2.1
-  prerelease: 
+  version: 2.3.0.rc
+  prerelease: 6
 platform: ruby
 authors:
 - Justin French
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70298104933820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,47 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298104933820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70298104933340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: *70298104933340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &70298112364540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70298112364540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70298112363620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +85,15 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *70298112363620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: BlueCloth
-  requirement: &70298112362700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298112362700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70298112361420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,21 +117,15 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70298112361420
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70298112360140 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
-  type: :development
-  prerelease: false
-  version_requirements: *70298112360140
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70298112359180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298112359180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70298112357500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,21 +149,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298112357500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70298104958780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.2.5
   type: :development
   prerelease: false
-  version_requirements: *70298104958780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70298104958360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298104958360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70298104957900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +197,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298104957900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Rails form builder plugin/gem with semantically rich and accessible
   markup
 email:
@@ -167,10 +243,11 @@ files:
 - app/assets/stylesheets/formtastic_ie6.css
 - app/assets/stylesheets/formtastic_ie7.css
 - formtastic.gemspec
-- gemfiles/rails-3.0.gemfile
-- gemfiles/rails-3.1.gemfile
-- gemfiles/rails-3.2.gemfile
-- gemfiles/rails-4.gemfile
+- gemfiles/rails_3.0.gemfile
+- gemfiles/rails_3.1.gemfile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/formtastic.rb
 - lib/formtastic/actions.rb
 - lib/formtastic/actions/base.rb
@@ -250,7 +327,6 @@ files:
 - lib/generators/templates/_form.html.slim
 - lib/generators/templates/formtastic.rb
 - lib/locale/en.yml
-- lib/tasks/verify_rcov.rb
 - sample/basic_inputs.html
 - sample/config.ru
 - sample/index.html
@@ -328,7 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup