money_column 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +7 -0
  2. data/Gemfile +2 -1
  3. data/Gemfile.lock +15 -8
  4. data/lib/money_column.rb +2 -1
  5. data/lib/money_column/stores_money.rb +1 -1
  6. data/lib/money_column/version.rb +1 -1
  7. data/money_column.gemspec +3 -2
  8. metadata +28 -29
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 1e04965daf55ca824bb08e69a10501da5108f5df
4
+ data.tar.gz: 426dc2a7eb36f292aab6b147e200df9e4ea62dbc
5
+ SHA512:
6
+ metadata.gz: c652cd1a9d755d933510e95ea87f7f466074d8105b6e5d1cfaade721de7e7decd0cd163174d17e58744b509d5b304670637ddbd699f0b389909525d9c3bfd879
7
+ data.tar.gz: c7b5703bfd2d32cb6b2097b8743cc12a02835299a13e1bace640daac8ebe7804a527b3637ea303a7e39853a7adb0342f74f75fb34dbd05d0d9d71b9bf2316e0c
data/Gemfile CHANGED
@@ -3,4 +3,5 @@ source :rubygems
3
3
  # Specify gem dependencies in money_column.gemspec
4
4
  gemspec
5
5
 
6
- gem 'activesupport', '2.3.14'
6
+ gem 'activesupport', '3.2.18'
7
+ gem 'monetize', '0.3.0'
data/Gemfile.lock CHANGED
@@ -1,23 +1,30 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- money_column (0.2.1)
5
- activesupport (>= 2.3.14)
6
- money (~> 2.2.0)
4
+ money_column (0.2.3)
5
+ activesupport (= 3.2.18)
6
+ monetize (= 0.3.0)
7
+ money (= 6.1.1)
7
8
 
8
9
  GEM
9
10
  remote: http://rubygems.org/
10
11
  specs:
11
- activesupport (2.3.14)
12
+ activesupport (3.2.18)
13
+ i18n (~> 0.6, >= 0.6.4)
14
+ multi_json (~> 1.0)
12
15
  diff-lcs (1.1.3)
13
16
  growl (1.0.3)
14
17
  guard (0.8.8)
15
18
  thor (~> 0.14.6)
16
19
  guard-rspec (0.5.8)
17
20
  guard (>= 0.8.4)
18
- money (2.2.0)
21
+ i18n (0.6.9)
22
+ monetize (0.3.0)
23
+ money (~> 6.1.0.beta1)
24
+ money (6.1.1)
25
+ i18n (~> 0.6.4)
26
+ multi_json (1.10.1)
19
27
  rake (0.9.2.2)
20
- rb-fsevent (0.4.3.1)
21
28
  rspec (2.7.0)
22
29
  rspec-core (~> 2.7.0)
23
30
  rspec-expectations (~> 2.7.0)
@@ -32,10 +39,10 @@ PLATFORMS
32
39
  ruby
33
40
 
34
41
  DEPENDENCIES
35
- activesupport (= 2.3.14)
42
+ activesupport (= 3.2.18)
36
43
  growl (~> 1.0.3)
37
44
  guard-rspec (~> 0.5.0)
45
+ monetize (= 0.3.0)
38
46
  money_column!
39
47
  rake (~> 0.9.2)
40
- rb-fsevent (~> 0.4.2)
41
48
  rspec (~> 2.7.0)
data/lib/money_column.rb CHANGED
@@ -1,7 +1,8 @@
1
1
  require 'rubygems'
2
2
  require 'money'
3
- require 'active_support'
3
+ require 'active_support/core_ext/hash'
4
4
  require 'money_column/stores_money'
5
+ require 'monetize'
5
6
 
6
7
  # FREEDOM PATCH - Since a money column might validly return nil,
7
8
  # let's allow +format+ to be called on nil and just return nil as a string
data/lib/money_column/stores_money.rb CHANGED
@@ -22,7 +22,7 @@ module MoneyColumn
22
22
  if cents.blank?
23
23
  nil
24
24
  else
25
- my_currency = self.respond_to?(:currency) ? currency : ::Money.default_currency
25
+ my_currency = self.respond_to?(:currency) && !self.currency.nil? ? currency : ::Money.default_currency
26
26
  Money.new(cents, my_currency)
27
27
  end
28
28
  end
data/lib/money_column/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MoneyColumn
2
- VERSION = "0.2.2"
2
+ VERSION = "0.2.3"
3
3
  end
data/money_column.gemspec CHANGED
@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
19
19
  s.require_paths = %w[lib]
20
20
 
21
21
  # Runtime Dependencies
22
- s.add_runtime_dependency('activesupport', '>= 2.3.14')
23
- s.add_runtime_dependency('money', '>= 2.2.0')
22
+ s.add_runtime_dependency('activesupport', '3.2.18')
23
+ s.add_runtime_dependency('money', '6.1.1')
24
+ s.add_runtime_dependency('monetize', '0.3.0')
24
25
 
25
26
  # Development Dependencies
26
27
  s.add_development_dependency('rake', '~> 0.9.2')
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: money_column
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
5
- prerelease:
4
+ version: 0.2.3
6
5
  platform: ruby
7
6
  authors:
8
7
  - Michael Klett
@@ -16,39 +15,48 @@ dependencies:
16
15
  - !ruby/object:Gem::Dependency
17
16
  name: activesupport
18
17
  requirement: !ruby/object:Gem::Requirement
19
- none: false
20
18
  requirements:
21
- - - ! '>='
19
+ - - '='
22
20
  - !ruby/object:Gem::Version
23
- version: 2.3.14
21
+ version: 3.2.18
24
22
  type: :runtime
25
23
  prerelease: false
