acts_as_price 0.2.0 → 0.2.1

data/README.rdoc

@@ -65,6 +65,9 @@ To test the plugin use the command 'rspec spec/**' inside the dir '~/vendor/plug
 =KNOWN BUGS
 The command 'rake test' is not running properly at the moment.
 
+When creating a text_field, by default Rails gets the 'raw' value from the database, so you probably get the wrong value in your text_field. To prevent this please do the following:
+ f.textfield :price, :value => @object.price
+
 =NOTES
 This plugin comes with Rspec tests. 
 However this plugin assumes that you have a database configuration, it actually don't use the database for the Rspec tests.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/acts_as_price.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_price}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeroen van Ingen"]
-  s.date = %q{2011-05-01}
+  s.date = %q{2011-05-02}
   s.description = %q{A specified database column acts as a price and creates on the fly methods like 'price' and 'price_in_cents'. For more information visit: http://github.com/jeroeningen/acts_as_price}
   s.email = %q{jeroeningen@gmail.com}
   s.extra_rdoc_files = [

data/lib/acts_as_price.rb

@@ -18,7 +18,7 @@ module ActiveRecord
           
           #setters
           define_method("#{column_name}=") do |val|
-            super((val.to_s.gsub(",", ".").to_f * 100).to_s)
+            super(((val.to_s.gsub(",", ".").to_f * 100) + 0.5).to_s)
           end
           alias_method("price=", "#{column_name}=")
           
@@ -29,7 +29,7 @@ module ActiveRecord
           
           #getters
           define_method(column_name) do
-            if super == 0.0
+            if super.blank? or super == 0.0
               ""
             else
               if comma

data/lib/acts_as_price_helper.rb

@@ -28,8 +28,12 @@ module ActsAsPriceHelper
       #test for special cases
       #test if 1.5 is returned as 1.50
       test_setter_in_doubles "#{currency}. 1.5", seperator
+      test_setter_in_doubles "#{currency}. 1.505", seperator
+      test_setter_in_doubles "#{currency}. 1.504", seperator
       #test if 1,5 is returned as 1.50
       test_setter_in_doubles "#{currency}. 1,5", seperator
+      test_setter_in_doubles "#{currency}. 1,505", seperator
+      test_setter_in_doubles "#{currency}. 1,504", seperator
 
       #test if float returns 2.05 correctly 
       #float can return 2.05 as 2.04 in some cases
@@ -65,7 +69,7 @@ module ActsAsPriceHelper
     columns_in_cents.each do |setter|
       @acts_as_price_model.send("#{setter}=", cents)
       columns_in_cents.each do |getter|
-        @acts_as_price_model.send(getter).should == cents.to_i
+        @acts_as_price_model.send(getter).should == (cents.to_f + 0.5).to_i
       end
       columns_in_doubles.each do |getter|
         if cents == ""
@@ -89,16 +93,16 @@ module ActsAsPriceHelper
     columns_in_doubles.each do |setter|
       @acts_as_price_model.send("#{setter}=", double)
       columns_in_cents.each do |getter|
-        @acts_as_price_model.send(getter).should == (double.gsub(",", ".").to_f * 100).to_s.to_i
+        @acts_as_price_model.send(getter).should == ((double.gsub(",", ".").to_f * 100) + 0.5).to_s.to_i
       end
       columns_in_doubles.each do |getter|
         if double == ""
           @acts_as_price_model.send(getter).should == ""
         else
           if currency
-            @acts_as_price_model.send(getter).should == currency + ". " + sprintf("%.2f", double.gsub(",", ".")).gsub(".", seperator)
+            @acts_as_price_model.send(getter).should == currency + ". " + sprintf("%.2f", double.gsub(",", ".").to_s).gsub(".", seperator)
           else
-            @acts_as_price_model.send(getter).should == sprintf("%.2f", double.gsub(",", ".")).gsub(".", seperator)
+            @acts_as_price_model.send(getter).should == sprintf("%.2f", double.gsub(",", ".").to_s).gsub(".", seperator)
           end
         end
       end

data/spec/advanced_tests/car_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("../../spec_helper", __FILE__)
 describe Car do
   before(:each) do
     @column_name = :price
-    @acts_as_price_model = stub_model(Car, :brand => "Ford", :cartype => "Focus", :price => "23995,99")
+    @acts_as_price_model = stub_model(Car, :brand => "Ford", :cartype => "Stationwagon", :model => "Focus", :price => "23995,99")
   end
 
   context "given an empty car" do
@@ -11,6 +11,7 @@ describe Car do
       car = Car.new
       should validate_presence_of :brand
       should validate_presence_of :cartype
+      should validate_presence_of :model
       car.valid?.should be_false
       car.save.should be_false
     end
@@ -52,6 +53,8 @@ describe Car do
     it "should convert it to the right price in cents" do
       test_setter_in_doubles "EUR. 25500,5", ","
       test_setter_in_doubles "EUR. 21599,05", ","
+      test_setter_in_doubles "EUR. 21599,055", ","
+      test_setter_in_doubles "EUR. 21599,054", ","
     end
   end
   

data/spec/advanced_tests/fueltype_spec.rb

@@ -53,6 +53,8 @@ describe Fueltype do
     it "should convert it to the right price in cents" do
       test_setter_in_doubles "1.5", @seperator
       test_setter_in_doubles "2.05", @seperator
+      test_setter_in_doubles "2.055", @seperator
+      test_setter_in_doubles "2.054", @seperator
     end
   end
   

data/spec/simple_tests/car_and_fueltype_spec.rb

@@ -11,6 +11,12 @@ describe Car do
       car = stub_model(Car, :price => "23000,59")
       car.price_in_cents.should == 2300059
     end
+    it "should return the right rounded price" do
+      car = stub_model(Car, :price => "23000,595")
+      car.price.should == "EUR. 23000,60"
+      car = stub_model(Car, :price => "23000,594")
+      car.price.should == "EUR. 23000,59"
+    end
   end
   
   context "adding the price as a dot seperated value" do
@@ -35,6 +41,13 @@ describe Car do
       car.currency.should == "EUR"
     end
   end
+
+  context "empty car" do
+    it "should return no price" do
+      car = Car.new
+      car.price.should == ""
+    end
+  end
 end
 
 #Fueltype returns the price as a dot seperated value
@@ -45,6 +58,12 @@ describe Fueltype do
       fueltype.price.should == "1.59"
       fueltype.price_per_liter.should == "1.59"
     end
+    it "should return the right rounded price" do
+      fueltype = stub_model(Fueltype, :price => "1,595")
+      fueltype.price.should == "1.60"
+      fueltype = stub_model(Fueltype, :price => "1,594")
+      fueltype.price.should == "1.59"
+    end
     it "should return the price in cents" do
       fueltype = stub_model(Fueltype, :price_per_liter => "1,59")
       fueltype.price_per_liter_in_cents.should == 159
@@ -80,4 +99,17 @@ describe Fueltype do
       fueltype.price_per_liter_in_cents.should == 205
     end
   end
+  context "using no currency" do
+    it "should return no currency" do
+      fueltype = stub_model(Fueltype)
+      fueltype.currency.should be_nil
+    end
+  end
+
+  context "empty fueltype" do
+    it "should return no price" do
+      fueltype = Fueltype.new
+      fueltype.price.should == ""
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_price
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeroen van Ingen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 -07:00
+date: 2011-05-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency