amount_field 1.4.0 → 1.4.1

data/History.txt

@@ -1,3 +1,15 @@
+== 1.4.1 2010-04-23
+
+* Method amount_field considers given option "name" and "id":
+  <% form_for(@manager) do |f| %>
+    <%= f.amount_field :salary, :name => :salary, :id => "salary_id" %>
+    ...
+  =>
+  <input name="salary" id="salary_id" ... /> instead of 
+  <input name="manager[amount_field_value]" id="manager_salary"... />
+* fix: display invalid value in current format (e.g. in german format: "-0,1" or "12,34" 
+  and not "-0.1" and "12.34").
+
 == 1.4.0 2009-10-06
 
 * fix: negative values like '-1,00', '-1,0', '-1,' or '-1' are considered valid

data/Manifest

@@ -3,6 +3,7 @@ MIT-LICENSE
 Manifest
 README.rdoc
 Rakefile
+amount_field.gemspec
 init.rb
 install.rb
 lib/amount_field.rb

data/README.rdoc

@@ -9,12 +9,12 @@ Drop me a line if you encounter problems.
 
 As Gem:
 
-  $ gem sources -a http://gems.github.com (you only have to do this once)
-  $ sudo gem install thomasbaustert-amount_field
+  $ gem sources -a http://gemcutter.org/ (you only have to do this once)
+  $ sudo gem install amount_field
 
 As plugin:
 
-  $ script/plugin install git://github.com/thomasbaustert/amount_field.git
+  $ script/plugin install git://github.com/thomasbaustert/amount_field.git -r 2.3
 
 == Example
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('amount_field', '1.4.0') do |p|
+Echoe.new('amount_field', '1.4.1') do |p|
   p.description   = "Rails gem/plugin that accepts (amount) values in german or us format like 1.234,56 or 1,234.56"
   p.url           = "http://github.com/thomasbaustert/amount_field"
   p.author        = "Thomas Baustert"

data/amount_field.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amount_field}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Baustert"]
-  s.date = %q{2009-10-06}
+  s.date = %q{2010-04-23}
   s.description = %q{Rails gem/plugin that accepts (amount) values in german or us format like 1.234,56 or 1,234.56}
   s.email = %q{ business@thomasbaustert.de}
   s.extra_rdoc_files = ["README.rdoc", "lib/amount_field.rb", "lib/amount_field/configuration.rb", "lib/amount_field/form_helper.rb", "lib/amount_field/form_tag_helper.rb", "lib/amount_field/validations.rb"]
-  s.files = ["History.txt", "MIT-LICENSE", "Manifest", "README.rdoc", "Rakefile", "init.rb", "install.rb", "lib/amount_field.rb", "lib/amount_field/configuration.rb", "lib/amount_field/form_helper.rb", "lib/amount_field/form_tag_helper.rb", "lib/amount_field/validations.rb", "locale/de.yml", "locale/en.yml", "test/form_helper_test.rb", "test/form_tag_helper_test.rb", "test/models/test_product.rb", "test/test_helper.rb", "test/validations_test.rb", "uninstall.rb", "amount_field.gemspec"]
+  s.files = ["History.txt", "MIT-LICENSE", "Manifest", "README.rdoc", "Rakefile", "amount_field.gemspec", "init.rb", "install.rb", "lib/amount_field.rb", "lib/amount_field/configuration.rb", "lib/amount_field/form_helper.rb", "lib/amount_field/form_tag_helper.rb", "lib/amount_field/validations.rb", "locale/de.yml", "locale/en.yml", "test/form_helper_test.rb", "test/form_tag_helper_test.rb", "test/models/test_product.rb", "test/test_helper.rb", "test/validations_test.rb", "uninstall.rb"]
   s.homepage = %q{http://github.com/thomasbaustert/amount_field}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Amount_field", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{amount_field}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Rails gem/plugin that accepts (amount) values in german or us format like 1.234,56 or 1,234.56}
   s.test_files = ["test/form_helper_test.rb", "test/form_tag_helper_test.rb", "test/models/test_product.rb", "test/test_helper.rb", "test/validations_test.rb"]
 

data/lib/amount_field/form_helper.rb

@@ -1,6 +1,9 @@
 module AmountField #:nodoc:
   module Helpers #:nodoc:
 
+    #TODO/2010-04-23/tb remove redundant code
+    # using @template.amount_field(object, method, options) !?
+    
     module FormHelper #:nodoc:
 
       include ActionView::Helpers::NumberHelper
@@ -11,15 +14,16 @@ module AmountField #:nodoc:
         format_options.merge!(options.delete(:format) || {})
 
         object = options.delete(:object) || instance_variable_get("@#{object_name}")
-        
+
         # if no explicit value is given, we set a formatted one. In case of an error we take the
         # original value inserted by the user.
         unless object.errors.on(method)
           options[:value] ||= number_with_precision(object.send(method), format_options)
         else
-          options[:value] ||= object.send("#{method}_before_type_cast")
+          options[:value] ||= object.send("#{AmountField::Configuration.prefix}_#{method}") || object.send("#{method}_before_type_cast")
         end
-        options[:name]  = "#{object_name}[#{AmountField::Configuration.prefix}_#{method}]"
+
+        options[:name]  ||= "#{object_name}[#{AmountField::Configuration.prefix}_#{method}]"
         options[:class] = "#{options[:class]} #{AmountField::Configuration.css_class}"
         options[:id]    ||= "#{object_name}_#{method}"
 
@@ -33,7 +37,6 @@ module AmountField #:nodoc:
       include ActionView::Helpers::NumberHelper
 
       def amount_field(method, options = {})
-        #todo try to remove redundant code by using: @template.amount_field(object, method, options)
         format_options = I18n.t(:'number.amount_field.format', :raise => true) rescue {}
         format_options = format_options.merge(AmountField::ActiveRecord::Validations.configuration)
         format_options.merge!(options.delete(:format) || {})
@@ -41,16 +44,18 @@ module AmountField #:nodoc:
         if (explicit_object = options.delete(:object))
           self.object = explicit_object
         end
-            
+
         # if no explicit value is given, we set a formatted one. In case of an error we take the
         # original value inserted by the user.
         unless object.errors.on(method)
           options[:value] ||= number_with_precision(object.send(method), format_options)
         else
-          options[:value] ||= object.send("#{method}_before_type_cast")
+          options[:value] ||= object.send("#{AmountField::Configuration.prefix}_#{method}") || object.send("#{method}_before_type_cast")
         end
-        options[:name]  = "#{object_name}[#{AmountField::Configuration.prefix}_#{method}]"
+
+        options[:name]  ||= "#{object_name}[#{AmountField::Configuration.prefix}_#{method}]"
         options[:class] = "#{options[:class]} #{AmountField::Configuration.css_class}"
+        options[:id]    ||= "#{object_name}_#{method}"
         
         text_field(method, options)
       end

data/test/form_helper_test.rb

@@ -197,6 +197,74 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected_form, output_buffer
   end
   
+  test "consider option name if given" do
+    @test_product = TestProduct.new(:amount_field_price => "47.11")
+    form_for(:test_product, @test_product, :builder => MyFormBuilder) do |f|
+      concat f.amount_field(:price, :name => 'article')
+    end
+
+    expected_input =
+      "<input name='article' size='30'" + 
+      "       class=' amount_field' type='text' id='test_product_price' value='47.11' />"
+    expected_form =
+      "<form action='http://www.example.com' method='post'>#{expected_input}</form>"
+    
+    assert_dom_equal expected_input, amount_field(:test_product, :price, :name => 'article', :value => 47.11)
+    assert_dom_equal expected_form, output_buffer
+  end
+
+  test "consider option id if given" do
+    @test_product = TestProduct.new(:amount_field_price => "63.41")
+    form_for(:test_product, @test_product, :builder => MyFormBuilder) do |f|
+      concat f.amount_field(:price, :name => 'article', :id => 'my_id')
+    end
+
+    expected_input =
+      "<input name='article' size='30'" + 
+      "       class=' amount_field' type='text' id='my_id' value='63.41' />"
+    expected_form =
+      "<form action='http://www.example.com' method='post'>#{expected_input}</form>"
+    
+    assert_dom_equal expected_input, amount_field(:test_product, :price, :name => 'article', :id => 'my_id', :value => 63.41)
+    assert_dom_equal expected_form, output_buffer
+  end
+
+  test "invalid negative value is displayed with current format options" do
+    with_locale('de') do
+      class MyTestProduct < ActiveRecord::Base
+        set_table_name 'test_products'
+        validates_amount_format_of :price
+        validates_numericality_of :price, :greater_than_or_equal_to => 0.0
+      end
+      @test_product = MyTestProduct.new(:amount_field_price => "-0,1")
+      @test_product.valid?
+
+      form_for(:test_product, @test_product, :builder => MyFormBuilder) do |f|
+        concat f.amount_field(:price)
+      end
+
+      assert_match /value="-0,1"/, output_buffer
+    end
+  end
+
+  test "invalid positive value is displayed with current format options" do
+    with_locale('de') do
+      class MyTestProduct < ActiveRecord::Base
+        set_table_name 'test_products'
+        validates_amount_format_of :price
+        validates_numericality_of :price, :less_than_or_equal_to => 10.0
+      end
+      @test_product = MyTestProduct.new(:amount_field_price => "12,34")
+      @test_product.valid?
+
+      form_for(:test_product, @test_product, :builder => MyFormBuilder) do |f|
+        concat f.amount_field(:price)
+      end
+
+      assert_match /value="12,34"/, output_buffer
+    end
+  end
+  
   protected
   
     def protect_against_forgery?

data/test/validations_test.rb

@@ -371,7 +371,7 @@ class ValidationsTest < ActiveSupport::TestCase
     end
   end
   
-  test "something interesting" do
+  test "another validation macro validates the converted value" do
     class TestProductWithOtherValidationMacros < ActiveRecord::Base
       set_table_name 'test_products'
       validates_amount_format_of :price

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: amount_field
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Thomas Baustert
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 +02:00
+date: 2010-04-23 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +37,7 @@ files:
 - Manifest
 - README.rdoc
 - Rakefile
+- amount_field.gemspec
 - init.rb
 - install.rb
 - lib/amount_field.rb
@@ -47,7 +53,6 @@ files:
 - test/test_helper.rb
 - test/validations_test.rb
 - uninstall.rb
-- amount_field.gemspec
 has_rdoc: true
 homepage: http://github.com/thomasbaustert/amount_field
 licenses: []
@@ -66,18 +71,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: amount_field
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails gem/plugin that accepts (amount) values in german or us format like 1.234,56 or 1,234.56