formtastic 2.3.1 → 3.0.0.rc

data/spec/inputs/string_input_spec.rb

@@ -110,11 +110,23 @@ describe 'string input' do
       end
 
       describe 'any conditional validation' do
+        describe 'proc that calls an instance method' do
+          it 'calls the method on the object' do
+            @new_post.should_receive(:something?)
+            @new_post.class.should_receive(:validators_on).with(:title).at_least(1).and_return([
+              active_model_presence_validator([:title], { :unless => -> { something? } })
+            ])
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title))
+            end)
+          end
+        end
+
         describe 'proc with arity that calls an instance method' do
           it 'calls the method on the object' do
             @new_post.should_receive(:something?)
             @new_post.class.should_receive(:validators_on).with(:title).at_least(1).and_return([
-              active_model_presence_validator([:title], { :unless => Proc.new { |user| user.something? } })
+              active_model_presence_validator([:title], { :unless => ->(user) { user.something? } })
             ])
             concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title))

data/spec/localizer_spec.rb

@@ -101,8 +101,30 @@ describe 'Formtastic::Localizer' do
           end
         end
       end
+
+      describe "with custom resource name" do
+        before do
+          ::I18n.backend.store_translations :en, {:formtastic => {
+              :labels => {
+                :post => { :name => 'POST.NAME' },
+                :message => { :name => 'MESSAGE.NAME' }
+              }
+            }
+          }
+
+          with_config :i18n_lookups_by_default, true do
+            semantic_form_for(@new_post, :as => :message) do |builder|
+              @localizer = Formtastic::Localizer.new(builder)
+            end
+          end
+        end
+
+        it "should translate custom key with i18n" do
+          @localizer.localize(:name, :name, :label).should == 'MESSAGE.NAME'
+        end
+      end 
     end
 
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -422,6 +422,7 @@ module FormtasticSpecHelper
     @new_post.stub(:secret).and_return(1)
     @new_post.stub(:url)
     @new_post.stub(:email)
+    @new_post.stub(:color)
     @new_post.stub(:search)
     @new_post.stub(:phone)
     @new_post.stub(:time_zone)
@@ -444,6 +445,7 @@ module FormtasticSpecHelper
     @new_post.stub(:column_for_attribute).with(:country_subdivision).and_return(double('column', :type => :string, :limit => 255))
     @new_post.stub(:column_for_attribute).with(:country_code).and_return(double('column', :type => :string, :limit => 255))
     @new_post.stub(:column_for_attribute).with(:email).and_return(double('column', :type => :string, :limit => 255))
+    @new_post.stub(:column_for_attribute).with(:color).and_return(double('column', :type => :string, :limit => 255))
     @new_post.stub(:column_for_attribute).with(:url).and_return(double('column', :type => :string, :limit => 255))
     @new_post.stub(:column_for_attribute).with(:phone).and_return(double('column', :type => :string, :limit => 255))
     @new_post.stub(:column_for_attribute).with(:search).and_return(double('column', :type => :string, :limit => 255))

data/spec/support/custom_macros.rb

@@ -258,8 +258,11 @@ 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)
-
+        if Formtastic::Util.rails3?
+          ::Author.should_receive(:scoped)
+        else
+          ::Author.should_receive(:where)
+        end
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => as))
         end)

data/spec/util_spec.rb

@@ -7,50 +7,43 @@ describe 'Formtastic::Util' do
     
     subject { Formtastic::Util.deprecated_version_of_rails? }
     
-    context '3.0.0' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.0.0") } }
-      it 'should be true' do
-        expect(subject).to be_true
-      end
-    end
-
-    context '3.1.0' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.1.0") } }
+    context '4.0.0' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.0") } }
       it 'should be true' do
         expect(subject).to be_true
       end
     end
 
-    context '3.2.12' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.2.12") } }
+    context '4.0.3' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.3") } }
       it 'should be true' do
         expect(subject).to be_true
       end
     end
 
-    context '3.2.13' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.2.13") } }
-      it 'should be true' do
+    context '4.0.4' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.4") } }
+      it 'should be false' do
         expect(subject).to be_false
       end
     end
 
-    context '3.2.14' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.2.14") } }
-      it 'should be true' do
+    context '4.0.5' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.5") } }
+      it 'should be false' do
         expect(subject).to be_false
       end
     end
 
-    context '3.3.0' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.3.0") } }
-      it 'should be true' do
+    context '4.1.1' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.1.1") } }
+      it 'should be false' do
         expect(subject).to be_false
       end
     end
 
-    context '4.0.0' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.0") } }
+    context '5.0.0' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("5.0.0") } }
       it 'should be true' do
         expect(subject).to be_false
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formtastic
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.0.0.rc
 platform: ruby
 authors:
 - Justin French
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: BlueCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -112,30 +112,30 @@ dependencies:
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +154,16 @@ dependencies:
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
 description: A Rails form builder plugin/gem with semantically rich and accessible
   markup
 email:
