money_column 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1e04965daf55ca824bb08e69a10501da5108f5df
+  data.tar.gz: 426dc2a7eb36f292aab6b147e200df9e4ea62dbc
+SHA512:
+  metadata.gz: c652cd1a9d755d933510e95ea87f7f466074d8105b6e5d1cfaade721de7e7decd0cd163174d17e58744b509d5b304670637ddbd699f0b389909525d9c3bfd879
+  data.tar.gz: c7b5703bfd2d32cb6b2097b8743cc12a02835299a13e1bace640daac8ebe7804a527b3637ea303a7e39853a7adb0342f74f75fb34dbd05d0d9d71b9bf2316e0c

data/Gemfile

@@ -3,4 +3,5 @@ source :rubygems
 # Specify gem dependencies in money_column.gemspec
 gemspec
 
-gem 'activesupport', '2.3.14'
+gem 'activesupport', '3.2.18'
+gem 'monetize', '0.3.0'

data/Gemfile.lock

@@ -1,23 +1,30 @@
 PATH
   remote: .
   specs:
-    money_column (0.2.1)
-      activesupport (>= 2.3.14)
-      money (~> 2.2.0)
+    money_column (0.2.3)
+      activesupport (= 3.2.18)
+      monetize (= 0.3.0)
+      money (= 6.1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (2.3.14)
+    activesupport (3.2.18)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     diff-lcs (1.1.3)
     growl (1.0.3)
     guard (0.8.8)
       thor (~> 0.14.6)
     guard-rspec (0.5.8)
       guard (>= 0.8.4)
-    money (2.2.0)
+    i18n (0.6.9)
+    monetize (0.3.0)
+      money (~> 6.1.0.beta1)
+    money (6.1.1)
+      i18n (~> 0.6.4)
+    multi_json (1.10.1)
     rake (0.9.2.2)
-    rb-fsevent (0.4.3.1)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -32,10 +39,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (= 2.3.14)
+  activesupport (= 3.2.18)
   growl (~> 1.0.3)
   guard-rspec (~> 0.5.0)
+  monetize (= 0.3.0)
   money_column!
   rake (~> 0.9.2)
-  rb-fsevent (~> 0.4.2)
   rspec (~> 2.7.0)

data/lib/money_column.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'money'
-require 'active_support'
+require 'active_support/core_ext/hash'
 require 'money_column/stores_money'
+require 'monetize'
 
 # FREEDOM PATCH - Since a money column might validly return nil, 
 # let's allow +format+ to be called on nil and just return nil as a string

data/lib/money_column/stores_money.rb

@@ -22,7 +22,7 @@ module MoneyColumn
             if cents.blank?
               nil
             else
-              my_currency = self.respond_to?(:currency) ? currency : ::Money.default_currency
+              my_currency = self.respond_to?(:currency) && !self.currency.nil? ? currency : ::Money.default_currency
               Money.new(cents, my_currency)
             end
           end

data/lib/money_column/version.rb

@@ -1,3 +1,3 @@
 module MoneyColumn
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/money_column.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   # Runtime Dependencies
-  s.add_runtime_dependency('activesupport', '>= 2.3.14')
-  s.add_runtime_dependency('money', '>= 2.2.0')
+  s.add_runtime_dependency('activesupport', '3.2.18')
+  s.add_runtime_dependency('money', '6.1.1')
+  s.add_runtime_dependency('monetize', '0.3.0')
 
   # Development Dependencies
   s.add_development_dependency('rake', '~> 0.9.2')

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money_column
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Michael Klett
@@ -16,39 +15,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.14
+        version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.14
+        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 6.1.1
+- !ruby/object:Gem::Dependency
+  name: monetize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,7 +64,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -64,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +78,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,7 +85,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,7 +92,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -96,7 +99,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,7 +106,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,7 +113,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -120,7 +120,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -147,25 +146,24 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/chargify/money_column
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 3
 summary: A set of helper methods for working with money-based attributes.
@@ -173,3 +171,4 @@ test_files:
 - spec/money_column/money_column_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: