has_money_fields 0.0.2 → 0.0.3

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 .rvmrc
 Gemfile.lock
+sqlite3

data/History.md

@@ -1,11 +1,17 @@
 
-0.0.2 / 2011-07-14 
+0.0.3 / 2012-05-17
+==================
+
+  * Fix bug appearing when field include text like "0.99 + VAT"
+  * Fix tests not running on ruby 1.9.2
+
+0.0.2 / 2011-07-14
 ==================
 
   * Added possibility to use some AR validations
   * Added changelog
 
-0.0.1 / 2011-07-14 
+0.0.1 / 2011-07-14
 ==================
 
   * Added TODO for future version

data/README.md

@@ -56,7 +56,7 @@ p = Product.new :price => Money.new(1000, "EUR"), :name => "T-shirt"
 p.price # => #<Money cents:1000 currency:EUR>
 p.price.format # => "10.00 €"
 p.price.cents # => 1000
-p.price.currency_as_string => "€"
+p.price.currency_as_string # => "€"
 ```
 
 To use the default currency from the money gem, you'd rather drop the
@@ -68,6 +68,21 @@ class Product < ActiveRecord::Base
 end
 ```
 
+## Validations
+
+You can use ActiveRecord validations, as the following example:
+
+```ruby
+class Product < ActiveRecord::Base
+  has_money_fields :price
+  validates :price, :presence => true
+end
+
+product = Product.new :price => nil
+product.save # => false
+product.valid? # => false
+```
+
 # TODO
 
- * Make dirty attributes and validations work
+ * Make dirty attributes work

data/has_money_fields.gemspec

@@ -26,7 +26,7 @@ currency data in a safe and clean way.
   s.add_dependency "money"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec", "~> 2"
-  s.add_development_dependency "ruby-debug"
+  s.add_development_dependency "ruby-debug19"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
 end

data/lib/has_money_fields/version.rb

@@ -1,3 +1,3 @@
 module HasMoneyFields
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/has_money_fields.rb

@@ -10,6 +10,8 @@ module HasMoneyFields
 
       args.each do |attr|
         converter = Proc.new do |value|
+	  # remove all non digit and period characters from the price
+          value.gsub! /[^\.|\d]/, ""
           if value.respond_to? :to_money
             value.to_money
           else

data/spec/has_money_fields_spec.rb

@@ -1,4 +1,4 @@
-require "spec/spec_helper"
+require "spec_helper"
 
 describe "Model with money fields" do
   context "for cents and currency" do
@@ -39,6 +39,16 @@ describe "Model with money fields" do
     its(:money_price_in_usd) { should be_nil }
   end
 
+  context "with price combining text and numbers" do
+    before do
+      @product = Product.create! :price => "$1000 + VAT"
+    end
+    subject {@product}
+
+    its(:money_price){ should == 100000 }
+    its(:currency_price){ should == "USD" }    
+  end
+
   context "with validations" do
     before do
       Product.class_eval do

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ ActiveRecord::Base.establish_connection({
   :database => ":memory:",
 })
 
-require 'lib/has_money_fields'
-require 'spec/models'
+require 'has_money_fields'
+require 'models'

metadata

@@ -1,135 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: has_money_fields
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Francisco J. Casas
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-14 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: money
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: |
-  Use the Money gem and ActiveRecord's composed_of to store fields wich contains
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Use the Money gem and ActiveRecord''s composed_of to store fields
+  wich contains
+
   currency data in a safe and clean way.
 
-email: 
+'
+email:
 - fran@zorros.be
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Guardfile
@@ -143,41 +148,31 @@ files:
 - spec/has_money_fields_spec.rb
 - spec/models.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://zorros.be
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: has_money_fields
-rubygems_version: 1.5.3
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Persist your money on a clean and easy way with Money gem
-test_files: 
+test_files:
 - spec/has_money_fields_spec.rb
 - spec/models.rb
 - spec/spec_helper.rb