@@ -216,8 +216,6 @@ 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.0.4.gemfile
 - gemfiles/rails_4.gemfile
@@ -252,7 +250,6 @@ files:
 - lib/formtastic/inputs/base/datetime_pickerish.rb
 - lib/formtastic/inputs/base/errors.rb
 - lib/formtastic/inputs/base/fileish.rb
-- lib/formtastic/inputs/base/grouped_collections.rb
 - lib/formtastic/inputs/base/hints.rb
 - lib/formtastic/inputs/base/html.rb
 - lib/formtastic/inputs/base/labelling.rb
@@ -266,6 +263,7 @@ files:
 - lib/formtastic/inputs/base/wrapping.rb
 - lib/formtastic/inputs/boolean_input.rb
 - lib/formtastic/inputs/check_boxes_input.rb
+- lib/formtastic/inputs/color_input.rb
 - lib/formtastic/inputs/country_input.rb
 - lib/formtastic/inputs/date_picker_input.rb
 - lib/formtastic/inputs/date_select_input.rb
@@ -320,6 +318,7 @@ files:
 - spec/i18n_spec.rb
 - spec/inputs/boolean_input_spec.rb
 - spec/inputs/check_boxes_input_spec.rb
+- spec/inputs/color_input_spec.rb
 - spec/inputs/country_input_spec.rb
 - spec/inputs/custom_input_spec.rb
 - spec/inputs/date_picker_input_spec.rb
@@ -367,7 +366,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
@@ -399,6 +398,7 @@ test_files:
 - spec/i18n_spec.rb
 - spec/inputs/boolean_input_spec.rb
 - spec/inputs/check_boxes_input_spec.rb
+- spec/inputs/color_input_spec.rb
 - spec/inputs/country_input_spec.rb
 - spec/inputs/custom_input_spec.rb
 - spec/inputs/date_picker_input_spec.rb

data/gemfiles/rails_3.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 3.0.0"
-
-gemspec :path=>".././"

data/gemfiles/rails_3.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 3.1.0"
-
-gemspec :path=>".././"

data/lib/formtastic/inputs/base/grouped_collections.rb

@@ -1,77 +0,0 @@
-module Formtastic
-  module Inputs
-    module Base
-      module GroupedCollections
-      
-        def raw_grouped_collection
-          @raw_grouped_collection ||= raw_collection.map { |option| option.send(options[:group_by]) }.uniq
-        end
-      
-        def grouped_collection
-          @grouped_collection ||= raw_grouped_collection.sort_by { |group_item| group_item.send(group_label_method) }
-        end
-      
-        def group_label_method
-          @group_label_method ||= (group_label_method_from_options || group_label_method_from_grouped_collection)
-        end
-      
-        def group_label_method_from_options
-          options[:group_label]
-        end
-      
-        def group_label_method_from_grouped_collection
-          label_and_value_method_from_collection(raw_grouped_collection).first
-        end
-      
-        def group_association
-          @group_association ||= (group_association_from_options || group_association_from_reflection)
-        end
-      
-        def group_association_from_options
-          options[:group_association]
-        end
-      
-        def group_by
-          options[:group_by]
-        end
-      
-        def group_association_from_reflection
-          method_to_group_association_by = reflection.klass.reflect_on_association(group_by)
-          group_class = method_to_group_association_by.klass
-      
-          # This will return in the normal case
-          return method.to_s.pluralize.to_sym if group_class.reflect_on_association(method.to_s.pluralize)
-      
-          # This is for belongs_to associations named differently than their class
-          # form.input :parent, :group_by => :customer
-          # eg.
-          # class Project
-          #   belongs_to :parent, :class_name => 'Project', :foreign_key => 'parent_id'
-          #   belongs_to :customer
-          # end
-          # class Customer
-          #   has_many :projects
-          # end
-          group_method = group_class.to_s.underscore.pluralize.to_sym
-          return group_method if group_class.reflect_on_association(group_method) # :projects
-      
-          # This is for has_many associations named differently than their class
-          # eg.
-          # class Project
-          #   belongs_to :parent, :class_name => 'Project', :foreign_key => 'parent_id'
-          #   belongs_to :customer
-          # end
-          # class Customer
-          #   has_many :tasks, :class_name => 'Project', :foreign_key => 'customer_id'
-          # end
-          possible_associations = group_class.reflect_on_all_associations(:has_many).find_all {|assoc| assoc.klass == reflection.klass }
-          return possible_associations.first.name.to_sym if possible_associations.count == 1
-      
-          raise "Cannot infer group association for #{method} grouped by #{group_by}, there were #{possible_associations.empty? ? 'no' : possible_associations.size} possible associations. Please specify using :group_association"
-        end
-
-      end
-    end
-  end
-end
-