formtastic 3.1.3 → 3.1.4

data/spec/spec_helper.rb

@@ -492,29 +492,8 @@ module FormtasticSpecHelper
     Formtastic::FormBuilder.send(:"#{config_method_name}=", old_value)
   end
   
-  class ToSMatcher
-    def initialize(str)
-      @str=str.to_s
-    end
-    
-    def matches?(value)
-      value.to_s==@str
-    end
-    
-    def failure_message_for_should
-      "Expected argument that converted to #{@str}"
-    end
-  end
-  
-  def errors_matcher(method)
-    # In edge rails (Rails 4) tags store method_name as a string and index the errors object using a string
-    # therefore allow stubs to match on either string or symbol.  The errors object calls to_sym on all index 
-    # accesses so @object.errors[:abc] is equivalent to @object.errors["abc"]
-    if Rails::VERSION::MAJOR == 4
-      ToSMatcher.new(method)
-    else
-      method
-    end
+  RSpec::Matchers.define :errors_matcher do |expected|
+    match { |actual| actual.to_s == expected.to_s }
   end
 end
 
@@ -543,11 +522,4 @@ RSpec.configure do |config|
       allow(Formtastic.deprecation).to receive(:deprecation_warning).with(method, instance_of(String), instance_of(Array))
     end
   end
-
-  config.before(:all) do
-    DeferredGarbageCollection.start unless ENV["DEFER_GC"] == "false"
-  end
-  config.after(:all) do
-    DeferredGarbageCollection.reconsider unless ENV["DEFER_GC"] == "false"    
-  end
 end

data/spec/support/shared_examples.rb

@@ -490,6 +490,19 @@ RSpec.shared_examples 'Input Helper' do
               end
             end
 
+            it 'should be required when there is :create option in validation contexts array on create' do
+              with_config :required_string, " required yo!" do
+                @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
+                                                                                                         active_model_presence_validator([:title], {:on => [:create]})
+                                                                                                       ])
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                end)
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
+            end
+
             it 'should be required when there is :on => :save option on create' do
               with_config :required_string, " required yo!" do
                 @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
@@ -503,6 +516,19 @@ RSpec.shared_examples 'Input Helper' do
               end
             end
 