26
24
  version_requirements: !ruby/object:Gem::Requirement
27
- none: false
28
25
  requirements:
29
- - - ! '>='
26
+ - - '='
30
27
  - !ruby/object:Gem::Version
31
- version: 2.3.14
28
+ version: 3.2.18
32
29
  - !ruby/object:Gem::Dependency
33
30
  name: money
34
31
  requirement: !ruby/object:Gem::Requirement
35
- none: false
36
32
  requirements:
37
- - - ! '>='
33
+ - - '='
38
34
  - !ruby/object:Gem::Version
39
- version: 2.2.0
35
+ version: 6.1.1
40
36
  type: :runtime
41
37
  prerelease: false
42
38
  version_requirements: !ruby/object:Gem::Requirement
43
- none: false
44
39
  requirements:
45
- - - ! '>='
40
+ - - '='
46
41
  - !ruby/object:Gem::Version
47
- version: 2.2.0
42
+ version: 6.1.1
43
+ - !ruby/object:Gem::Dependency
44
+ name: monetize
45
+ requirement: !ruby/object:Gem::Requirement
46
+ requirements:
47
+ - - '='
48
+ - !ruby/object:Gem::Version
49
+ version: 0.3.0
50
+ type: :runtime
51
+ prerelease: false
52
+ version_requirements: !ruby/object:Gem::Requirement
53
+ requirements:
54
+ - - '='
55
+ - !ruby/object:Gem::Version
56
+ version: 0.3.0
48
57
  - !ruby/object:Gem::Dependency
49
58
  name: rake
50
59
  requirement: !ruby/object:Gem::Requirement
51
- none: false
52
60
  requirements:
53
61
  - - ~>
54
62
  - !ruby/object:Gem::Version
@@ -56,7 +64,6 @@ dependencies:
56
64
  type: :development
57
65
  prerelease: false
58
66
  version_requirements: !ruby/object:Gem::Requirement
59
- none: false
60
67
  requirements:
61
68
  - - ~>
62
69
  - !ruby/object:Gem::Version
@@ -64,7 +71,6 @@ dependencies:
64
71
  - !ruby/object:Gem::Dependency
65
72
  name: rspec
66
73
  requirement: !ruby/object:Gem::Requirement
67
- none: false
68
74
  requirements:
69
75
  - - ~>
70
76
  - !ruby/object:Gem::Version
@@ -72,7 +78,6 @@ dependencies:
72
78
  type: :development
73
79
  prerelease: false
74
80
  version_requirements: !ruby/object:Gem::Requirement
75
- none: false
76
81
  requirements:
77
82
  - - ~>
78
83
  - !ruby/object:Gem::Version
@@ -80,7 +85,6 @@ dependencies:
80
85
  - !ruby/object:Gem::Dependency
81
86
  name: guard-rspec
82
87
  requirement: !ruby/object:Gem::Requirement
83
- none: false
84
88
  requirements:
85
89
  - - ~>
86
90
  - !ruby/object:Gem::Version
@@ -88,7 +92,6 @@ dependencies:
88
92
  type: :development
89
93
  prerelease: false
90
94
  version_requirements: !ruby/object:Gem::Requirement
91
- none: false
92
95
  requirements:
93
96
  - - ~>
94
97
  - !ruby/object:Gem::Version
@@ -96,7 +99,6 @@ dependencies:
96
99
  - !ruby/object:Gem::Dependency
97
100
  name: growl
98
101
  requirement: !ruby/object:Gem::Requirement
99
- none: false
100
102
  requirements:
101
103
  - - ~>
102
104
  - !ruby/object:Gem::Version
@@ -104,7 +106,6 @@ dependencies:
104
106
  type: :development
105
107
  prerelease: false
106
108
  version_requirements: !ruby/object:Gem::Requirement
107
- none: false
108
109
  requirements:
109
110
  - - ~>
110
111
  - !ruby/object:Gem::Version
@@ -112,7 +113,6 @@ dependencies:
112
113
  - !ruby/object:Gem::Dependency
113
114
  name: rb-fsevent
114
115
  requirement: !ruby/object:Gem::Requirement
115
- none: false
116
116
  requirements:
117
117
  - - ~>
118
118
  - !ruby/object:Gem::Version
@@ -120,7 +120,6 @@ dependencies:
120
120
  type: :development
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
- none: false
124
123
  requirements:
125
124
  - - ~>
126
125
  - !ruby/object:Gem::Version
@@ -147,25 +146,24 @@ files:
147
146
  - spec/spec_helper.rb
148
147
  homepage: http://github.com/chargify/money_column
149
148
  licenses: []
149
+ metadata: {}
150
150
  post_install_message:
151
151
  rdoc_options: []
152
152
  require_paths:
153
153
  - lib
154
154
  required_ruby_version: !ruby/object:Gem::Requirement
155
- none: false
156
155
  requirements:
157
- - - ! '>='
156
+ - - '>='
158
157
  - !ruby/object:Gem::Version
159
158
  version: '0'
160
159
  required_rubygems_version: !ruby/object:Gem::Requirement
161
- none: false
162
160
  requirements:
163
- - - ! '>='
161
+ - - '>='
164
162
  - !ruby/object:Gem::Version
165
163
  version: '0'
166
164
  requirements: []
167
165
  rubyforge_project:
168
- rubygems_version: 1.8.24
166
+ rubygems_version: 2.0.6
169
167
  signing_key:
170
168
  specification_version: 3
171
169
  summary: A set of helper methods for working with money-based attributes.
@@ -173,3 +171,4 @@ test_files:
173
171
  - spec/money_column/money_column_spec.rb
174
172
  - spec/spec.opts
175
173
  - spec/spec_helper.rb
174
+ has_rdoc: