mongoid_money_field 3.2.1 → 4.0.0

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.idea

data/.travis.yml

@@ -1,16 +1,13 @@
 language: ruby
 services: mongodb
 gemfile:
-  - gemfiles/mongoid2.gemfile
-  - gemfiles/mongoid3.gemfile
+  #- gemfiles/money4-mongoid3.gemfile
+  #- gemfiles/money4-mongoid31.gemfile
+  - gemfiles/money50-mongoid3.gemfile
+  #- gemfiles/money50-mongoid31.gemfile
+  - gemfiles/money51-mongoid3.gemfile
+  - gemfiles/money51-mongoid31.gemfile
 rvm:
-  - 1.9.2
   - 1.9.3
-  - rbx-19mode
-  - jruby-19mode
-matrix:
-  exclude:
-    - rvm: 1.9.2
-      gemfile: gemfiles/mongoid3.gemfile
-    - rvm: rbx-19mode
-      gemfile: gemfiles/mongoid2.gemfile
+  #- rbx-19mode
+  #- jruby-19mode

data/Gemfile

@@ -1,13 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'mongoid', '>= 2.4.0'
-gem 'money'
-
-group :development do
-  gem "rspec", "~> 2.12.0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", ">= 1.1.0"
-  gem "jeweler", "~> 1.8.3"
-  gem "simplecov", '>= 0.4.0', :require => false
-  gem "database_cleaner", "~> 0.9.0"
-end
+# Specify your gem's dependencies in mongoid_money_field.gemspec
+gemspec

data/Gemfile.lock

@@ -1,59 +1,64 @@
+PATH
+  remote: .
+  specs:
+    mongoid_money_field (4.0.0)
+      money
+      mongoid (>= 3.0.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     builder (3.0.4)
     database_cleaner (0.9.1)
-    diff-lcs (1.1.3)
-    git (1.2.5)
+    diff-lcs (1.2.1)
     i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.5)
-    money (5.1.0)
+    json (1.7.7)
+    money (5.1.1)
       i18n (~> 0.6.0)
-    mongoid (3.0.14)
-      activemodel (~> 3.1)
-      moped (~> 1.1)
+    mongoid (3.1.2)
+      activemodel (~> 3.2)
+      moped (~> 1.4.2)
       origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    moped (1.3.0)
-    multi_json (1.4.0)
+    mongoid-rspec (1.7.0)
+      mongoid (>= 3.0.1)
+      rake
+      rspec (>= 2.9)
+    moped (1.4.5)
+    multi_json (1.7.2)
     origin (1.0.11)
-    rake (10.0.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.1.0)
-  database_cleaner (~> 0.9.0)
-  jeweler (~> 1.8.3)
-  money
-  mongoid (>= 2.4.0)
-  rdoc (~> 3.12)
-  rspec (~> 2.12.0)
-  simplecov (>= 0.4.0)
+  bundler (~> 1.3.4)
+  database_cleaner (~> 0.9.1)
+  mongoid-rspec (~> 1.7.0)
+  mongoid_money_field!
+  rake
+  rdoc (~> 4.0.1)
+  rspec (~> 2.13.0)
+  simplecov (~> 0.7.1)

data/{MIT-LICENSE.txt → LICENSE.txt}

@@ -1,4 +1,6 @@
-Copyright (c) 2012 glebtv
+Copyright (c) 2013 Gleb Tv
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -15,8 +15,21 @@ A simple gem that creates a Money datatype using RubyMoney for Mongoid.
 
 Inspired by https://gist.github.com/840500
 
+== Alternatives
+
+https://github.com/RubyMoney/money-rails
+
+With v4 storage format of mongoid money field is identical to that of money-rails
+
 == Updating
-v3 breaks backwards compatibility in favour of having syntax and defaults similar to field mongoid macro
+
+v4 is a massive refactor. Storage format is now a hash, like money-rails, instead of two separate cents and currency fields
+Old values should be still accessible after you update. To migrate to new storage format do:
+
+    YourModel.migrate_from_money_field_3!(your_money_fields)
+
+
+v3 has a minor break of backwards compatibility in favour of having syntax and defaults similar to field mongoid macro
 
 To get the same behaviour as 1.0 please add "default: 0" to field declaration, like this
 
@@ -72,5 +85,5 @@ DummyMoney.where(price_cents: 123).first
 
 == Copyright
 
-Copyright (c) 2012 glebtv. MIT License.
+Copyright (c) 2012-2013 glebtv (http://rocketscience.pro). MIT License.
 

data/Rakefile

@@ -1,44 +1,9 @@
-# encoding: utf-8
+require "bundler/gem_tasks"
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "mongoid_money_field"
-  gem.homepage = "http://github.com/glebtv/mongoid_money_field"
-  gem.license = "MIT"
-  gem.summary = %Q{Use RubyMoney with mongoid}
-  gem.description = %Q{Use RubyMoney with mongoid}
-  gem.email = "glebtv@gmail.com"
-  gem.authors = ["glebtv"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
 
+desc 'Default: run specs.'
 task :default => :spec
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mongoid_money_field #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+desc "Run specs"
+RSpec::Core::RakeTask.new

data/gemfiles/{mongoid3.gemfile → money4-mongoid3.gemfile}

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem 'mongoid', '~> 3.0.0'
-gem 'money'
+gem "money", "~> 4.0.2"
 
 gem "rspec", "~> 2.12.0"
 gem "rdoc", "~> 3.12"

data/gemfiles/money4-mongoid31.gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+gem 'mongoid', '~> 3.1.0'
+gem "money", "~> 4.0.2"
+
+gem "rake"
+gem "bundler", "~> 1.3.4"
+gem "rspec", "~> 2.13.0"
+gem "rdoc", "~> 4.0.1"
+gem "simplecov", "~> 0.7.1", require: false
+gem "database_cleaner", "~> 0.9.1"
+gem "mongoid-rspec", "~> 1.7.0"

data/gemfiles/{mongoid2.gemfile → money50-mongoid3.gemfile}

@@ -1,11 +1,11 @@
-source "http://rubygems.org"
-
-gem 'mongoid', '~> 2.4.0'
-gem 'money'
-
-gem "rspec", "~> 2.12.0"
-gem "rdoc", "~> 3.12"
-gem "bundler", ">= 1.1.0"
-gem "jeweler", "~> 1.8.3"
-gem "simplecov", '>= 0.4.0', :require => false
+source "http://rubygems.org"
+
+gem 'mongoid', '~> 3.0.0'
+gem "money", "~> 5.0.0"
+
+gem "rspec", "~> 2.12.0"
+gem "rdoc", "~> 3.12"
+gem "bundler", ">= 1.1.0"
+gem "jeweler", "~> 1.8.3"
+gem "simplecov", '>= 0.4.0', :require => false
 gem "database_cleaner", "~> 0.9.0"

data/gemfiles/money50-mongoid31.gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+gem 'mongoid', '~> 3.1.0'
+gem "money", "~> 5.0.0"
+
+gem "rake"
+gem "bundler", "~> 1.3.4"
+gem "rspec", "~> 2.13.0"
+gem "rdoc", "~> 4.0.1"
+gem "simplecov", "~> 0.7.1", require: false
+gem "database_cleaner", "~> 0.9.1"
+gem "mongoid-rspec", "~> 1.7.0"

data/gemfiles/money51-mongoid3.gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gem 'mongoid', '~> 3.0.0'
+gem "money", "~> 5.1.1"
+
+gem "rspec", "~> 2.12.0"
+gem "rdoc", "~> 3.12"
+gem "bundler", ">= 1.1.0"
+gem "jeweler", "~> 1.8.3"
+gem "simplecov", '>= 0.4.0', :require => false
+gem "database_cleaner", "~> 0.9.0"

data/gemfiles/money51-mongoid31.gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+gem 'mongoid', '~> 3.1.0'
+gem "money", "~> 5.1.1"
+
+gem "rake"
+gem "bundler", "~> 1.3.4"
+gem "rspec", "~> 2.13.0"
+gem "rdoc", "~> 4.0.1"
+gem "simplecov", "~> 0.7.1", require: false
+gem "database_cleaner", "~> 0.9.1"
+gem "mongoid-rspec", "~> 1.7.0"

data/lib/mongoid_money_field.rb

@@ -1,119 +1,161 @@
 #encoding: utf-8
 
-require 'money'
+require "money"
+require "mongoid_money_field/version"
+require "mongoid_money_field/field"
 
 module Mongoid
   module MoneyField
     extend ActiveSupport::Concern
-    
-    included do
-    end
 
     module ClassMethods
-
-      def money_field( *columns )
+      def money_field(*columns)
         opts = columns.last.is_a?( Hash ) ? columns.pop : {}
         opts = {
-          fixed_currency: nil,
-          default: nil,
-          required: false,
-          default_currency: nil
+            fixed_currency: nil,
+            default: nil,
+            required: false,
+            default_currency: nil
         }.merge( opts )
 
-        [ columns ].flatten.each do |name|
-          default, default_cents = nil, nil
+        ensure_default = Proc.new do |currency|
+          if opts[:fixed_currency].nil?
+            if currency.nil?
+              if opts[:default_currency].nil?
+                Money.default_currency
+              else
+                opts[:default_currency]
+              end
+            else
+              currency
+            end
+          else
+            opts[:fixed_currency]
+          end
+        end
 
+        [columns].flatten.each do |name|
+          default = nil
           name = name.to_s
-
           unless opts[:default].nil?
-            default = Money.parse( opts[:default] )
-            default_cents = default.cents
+            default = Money.parse(opts[:default])
           end
 
-          attr_cents            = name + '_cents'
-          attr_currency         = name + '_currency'
-          attr_plain            = name + '_plain'
-          attr_before_type_cast = name + '_before_type_cast'
-
-          field attr_cents, type: Integer, default: default_cents
+          field name, type: Money, default: default
+          validates_presence_of name if opts[:required]
 
-          attr_accessible attr_plain, name
+          define_method("#{name}=") do |value|
+            instance_variable_set( "@#{name}_before_type_cast".to_sym, value)
 
-          if opts[:required]
-            validates_presence_of name
-          end
-
-          if opts[:fixed_currency].nil?
-            default_currency = nil
-
-            if opts[:default_currency].nil?
-              default_currency = default.currency.iso_code unless default.nil?
+            if value.blank?
+              write_attribute(name, nil)
             else
-              default_currency = opts[:default_currency]
-            end
-
-            field attr_currency, type: String, default: default_currency
+              if opts[:default_currency].nil?
+                money = value.to_money
+              else
+                old_default = Money.default_currency
+                Money.default_currency = Money::Currency.new(opts[:default_currency])
+                money = value.to_money
+                Money.default_currency = old_default
+              end
 
-            if default_currency.nil?
-              before_save do
-                self[ attr_currency ] ||= Money.default_currency.iso_code
+              unless opts[:fixed_currency].nil?
+                money = Money.new(money.cents, opts[:fixed_currency])
               end
+
+              write_attribute(name, money)
+              remove_attribute("#{name}_currency")
+              remove_attribute("#{name}_cents")
             end
           end
 
-          define_method( attr_before_type_cast ) do
-            code = ( opts[:fixed_currency].nil? ? read_attribute( attr_currency ) : opts[:fixed_currency] ) 
-            currency = Money::Currency.find( code ) || Money.default_currency
-
-            value = self.send( attr_plain )
-
-            return if value.nil?
+          # mongoid money field 2 compat
+          define_method(name) do
+            if read_attribute("#{name}_cents").nil?
+              value = read_attribute(name)
+              if value.nil?
+                nil
+              else
+                if value.is_a?(Hash)
+                  value[:currency_iso] = ensure_default.call(value[:currency_iso])
+                end
+                Money.demongoize(value)
+              end
 
-            value.gsub( currency.thousands_separator, '' ).gsub( currency.decimal_mark, '.' )
+            else
+              currency = read_attribute("#{name}_currency")
+              currency = ensure_default.call(currency)
+              Money.new(read_attribute("#{name}_cents"), currency)
+            end
           end
 
-          define_method( name ) do
-            cents = read_attribute( attr_cents )
+          define_method("#{name}_before_type_cast") do
+            instance_variable_get( "@#{name}_before_type_cast".to_sym) || send(name).to_s
+          end
 
-            code = opts[:fixed_currency].nil? ? read_attribute( attr_currency ) : opts[:fixed_currency]
+          # deprecated
+          define_method("migrate_#{name}_from_money_3!") do
+            cents = read_attribute("#{name}_cents")
+            if cents.nil?
+              send("#{name}=", nil)
+            else
+              currency = read_attribute("#{name}_currency")
+
+              if currency.nil?
+                if opts[:default_currency].nil?
+                  currency = Money.default_currency
+                else
+                  currency = opts[:default_currency]
+                end
+              end
 
-            cents.nil? ? nil : Money.new( cents, code || ::Money.default_currency )
+              unless opts[:fixed_currency].nil?
+                currency = opts[:fixed_currency]
+              end
+              send("#{name}=", Money.new(cents, currency))
+            end
           end
-          
-          define_method( attr_plain ) do
-            value = instance_variable_get( "@#{attr_plain}".to_sym )
-            value = self.send( name ) if value.nil?
-            value = value.format( symbol: false, no_cents_if_whole: true, thousands_separator: false ) if value.is_a?( Money )
 
-            value
+          # deprecated
+          define_method("#{name}_cents") do
+            send(name).nil? ? 0 : send(name).cents
           end
-          
-          define_method( "#{attr_plain}=" ) do |value|
-            instance_variable_set( "@#{attr_plain}".to_sym, value )
 
-            if value.blank?
-              write_attribute( attr_cents, nil )
-              write_attribute( attr_currency, nil ) if opts[:fixed_currency].nil?
-              
-              return
+          # deprecated
+          define_method("#{name}_currency") do
+            if opts[:fixed_currency].nil?
+              send(name).nil? ? Money.default_currency : send(name).currency.iso_code
+            else
+              opts[:fixed_currency]
             end
+          end
 
-            if opts[:default_currency].nil?
-              money = value.to_money
+          # deprecated
+          define_method("#{name}_cents=") do |val|
+            send("#{name}=", Money.new(val, send("#{name}_currency")))
+          end
 
-            else
-              old_default = Money.default_currency
-              Money.default_currency = Money::Currency.new( opts[:default_currency] )
-              money = value.to_money
-              Money.default_currency = old_default
-            end
+          # deprecated
+          define_method("#{name}_currency=") do |val|
+            send("#{name}=", Money.new(send("#{name}_cents"), val))
+          end
 
-            write_attribute( attr_cents, money.cents )
-            write_attribute( attr_currency, money.currency.iso_code ) if opts[:fixed_currency].nil?            
+          # deprecated
+          define_method("#{name}_plain=") do |val|
+            send("#{name}=", val)
+          end
+          # deprecated
+          define_method("#{name}_plain") do |val|
+            send("#{name}")
           end
+        end
+      end
 
-          define_method( "#{name}=" ) do |value|
-            self.send( "#{attr_plain}=", value )
+      def migrate_from_money_field_3!(*columns)
+        each do |val|
+          [columns].flatten.each do |name|
+            val.send("migrate_#{name.to_s}_from_money_3!")
+            val.save!
           end
         end
       end