+            it 'should be required when there is :save option in validation contexts array on create' do
+              with_config :required_string, " required yo!" do
+                @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
+                                                                                                         active_model_presence_validator([:title], {:on => [:save]})
+                                                                                                       ])
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                end)
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
+            end
+
             it 'should be required when there is :on => :save option on update' do
               with_config :required_string, " required yo!" do
                 @fred.class.should_receive(:validators_on).with(:login).at_least(:once).and_return([
@@ -516,6 +542,19 @@ RSpec.shared_examples 'Input Helper' do
               end
             end
 
+            it 'should be required when there is :save option in validation contexts array on update' do
+              with_config :required_string, " required yo!" do
+                @fred.class.should_receive(:validators_on).with(:login).at_least(:once).and_return([
+                                                                                                     active_model_presence_validator([:login], {:on => [:save]})
+                                                                                                   ])
+                concat(semantic_form_for(@fred) do |builder|
+                  concat(builder.input(:login))
+                end)
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
+            end
+
             it 'should not be required when there is :on => :create option on update' do
               @fred.class.should_receive(:validators_on).with(:login).at_least(:once).and_return([
                                                                                                      active_model_presence_validator([:login], {:on => :create})
@@ -527,6 +566,17 @@ RSpec.shared_examples 'Input Helper' do
               output_buffer.should have_tag('form li.optional')
             end
 
+            it 'should not be required when there is :create option in validation contexts array on update' do
+              @fred.class.should_receive(:validators_on).with(:login).at_least(:once).and_return([
+                                                                                                   active_model_presence_validator([:login], {:on => [:create]})
+                                                                                                 ])
+              concat(semantic_form_for(@fred) do |builder|
+                concat(builder.input(:login))
+              end)
+              output_buffer.should_not have_tag('form li.required')
+              output_buffer.should have_tag('form li.optional')
+            end
+
             it 'should not be required when there is :on => :update option on create' do
               @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
                                                                                                          active_model_presence_validator([:title], {:on => :update})
@@ -538,6 +588,17 @@ RSpec.shared_examples 'Input Helper' do
               output_buffer.should have_tag('form li.optional')
             end
 
+            it 'should not be required when there is :update option in validation contexts array on create' do
+              @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
+                                                                                                       active_model_presence_validator([:title], {:on => [:update]})
+                                                                                                     ])
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should_not have_tag('form li.required')
+              output_buffer.should have_tag('form li.optional')
+            end
+
             it 'should be not be required if the optional :if condition is not satisifed' do
               presence_should_be_required(:required => false, :tag => :body, :options => { :if => false })
             end
@@ -747,6 +808,14 @@ RSpec.shared_examples 'Input Helper' do
           default_input_type(:integer, :section_id).should == :select
         end
 
+        it 'should default to :select for enum' do
+          statuses = ActiveSupport::HashWithIndifferentAccess.new("active"=>0, "inactive"=>1)
+          @new_post.class.stub(:statuses) { statuses }
+          @new_post.stub(:defined_enums) { {"status" => statuses } }
+          
+          default_input_type(:integer, :status).should == :select
+        end
+
         it 'should default to :password for :string column types with "password" in the method name' do
           default_input_type(:string, :password).should == :password
           default_input_type(:string, :hashed_password).should == :password

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formtastic
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -160,17 +160,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.textile
+- README.md
 files:
 - .gitignore
 - .rspec
@@ -237,7 +237,7 @@ files:
 - DEPRECATIONS
 - Gemfile
 - MIT-LICENSE
-- README.textile
+- README.md
 - RELEASE_PROCESS
 - Rakefile
 - app/assets/stylesheets/formtastic.css
@@ -264,6 +264,7 @@ files:
 - lib/formtastic/helpers.rb
 - lib/formtastic/helpers/action_helper.rb
 - lib/formtastic/helpers/actions_helper.rb
+- lib/formtastic/helpers/enum.rb
 - lib/formtastic/helpers/errors_helper.rb
 - lib/formtastic/helpers/fieldset_wrapper.rb
 - lib/formtastic/helpers/file_column_detection.rb
@@ -325,11 +326,13 @@ files:
 - lib/formtastic/util.rb
 - lib/formtastic/version.rb
 - lib/generators/formtastic/form/form_generator.rb
+- lib/generators/formtastic/input/input_generator.rb
 - lib/generators/formtastic/install/install_generator.rb
 - lib/generators/templates/_form.html.erb
 - lib/generators/templates/_form.html.haml
 - lib/generators/templates/_form.html.slim
 - lib/generators/templates/formtastic.rb
+- lib/generators/templates/input.rb
 - lib/locale/en.yml
 - sample/basic_inputs.html
 - sample/config.ru
@@ -342,7 +345,9 @@ files:
 - spec/builder/custom_builder_spec.rb
 - spec/builder/error_proc_spec.rb
 - spec/builder/semantic_fields_for_spec.rb
+- spec/fast_spec_helper.rb
 - spec/generators/formtastic/form/form_generator_spec.rb
+- spec/generators/formtastic/input/input_generator_spec.rb
 - spec/generators/formtastic/install/install_generator_spec.rb
 - spec/helpers/action_helper_spec.rb
 - spec/helpers/actions_helper_spec.rb
@@ -355,6 +360,8 @@ files:
 - spec/helpers/semantic_errors_helper_spec.rb
 - spec/i18n_spec.rb
 - spec/input_class_finder_spec.rb
+- spec/inputs/base/collections_spec.rb
+- spec/inputs/base/validations_spec.rb
 - spec/inputs/boolean_input_spec.rb
 - spec/inputs/check_boxes_input_spec.rb
 - spec/inputs/color_input_spec.rb
@@ -376,6 +383,7 @@ files:
 - spec/inputs/placeholder_spec.rb
 - spec/inputs/radio_input_spec.rb
 - spec/inputs/range_input_spec.rb
+- spec/inputs/readonly_spec.rb
 - spec/inputs/search_input_spec.rb
 - spec/inputs/select_input_spec.rb
 - spec/inputs/string_input_spec.rb
@@ -390,7 +398,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/custom_macros.rb
-- spec/support/deferred_garbage_collection.rb
 - spec/support/deprecation.rb
 - spec/support/shared_examples.rb
 - spec/support/specialized_class_finder_shared_example.rb
@@ -431,7 +438,9 @@ test_files:
 - spec/builder/custom_builder_spec.rb
 - spec/builder/error_proc_spec.rb
 - spec/builder/semantic_fields_for_spec.rb
+- spec/fast_spec_helper.rb
 - spec/generators/formtastic/form/form_generator_spec.rb
+- spec/generators/formtastic/input/input_generator_spec.rb
 - spec/generators/formtastic/install/install_generator_spec.rb
 - spec/helpers/action_helper_spec.rb
 - spec/helpers/actions_helper_spec.rb
@@ -444,6 +453,8 @@ test_files:
 - spec/helpers/semantic_errors_helper_spec.rb
 - spec/i18n_spec.rb
 - spec/input_class_finder_spec.rb
+- spec/inputs/base/collections_spec.rb
+- spec/inputs/base/validations_spec.rb
 - spec/inputs/boolean_input_spec.rb
 - spec/inputs/check_boxes_input_spec.rb
 - spec/inputs/color_input_spec.rb
@@ -465,6 +476,7 @@ test_files:
 - spec/inputs/placeholder_spec.rb
 - spec/inputs/radio_input_spec.rb
 - spec/inputs/range_input_spec.rb
+- spec/inputs/readonly_spec.rb
 - spec/inputs/search_input_spec.rb
 - spec/inputs/select_input_spec.rb
 - spec/inputs/string_input_spec.rb
@@ -479,7 +491,6 @@ test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/custom_macros.rb
-- spec/support/deferred_garbage_collection.rb
 - spec/support/deprecation.rb
 - spec/support/shared_examples.rb
 - spec/support/specialized_class_finder_shared_example.rb

data/spec/support/deferred_garbage_collection.rb

@@ -1,21 +0,0 @@
-# Taken from http://makandra.com/notes/950-speed-up-rspec-by-deferring-garbage-collection
-class DeferredGarbageCollection
-
-  DEFERRED_GC_THRESHOLD = (ENV['DEFER_GC'] || 10.0).to_f
-
-  @@last_gc_run = Time.now
-
-  def self.start
-    GC.disable if DEFERRED_GC_THRESHOLD > 0
-  end
-
-  def self.reconsider
-    if DEFERRED_GC_THRESHOLD > 0 && Time.now - @@last_gc_run >= DEFERRED_GC_THRESHOLD
-      GC.enable
-      GC.start
-      GC.disable
-      @@last_gc_run = Time.now
-    end
-  end
-
-end