acts_as_decimal 1.0.3 → 1.0.4

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/acts_as_decimal.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_decimal}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oriol Gual", "Josep M. Bach", "Josep Jaume Rey"]
-  s.date = %q{2010-08-09}
+  s.date = %q{2010-08-13}
   s.description = %q{Rails 3 gem to treat an attribute as a decimal (getting and setting floating-point values) but storing it as an integer in the database (useful for prices and other precision-needed attributes like money).}
   s.email = %q{info@codegram.com}
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/codegram/acts_as_decimal}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Treat an attribute as if it were a decimal, storing it as an integer in the database.}
   s.test_files = [
     "spec/acts_as_decimal_spec.rb",
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.rc"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
       s.add_development_dependency(%q<activerecord>, [">= 3.0.0.rc"])

data/lib/acts_as_decimal/acts_as_decimal.rb

@@ -19,9 +19,10 @@ module ActsAsDecimal
       fields.each do |field|
         class_eval <<-EOC
           def #{field}
-            (self[:#{field}].nil? ? nil : (BigDecimal.new(self[:#{field}].to_s) / BigDecimal('10').power(#{options[:decimals]})).to_f)
+            # DOES NOT WORK PROPERLY WITH VIM (WTF¿?): (self[:#{field}].nil? ? nil : (BigDecimal.new(self[:#{field}].to_s) / BigDecimal('10').power(#{options[:decimals]})).to_f)
+            (self[:#{field}].nil? ? nil : (self[:#{field}] / BigDecimal('10').power(#{options[:decimals]}).to_f))
           end
-          def humanized_#{field}(options = {:thousand_delimiters => true})
+          def human_#{field}(options = {:thousand_delimiters => true})
             
             return nil if #{field}.blank?
 
@@ -34,7 +35,13 @@ module ActsAsDecimal
               groups = a[0].reverse.scan(/\\d{3}/) 
               rest = a[0].gsub(groups.join.reverse, '').reverse
               groups << rest unless rest.empty?
-              return groups.join('.').reverse + "," + b
+              if groups.last == '-'
+                groups.reject!{|x| x == '-'}
+                negative = true
+              end
+              humanized_string = negative ? "-" : ""
+              humanized_string += groups.join('.').reverse + "," + b
+              return humanized_string
             end
 
           end
@@ -55,4 +62,3 @@ module ActsAsDecimal
   end
 
 end
-

data/spec/acts_as_decimal_spec.rb

@@ -41,18 +41,18 @@ describe Product do
 
   end
 
-  describe "humanized helpers", "when retrieving the humanized value (as a string)" do
+  describe "human helpers", "when retrieving the human value (a pretty string)" do
 
     context "with a 3.900.400,00 price" do
 
-      subject { Product.new(:price => 3900400.00) }
+      subject { Product.new(:price => 3_900_400.00) }
 
-      it "has a humanized_price of 3.900.400,00" do
-        subject.humanized_price.should == "3.900.400,00"
+      it "has a human_price of 3.900.400,00" do
+        subject.human_price.should == "3.900.400,00"
       end
 
-      it "has a humanized_price(:thousand_delimiters => false) of 3900400.00" do
-        subject.humanized_price(:thousand_delimiters => false).should == "3900400.00"
+      it "has a human_price(:thousand_delimiters => false) of 3900400.00" do
+        subject.human_price(:thousand_delimiters => false).should == "3900400.00"
       end
 
     end
@@ -61,12 +61,12 @@ describe Product do
 
       subject { Product.new(:price => 20000.00) }
 
-      it "has a humanized_price of 20.000,00" do
-        subject.humanized_price.should == "20.000,00"
+      it "has a human_price of 20.000,00" do
+        subject.human_price.should == "20.000,00"
       end
 
-      it "has a humanized_price(:thousand_delimiters => false) of 20000.00" do
-        subject.humanized_price(:thousand_delimiters => false).should == "20000.00"
+      it "has a human_price(:thousand_delimiters => false) of 20000.00" do
+        subject.human_price(:thousand_delimiters => false).should == "20000.00"
       end
 
     end
@@ -75,12 +75,12 @@ describe Product do
 
       subject { Product.new(:price => 900.00) }
 
-      it "has a humanized_price of 900,00" do
-        subject.humanized_price.should == "900,00"
+      it "has a human_price of 900,00" do
+        subject.human_price.should == "900,00"
       end
 
-      it "has a humanized_price(:thousand_delimiters => false) of 900.00" do
-        subject.humanized_price(:thousand_delimiters => false).should == "900.00"
+      it "has a human_price(:thousand_delimiters => false) of 900.00" do
+        subject.human_price(:thousand_delimiters => false).should == "900.00"
       end
 
     end
@@ -89,15 +89,43 @@ describe Product do
 
         subject { Product.new(:price => "900.00") }
 
-        it "has a humanized_price of 900,00" do
-          subject.humanized_price.should == "900,00"
+        it "has a human_price of 900,00" do
+          subject.human_price.should == "900,00"
         end
 
-        it "has a humanized_price(:thousand_delimiters => false) of 900.00" do
-          subject.humanized_price(:thousand_delimiters => false).should == "900.00"
+        it "has a human_price(:thousand_delimiters => false) of 900.00" do
+          subject.human_price(:thousand_delimiters => false).should == "900.00"
         end
 
     end
+
+    context "with a negative float price -900.00" do
+
+      subject { Product.new(:price => -900.00) }
+
+      it "has a human_price of -900,00" do
+        subject.human_price.should == "-900,00"
+      end
+
+      it "has a human_price(:thousand_delimiters => false) of -900.00" do
+        subject.human_price(:thousand_delimiters => false).should == "-900.00"
+      end
+
+    end
+
+    context "with a negative string price '-900.00'" do
+
+      subject { Product.new(:price => "-900.00") }
+
+      it "has a human_price of -900,00" do
+        subject.human_price.should == "-900,00"
+      end
+
+      it "has a human_price(:thousand_delimiters => false) of -900.00" do
+        subject.human_price(:thousand_delimiters => false).should == "-900.00"
+      end
+
+    end
   end
 
   context "with a price of 10.30452 and specifying :decimals => 5" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Oriol Gual
@@ -16,14 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +02:00
+date: 2010-08-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -39,7 +38,6 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -56,7 +54,6 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -104,7 +101,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -112,7 +108,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -122,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Treat an attribute as if it were a decimal, storing it as an integer in the database.