money-mongoid 0.2.1 → 0.2.2

data/Gemfile

@@ -1,10 +1,11 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'money'
-gem 'mongoid',  "~> 3.0.0"
-gem 'origin'
-gem 'moped'
+gem 'mongoid',  ">= 2.4"
+gem 'origin',   '>= 1'
+gem 'moped',    '>= 1'
 gem 'origin-selectable_ext'
+gem 'sugar-high', '>= 0.7.2'
 
 # gem 'mongoid',       "~> 2.4"
 # gem 'bson'
@@ -18,7 +19,6 @@ group :development do
   gem "simplecov",">= 0.5"
 end
 
-group :test do  
-  gem 'moped'
-  gem 'bson_ext'
+group :test do
+  gem 'bson'
 end 

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.8)
       activesupport (= 3.2.8)
@@ -8,8 +8,6 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     bson (1.7.0)
-    bson_ext (1.7.0)
-      bson (~> 1.7.0)
     builder (3.0.3)
     diff-lcs (1.1.3)
     git (1.2.5)
@@ -48,20 +46,22 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    sugar-high (0.7.3)
     tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext
+  bson
   bundler (>= 1.1.0)
   jeweler (>= 1.8.4)
   money
-  mongoid (~> 3.0.0)
-  moped
-  origin
+  mongoid (>= 2.4)
+  moped (>= 1)
+  origin (>= 1)
   origin-selectable_ext
   rdoc (>= 3.12)
   rspec (>= 2.10)
   simplecov (>= 0.5)
+  sugar-high (>= 0.7.2)

data/README.md

@@ -1,6 +1,6 @@
 # Money for mongoid
 
-Use the [money](https://github.com/RubyMoney/money) gem with Mongoid 2.x and 3.x.
+Use the [money](https://github.com/RubyMoney/money) gem with Mongoid 2.4+, 3 (and 4).
 
 ## Install
 
@@ -18,12 +18,18 @@ Bundle via Terminal:
 
 ```ruby
 require 'money-mongoid'
-``
+```
 
 Now also supports MoneyRange with between queries and can even do dynamic currency conversions as part of the query!!! ;)
 
 See specs for usage examples, fx `money/mongoid/3x/money_spec.rb`
 
+## Spec note
+
+Please note that currently the `money/mongoid/monetize_spec.rb` fails with a number of errors. Please help fix these bugs
+
+However the `2x` and `3x` specs should pass just fine ;) 
+
 ## Contributing to money-mongoid
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/money/mongoid.rb

@@ -1,4 +1,5 @@
 require 'money'
+require 'sugar-high/delegate'
 require 'money/mongoid/core_ext'
 
 require 'money/orm/generic'

data/lib/money/mongoid/3x/money.rb

@@ -10,11 +10,11 @@ module Mongoize
 
   module ClassMethods
     def demongoize(value)
-      ::Money.new get_cents(value), get_currency(value)
+      value && ::Money.new( get_cents(value), get_currency(value) )
     end
 
     def evolve(object)
-      object.__evolve_to_money__.mongoize
+      object && object.__evolve_to_money__.mongoize
     end
 
     def custom_serialization?(operator)

data/lib/money/mongoid/core_ext/range.rb

@@ -18,19 +18,6 @@ class Money
   end
 end
 
-# http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
-class DelegateDecorator
-  def initialize(subject)
-    subject.public_methods(false).each do |meth|
-      (class << self; self; end).class_eval do
-        define_method meth do |*args|
-          subject.send meth, *args
-        end
-      end
-    end
-  end
-end
-
 class MoneyRange < DelegateDecorator
   attr_reader :iso_code, :range
 

data/money-mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "money-mongoid"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-09-24"
+  s.date = "2013-02-27"
   s.description = "Makes it easy to use money with mongoid"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/kristianmandrup/money-mongoid"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Mongoid support and integration for the money gem"
 
   if s.respond_to? :specification_version then
@@ -64,10 +64,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<money>, [">= 0"])
-      s.add_runtime_dependency(%q<mongoid>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<origin>, [">= 0"])
-      s.add_runtime_dependency(%q<moped>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2.4"])
+      s.add_runtime_dependency(%q<origin>, [">= 1"])
+      s.add_runtime_dependency(%q<moped>, [">= 1"])
       s.add_runtime_dependency(%q<origin-selectable_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<sugar-high>, [">= 0.7.2"])
       s.add_development_dependency(%q<rspec>, [">= 2.10"])
       s.add_development_dependency(%q<rdoc>, [">= 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.1.0"])
@@ -75,10 +76,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0.5"])
     else
       s.add_dependency(%q<money>, [">= 0"])
-      s.add_dependency(%q<mongoid>, ["~> 3.0.0"])
-      s.add_dependency(%q<origin>, [">= 0"])
-      s.add_dependency(%q<moped>, [">= 0"])
+      s.add_dependency(%q<mongoid>, [">= 2.4"])
+      s.add_dependency(%q<origin>, [">= 1"])
+      s.add_dependency(%q<moped>, [">= 1"])
       s.add_dependency(%q<origin-selectable_ext>, [">= 0"])
+      s.add_dependency(%q<sugar-high>, [">= 0.7.2"])
       s.add_dependency(%q<rspec>, [">= 2.10"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.1.0"])
@@ -87,10 +89,11 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<money>, [">= 0"])
-    s.add_dependency(%q<mongoid>, ["~> 3.0.0"])
-    s.add_dependency(%q<origin>, [">= 0"])
-    s.add_dependency(%q<moped>, [">= 0"])
+    s.add_dependency(%q<mongoid>, [">= 2.4"])
+    s.add_dependency(%q<origin>, [">= 1"])
+    s.add_dependency(%q<moped>, [">= 1"])
     s.add_dependency(%q<origin-selectable_ext>, [">= 0"])
+    s.add_dependency(%q<sugar-high>, [">= 0.7.2"])
     s.add_dependency(%q<rspec>, [">= 2.10"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.1.0"])

data/spec/money/mongoid/2x/money_spec.rb

@@ -1,11 +1,16 @@
 require 'money/mongoid/spec_helper'
-require 'money/mongoid/money'
+
+require 'money/mongoid/monetize'
+require 'money/mongoid/monetizable'
+
 require 'money/mongoid/2x/product'
 
 describe 'Mongoid custom Money type' do
   subject { product }
 
-  let(:product) do { Product.create  :price => Money.new(3000, 'USD') }
+  let(:product) do 
+    Product.create :price => Money.new(3000, 'USD')
+  end
 
   its(:price) { should be_a Money }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: origin-selectable_ext
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sugar-high
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3922419886446166376
+      hash: 2622379676700763146
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -238,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Mongoid support and integration for the money gem