formtastic 2.2.0 → 2.2.1

data/Appraisals

@@ -13,6 +13,6 @@ end
 if ENV["RAILS_EDGE"] == "true"
   appraise 'rails-4' do
     gem 'rails', :git => 'git://github.com/rails/rails.git'
-    gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git'  
+    gem 'active_record_deprecated_finders', :git=>'https://github.com/rails/active_record_deprecated_finders.git'
   end
 end

data/CHANGELOG

@@ -1,3 +1,15 @@
+2.2.1
+
+* Rails 4 compatibilty updates
+* corrected configuration template for i18n lookups, which default to true
+* removed custom_inline_order from configuration and template (code was removed in 2.0)
+* added documentation for button/action i18n keys
+* other documentation improvements
+
+2.2.0
+
+* documentation improvements for generator
+
 2.2.0.rc
 
 * removed deprecated buttons DSL, ButtonHelper and commit_button helper

data/formtastic.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rcov>, ["~> 0.9.9"])
   s.add_development_dependency(%q<colored>)
   s.add_development_dependency(%q<tzinfo>)
-  s.add_development_dependency(%q<ammeter>, ["~> 0.2.2"])
+  s.add_development_dependency(%q<ammeter>, ["~> 0.2.5"])
   s.add_development_dependency(%q<appraisal>)
   s.add_development_dependency(%q<rake>)
 end

data/gemfiles/rails-4.gemfile

@@ -3,6 +3,6 @@
 source :rubygems
 
 gem "rails", :git=>"git://github.com/rails/rails.git"
-gem "sprockets-rails", :git=>"https://github.com/rails/sprockets-rails.git"
+gem "active_record_deprecated_finders", :git=>"https://github.com/rails/active_record_deprecated_finders.git"
 
 gemspec :path=>"../"

data/lib/formtastic/form_builder.rb

@@ -18,7 +18,6 @@ module Formtastic
     configure :label_str_method, :humanize
     configure :collection_label_methods, %w[to_label display_name full_name name title username login value to_s]
     configure :collection_value_methods, %w[id to_s]
-    configure :custom_inline_order, {}
     configure :file_methods, [ :file?, :public_filename, :filename ]
     configure :file_metadata_suffixes, ['content_type', 'file_name', 'file_size']
     configure :priority_countries, ["Australia", "Canada", "United Kingdom", "United States"]

data/lib/formtastic/helpers/action_helper.rb

@@ -12,6 +12,22 @@ module Formtastic
       # The textual value of the label can be changed from the default through the `:label`
       # argument or through i18n.
       #
+      # If using i18n, you'll need to provide the following translations:
+      #
+      #   en:
+      #     formtastic:
+      #       actions:
+      #         create: "Create new %{model}"
+      #         update: "Save %{model}"
+      #         cancel: "Cancel"
+      #         reset: "Reset form"
+      #         submit: "Submit"
+      #
+      # For forms with an object present, the `update` key will be used if calling `persisted?` on 
+      # the object returns true (saving changes to a record), otherwise the `create` ey will be 
+      # used. The `submit` key is used as a fallback when there is no object or we cannot determine 
+      # if `create` or `update` is appropriate.
+      #
       # @example Basic usage
       #   # form
       #   <%= semantic_form_for @post do |f| %>

data/lib/formtastic/helpers.rb

@@ -1,5 +1,4 @@
 module Formtastic
-  # @private
   module Helpers
     autoload :ButtonsHelper, 'formtastic/helpers/buttons_helper'
     autoload :ActionHelper, 'formtastic/helpers/action_helper'

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/lib/generators/formtastic/install/install_generator.rb

@@ -12,8 +12,8 @@ module Formtastic
     source_root File.expand_path('../../../templates', __FILE__)
     class_option :template_engine
 
-    if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1
-      # Rails 3.1 has the asset pipeline, no need to copy CSS files any more
+    if ::Rails::VERSION::MAJOR==4 || (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1)
+      # Rails 3.1+ has the asset pipeline, no need to copy CSS files any more
       desc "Copies a config initializer to config/initializers/formtastic.rb"
       def copy_files
         copy_file 'formtastic.rb', 'config/initializers/formtastic.rb'

data/lib/generators/templates/formtastic.rb

@@ -49,20 +49,14 @@
 # Formtastic::FormBuilder.collection_label_methods = [
 #   "to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
 
-# Additionally, you can customize the order for specific types of inputs.
-# This is configured on a type basis and if a type is not found it will
-# fall back to the default order as defined by #inline_order
-# Formtastic::FormBuilder.custom_inline_order[:checkbox] = [:errors, :hints, :input]
-# Formtastic::FormBuilder.custom_inline_order[:select] = [:hints, :input, :errors]
-
 # Specifies if labels/hints for input fields automatically be looked up using I18n.
 # Default value: true. Overridden for specific fields by setting value to true,
 # i.e. :label => true, or :hint => true (or opposite depending on initialized value)
 # Formtastic::FormBuilder.i18n_lookups_by_default = false
 
 # Specifies if I18n lookups of the default I18n Localizer should be cached to improve performance.
-# Defaults to false.
-# Formtastic::FormBuilder.i18n_cache_lookups = true
+# Defaults to true.
+# Formtastic::FormBuilder.i18n_cache_lookups = false
 
 # Specifies the class to use for localization lookups. You can create your own
 # class and use it instead by subclassing Formtastic::Localizer (which is the default).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formtastic
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70196963267220 !ruby/object:Gem::Requirement
+  requirement: &70298104933820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196963267220
+  version_requirements: *70298104933820
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70196963266740 !ruby/object:Gem::Requirement
+  requirement: &70298104933340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70196963266740
+  version_requirements: *70298104933340
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &70196963266260 !ruby/object:Gem::Requirement
+  requirement: &70298112364540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70196963266260
+  version_requirements: *70298112364540
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70196963265780 !ruby/object:Gem::Requirement
+  requirement: &70298112363620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *70196963265780
+  version_requirements: *70298112363620
 - !ruby/object:Gem::Dependency
   name: BlueCloth
-  requirement: &70196963265400 !ruby/object:Gem::Requirement
+  requirement: &70298112362700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196963265400
+  version_requirements: *70298112362700
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70196963264840 !ruby/object:Gem::Requirement
+  requirement: &70298112361420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70196963264840
+  version_requirements: *70298112361420
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70196963264320 !ruby/object:Gem::Requirement
+  requirement: &70298112360140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *70196963264320
+  version_requirements: *70298112360140
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70196963263940 !ruby/object:Gem::Requirement
+  requirement: &70298112359180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196963263940
+  version_requirements: *70298112359180
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70196963263480 !ruby/object:Gem::Requirement
+  requirement: &70298112357500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,21 +109,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196963263480
+  version_requirements: *70298112357500
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70196963262960 !ruby/object:Gem::Requirement
+  requirement: &70298104958780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.5
   type: :development
   prerelease: false
-  version_requirements: *70196963262960
+  version_requirements: *70298104958780
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70196963262540 !ruby/object:Gem::Requirement
+  requirement: &70298104958360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196963262540
+  version_requirements: *70298104958360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70196963262080 !ruby/object:Gem::Requirement
+  requirement: &70298104957900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196963262080
+  version_requirements: *70298104957900
 description: A Rails form builder plugin/gem with semantically rich and accessible
   markup
 email: