property_sets 0.8.2 → 0.8.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. data/.travis.yml +1 -0
  2. data/Appraisals +0 -3
  3. data/Gemfile +1 -1
  4. data/gemfiles/rails2.3.gemfile +1 -2
  5. data/gemfiles/rails2.3.gemfile.lock +15 -11
  6. data/gemfiles/rails3.0.gemfile +1 -2
  7. data/gemfiles/rails3.0.gemfile.lock +25 -15
  8. data/gemfiles/rails3.2.gemfile +1 -2
  9. data/gemfiles/rails3.2.gemfile.lock +23 -16
  10. data/lib/property_sets.rb +5 -1
  11. data/property_sets.gemspec +3 -3
  12. metadata +27 -27
data/.travis.yml CHANGED
@@ -6,4 +6,5 @@ rvm:
6
6
  script: "bundle exec rake test"
7
7
  gemfile:
8
8
  - gemfiles/rails2.3.gemfile
9
+ - gemfiles/rails3.0.gemfile
9
10
  - gemfiles/rails3.2.gemfile
data/Appraisals CHANGED
@@ -1,17 +1,14 @@
1
1
  appraise "rails2.3" do
2
2
  gem "activerecord", "2.3.14"
3
3
  gem "activesupport", "2.3.14"
4
- gem "actionpack", "2.3.14"
5
4
  end
6
5
 
7
6
  appraise "rails3.0" do
8
7
  gem "activerecord", "3.0.15"
9
8
  gem "activesupport", "3.0.15"
10
- gem "actionpack", "3.0.15"
11
9
  end
12
10
 
13
11
  appraise "rails3.2" do
14
12
  gem "activerecord", "3.2.6"
15
13
  gem "activesupport", "3.2.6"
16
- gem "actionpack", "3.2.6"
17
14
  end
data/Gemfile CHANGED
@@ -1,7 +1,7 @@
1
1
  source :rubygems
2
2
 
3
3
  gem 'activerecord-jdbcmysql-adapter', '1.2.2', :platforms => :jruby
4
- gem 'mysql', :platforms => :ruby
4
+ gem 'mysql', '~> 2.8.1', :platforms => :ruby
5
5
 
6
6
  gemspec
7
7
 
data/gemfiles/rails2.3.gemfile CHANGED
@@ -3,9 +3,8 @@
3
3
  source :rubygems
4
4
 
5
5
  gem "activerecord-jdbcmysql-adapter", "1.2.2", :platforms=>:jruby
6
- gem "mysql", :platforms=>:ruby
6
+ gem "mysql", "~> 2.8.1", :platforms=>:ruby
7
7
  gem "activerecord", "2.3.14"
8
8
  gem "activesupport", "2.3.14"
9
- gem "actionpack", "2.3.14"
10
9
 
11
10
  gemspec :path=>"../"
data/gemfiles/rails2.3.gemfile.lock CHANGED
@@ -1,8 +1,7 @@
1
1
  PATH
2
- remote: /Users/primdahl/Git/property_sets
2
+ remote: /Users/staugaard/code/property_sets
3
3
  specs:
4
4
  property_sets (0.8.1)
5
- actionpack (>= 2.3.14, < 3.3)
6
5
  activerecord (>= 2.3.14, < 3.3)
7
6
  activesupport (>= 2.3.14, < 3.3)
8
7
  json
@@ -15,38 +14,43 @@ GEM
15
14
  rack (~> 1.1.0)
16
15
  activerecord (2.3.14)
17
16
  activesupport (= 2.3.14)
18
- activerecord-jdbc-adapter (1.2.2)
17
+ activerecord-jdbc-adapter (1.2.2.1)
19
18
  activerecord-jdbcmysql-adapter (1.2.2)
20
19
  activerecord-jdbc-adapter (~> 1.2.2)
21
20
  jdbc-mysql (~> 5.1.0)
22
21
  activesupport (2.3.14)
23
- appraisal (0.4.0)
22
+ appraisal (0.5.1)
24
23
  bundler
25
24
  rake
26
25
  jdbc-mysql (5.1.13)
27
26
  json (1.7.5)
27
+ json (1.7.5-java)
28
28
  metaclass (0.0.1)
29
- mocha (0.10.3)
29
+ mocha (0.10.5)
30
30
  metaclass (~> 0.0.1)
31
31
  mysql (2.8.1)
32
32
  rack (1.1.3)
33
- rake (0.9.2.2)
34
- shoulda (2.11.3)
35
- test-unit (2.5.2)
33
+ rake (10.0.3)
34
+ shoulda (3.0.1)
35
+ shoulda-context (~> 1.0.0)
36
+ shoulda-matchers (~> 1.0.0)
37
+ shoulda-context (1.0.1)
38
+ shoulda-matchers (1.0.0)
39
+ test-unit (2.5.3)
36
40
 
37
41
  PLATFORMS
38
42
  java
39
43
  ruby
40
44
 
41
45
  DEPENDENCIES
42
- actionpack (= 2.3.14)
46
+ actionpack (>= 2.3.14, < 3.3)
43
47
  activerecord (= 2.3.14)
44
48
  activerecord-jdbcmysql-adapter (= 1.2.2)
45
49
  activesupport (= 2.3.14)
46
50
  appraisal
47
51
  bundler
48
- mocha
49
- mysql
52
+ mocha (~> 0.10.3)
53
+ mysql (~> 2.8.1)
50
54
  property_sets!
51
55
  rake
52
56
  shoulda
data/gemfiles/rails3.0.gemfile CHANGED
@@ -3,9 +3,8 @@
3
3
  source :rubygems
4
4
 
5
5
  gem "activerecord-jdbcmysql-adapter", "1.2.2", :platforms=>:jruby
6
- gem "mysql", :platforms=>:ruby
6
+ gem "mysql", "~> 2.8.1", :platforms=>:ruby
7
7
  gem "activerecord", "3.0.15"
8
8
  gem "activesupport", "3.0.15"
9
- gem "actionpack", "3.0.15"
10
9
 
11
10
  gemspec :path=>"../"
data/gemfiles/rails3.0.gemfile.lock CHANGED
@@ -1,8 +1,7 @@
1
1
  PATH
2
- remote: /Users/primdahl/Git/property_sets
2
+ remote: /Users/staugaard/code/property_sets
3
3
  specs:
4
4
  property_sets (0.8.1)
5
- actionpack (>= 2.3.14, < 3.3)
6
5
  activerecord (>= 2.3.14, < 3.3)
7
6
  activesupport (>= 2.3.14, < 3.3)
8
7
  json
@@ -30,18 +29,26 @@ GEM
30
29
  activesupport (= 3.0.15)
31
30
  arel (~> 2.0.10)
32
31
  tzinfo (~> 0.3.23)
32
+ activerecord-jdbc-adapter (1.2.2.1)
33
+ activerecord-jdbcmysql-adapter (1.2.2)
34
+ activerecord-jdbc-adapter (~> 1.2.2)
35
+ jdbc-mysql (~> 5.1.0)
33
36
  activesupport (3.0.15)
34
- appraisal (0.4.1)
37
+ appraisal (0.5.1)
35
38
  bundler
36
39
  rake
37
40
  arel (2.0.10)
41
+ bourne (1.1.2)
42
+ mocha (= 0.10.5)
38
43
  builder (2.1.2)
39
44
  erubis (2.6.6)
40
45
  abstract (>= 1.0.0)
41
46
  i18n (0.5.0)
47
+ jdbc-mysql (5.1.13)
42
48
  json (1.7.5)
49
+ json (1.7.5-java)
43
50
  metaclass (0.0.1)
44
- mocha (0.12.0)
51
+ mocha (0.10.5)
45
52
  metaclass (~> 0.0.1)
46
53
  mysql (2.8.1)
47
54
  rack (1.2.5)
@@ -49,27 +56,30 @@ GEM
49
56
  rack (>= 1.0.0)
50
57
  rack-test (0.5.7)
51
58
  rack (>= 1.0)
52
- rake (0.9.2.2)
53
- shoulda (3.0.1)
54
- shoulda-context (~> 1.0.0)
55
- shoulda-matchers (~> 1.0.0)
56
- shoulda-context (1.0.0)
57
- shoulda-matchers (1.0.0)
58
- test-unit (2.5.2)
59
- tzinfo (0.3.33)
59
+ rake (10.0.3)
60
+ shoulda (3.3.2)
61
+ shoulda-context (~> 1.0.1)
62
+ shoulda-matchers (~> 1.4.1)
63
+ shoulda-context (1.0.1)
64
+ shoulda-matchers (1.4.2)
65
+ activesupport (>= 3.0.0)
66
+ bourne (~> 1.1.2)
67
+ test-unit (2.5.3)
68
+ tzinfo (0.3.35)
60
69
 
61
70
  PLATFORMS
71
+ java
62
72
  ruby
63
73
 
64
74
  DEPENDENCIES
65
- actionpack (= 3.0.15)
75
+ actionpack (>= 2.3.14, < 3.3)
66
76
  activerecord (= 3.0.15)
67
77
  activerecord-jdbcmysql-adapter (= 1.2.2)
68
78
  activesupport (= 3.0.15)
69
79
  appraisal
70
80
  bundler
71
- mocha
72
- mysql
81
+ mocha (~> 0.10.3)
82
+ mysql (~> 2.8.1)
73
83
  property_sets!
74
84
  rake
75
85
  shoulda
data/gemfiles/rails3.2.gemfile CHANGED
@@ -3,9 +3,8 @@
3
3
  source :rubygems
4
4
 
5
5
  gem "activerecord-jdbcmysql-adapter", "1.2.2", :platforms=>:jruby
6
- gem "mysql", :platforms=>:ruby
6
+ gem "mysql", "~> 2.8.1", :platforms=>:ruby
7
7
  gem "activerecord", "3.2.6"
8
8
  gem "activesupport", "3.2.6"
9
- gem "actionpack", "3.2.6"
10
9
 
11
10
  gemspec :path=>"../"
data/gemfiles/rails3.2.gemfile.lock CHANGED
@@ -1,8 +1,7 @@
1
1
  PATH
2
- remote: /Users/primdahl/Git/property_sets
2
+ remote: /Users/staugaard/code/property_sets
3
3
  specs:
4
4
  property_sets (0.8.1)
5
- actionpack (>= 2.3.14, < 3.3)
6
5
  activerecord (>= 2.3.14, < 3.3)
7
6
  activesupport (>= 2.3.14, < 3.3)
8
7
  json
@@ -28,58 +27,66 @@ GEM
28
27
  activesupport (= 3.2.6)
29
28
  arel (~> 3.0.2)
30
29
  tzinfo (~> 0.3.29)
31
- activerecord-jdbc-adapter (1.2.2)
30
+ activerecord-jdbc-adapter (1.2.2.1)
32
31
  activerecord-jdbcmysql-adapter (1.2.2)
33
32
  activerecord-jdbc-adapter (~> 1.2.2)
34
33
  jdbc-mysql (~> 5.1.0)
35
34
  activesupport (3.2.6)
36
35
  i18n (~> 0.6)
37
36
  multi_json (~> 1.0)
38
- appraisal (0.4.0)
37
+ appraisal (0.5.1)
39
38
  bundler
40
39
  rake
41
40
  arel (3.0.2)
42
- builder (3.0.0)
41
+ bourne (1.1.2)
42
+ mocha (= 0.10.5)
43
+ builder (3.0.4)
43
44
  erubis (2.7.0)
44
45
  hike (1.2.1)
45
- i18n (0.6.0)
46
+ i18n (0.6.1)
46
47
  jdbc-mysql (5.1.13)
47
48
  journey (1.0.4)
48
49
  json (1.7.5)
49
50
  json (1.7.5-java)
50
51
  metaclass (0.0.1)
51
- mocha (0.10.3)
52
+ mocha (0.10.5)
52
53
  metaclass (~> 0.0.1)
53
- multi_json (1.3.6)
54
+ multi_json (1.5.0)
54
55
  mysql (2.8.1)
55
56
  rack (1.4.1)
56
57
  rack-cache (1.2)
57
58
  rack (>= 0.4)
58
- rack-test (0.6.1)
59
+ rack-test (0.6.2)
59
60
  rack (>= 1.0)
60
- rake (0.9.2.2)
61
- shoulda (2.11.3)
61
+ rake (10.0.3)
62
+ shoulda (3.3.2)
63
+ shoulda-context (~> 1.0.1)
64
+ shoulda-matchers (~> 1.4.1)
65
+ shoulda-context (1.0.1)
66
+ shoulda-matchers (1.4.2)
67
+ activesupport (>= 3.0.0)
68
+ bourne (~> 1.1.2)
62
69
  sprockets (2.1.3)
63
70
  hike (~> 1.2)
64
71
  rack (~> 1.0)
65
72
  tilt (~> 1.1, != 1.3.0)
66
- test-unit (2.5.2)
73
+ test-unit (2.5.3)
67
74
  tilt (1.3.3)
68
- tzinfo (0.3.33)
75
+ tzinfo (0.3.35)
69
76
 
70
77
  PLATFORMS
71
78
  java
72
79
  ruby
73
80
 
74
81
  DEPENDENCIES
75
- actionpack (= 3.2.6)
82
+ actionpack (>= 2.3.14, < 3.3)
76
83
  activerecord (= 3.2.6)
77
84
  activerecord-jdbcmysql-adapter (= 1.2.2)
78
85
  activesupport (= 3.2.6)
79
86
  appraisal
80
87
  bundler
81
- mocha
82
- mysql
88
+ mocha (~> 0.10.3)
89
+ mysql (~> 2.8.1)
83
90
  property_sets!
84
91
  rake
85
92
  shoulda
data/lib/property_sets.rb CHANGED
@@ -1,6 +1,10 @@
1
1
  require 'property_sets/property_set_model'
2
2
  require 'property_sets/active_record_extension'
3
- require 'property_sets/action_view_extension'
3
+
4
+ begin
5
+ require 'property_sets/action_view_extension'
6
+ rescue LoadError
7
+ end
4
8
 
5
9
  module PropertySets
6
10
  VERSION = "0.7.2"
data/property_sets.gemspec CHANGED
@@ -1,4 +1,4 @@
1
- Gem::Specification.new "property_sets", "0.8.2" do |s|
1
+ Gem::Specification.new "property_sets", "0.8.3" do |s|
2
2
  s.summary = "Property sets for ActiveRecord."
3
3
  s.description = "This gem is an ActiveRecord extension which provides a convenient interface for managing per row properties."
4
4
  s.authors = ["Morten Primdahl"]
@@ -7,15 +7,15 @@ Gem::Specification.new "property_sets", "0.8.2" do |s|
7
7
 
8
8
  s.add_runtime_dependency("activesupport", ">= 2.3.14", "< 3.3")
9
9
  s.add_runtime_dependency("activerecord", ">= 2.3.14", "< 3.3")
10
- s.add_runtime_dependency("actionpack", ">= 2.3.14", "< 3.3")
11
10
  s.add_runtime_dependency("json")
12
11
 
13
12
  s.add_development_dependency('rake')
14
13
  s.add_development_dependency('bundler')
15
14
  s.add_development_dependency('shoulda')
16
- s.add_development_dependency('mocha')
15
+ s.add_development_dependency('mocha', '~> 0.10.3')
17
16
  s.add_development_dependency('appraisal')
18
17
  s.add_development_dependency('test-unit', '>= 2.5.2')
18
+ s.add_development_dependency("actionpack", ">= 2.3.14", "< 3.3")
19
19
 
20
20
  s.files = `git ls-files`.split("\n")
21
21
  s.license = "MIT"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: property_sets
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.2
4
+ version: 0.8.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-12-11 00:00:00.000000000 Z
12
+ date: 2012-12-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
@@ -56,16 +56,13 @@ dependencies:
56
56
  - !ruby/object:Gem::Version
57
57
  version: '3.3'
58
58
  - !ruby/object:Gem::Dependency
59
- name: actionpack
59
+ name: json
60
60
  requirement: !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
64
64
  - !ruby/object:Gem::Version
65
- version: 2.3.14
66
- - - <
67
- - !ruby/object:Gem::Version
68
- version: '3.3'
65
+ version: '0'
69
66
  type: :runtime
70
67
  prerelease: false
71
68
  version_requirements: !ruby/object:Gem::Requirement
@@ -73,19 +70,16 @@ dependencies:
73
70
  requirements:
74
71
  - - ! '>='
75
72
  - !ruby/object:Gem::Version
76
- version: 2.3.14
77
- - - <
78
- - !ruby/object:Gem::Version
79
- version: '3.3'
73
+ version: '0'
80
74
  - !ruby/object:Gem::Dependency
81
- name: json
75
+ name: rake
82
76
  requirement: !ruby/object:Gem::Requirement
83
77
  none: false
84
78
  requirements:
85
79
  - - ! '>='
86
80
  - !ruby/object:Gem::Version
87
81
  version: '0'
88
- type: :runtime
82
+ type: :development
89
83
  prerelease: false
90
84
  version_requirements: !ruby/object:Gem::Requirement
91
85
  none: false
@@ -94,7 +88,7 @@ dependencies:
94
88
  - !ruby/object:Gem::Version
95
89
  version: '0'
96
90
  - !ruby/object:Gem::Dependency
97
- name: rake
91
+ name: bundler
98
92
  requirement: !ruby/object:Gem::Requirement
99
93
  none: false
100
94
  requirements:
@@ -110,7 +104,7 @@ dependencies:
110
104
  - !ruby/object:Gem::Version
111
105
  version: '0'
112
106
  - !ruby/object:Gem::Dependency
113
- name: bundler
107
+ name: shoulda
114
108
  requirement: !ruby/object:Gem::Requirement
115
109
  none: false
116
110
  requirements:
@@ -126,23 +120,23 @@ dependencies:
126
120
  - !ruby/object:Gem::Version
127
121
  version: '0'
128
122
  - !ruby/object:Gem::Dependency
129
- name: shoulda
123
+ name: mocha
130
124
  requirement: !ruby/object:Gem::Requirement
131
125
  none: false
132
126
  requirements:
133
- - - ! '>='
127
+ - - ~>
134
128
  - !ruby/object:Gem::Version
135
- version: '0'
129
+ version: 0.10.3
136
130
  type: :development
137
131
  prerelease: false
138
132
  version_requirements: !ruby/object:Gem::Requirement
139
133
  none: false
140
134
  requirements:
141
- - - ! '>='
135
+ - - ~>
142
136
  - !ruby/object:Gem::Version
143
- version: '0'
137
+ version: 0.10.3
144
138
  - !ruby/object:Gem::Dependency
145
- name: mocha
139
+ name: appraisal
146
140
  requirement: !ruby/object:Gem::Requirement
147
141
  none: false
148
142
  requirements:
@@ -158,13 +152,13 @@ dependencies:
158
152
  - !ruby/object:Gem::Version
159
153
  version: '0'
160
154
  - !ruby/object:Gem::Dependency
161
- name: appraisal
155
+ name: test-unit
162
156
  requirement: !ruby/object:Gem::Requirement
163
157
  none: false
164
158
  requirements:
165
159
  - - ! '>='
166
160
  - !ruby/object:Gem::Version
167
- version: '0'
161
+ version: 2.5.2
168
162
  type: :development
169
163
  prerelease: false
170
164
  version_requirements: !ruby/object:Gem::Requirement
@@ -172,15 +166,18 @@ dependencies:
172
166
  requirements:
173
167
  - - ! '>='
174
168
  - !ruby/object:Gem::Version
175
- version: '0'
169
+ version: 2.5.2
176
170
  - !ruby/object:Gem::Dependency
177
- name: test-unit
171
+ name: actionpack
178
172
  requirement: !ruby/object:Gem::Requirement
179
173
  none: false
180
174
  requirements:
181
175
  - - ! '>='
182
176
  - !ruby/object:Gem::Version
183
- version: 2.5.2
177
+ version: 2.3.14
178
+ - - <
179
+ - !ruby/object:Gem::Version
180
+ version: '3.3'
184
181
  type: :development
185
182
  prerelease: false
186
183
  version_requirements: !ruby/object:Gem::Requirement
@@ -188,7 +185,10 @@ dependencies:
188
185
  requirements:
189
186
  - - ! '>='
190
187
  - !ruby/object:Gem::Version
191
- version: 2.5.2
188
+ version: 2.3.14
189
+ - - <
190
+ - !ruby/object:Gem::Version
191
+ version: '3.3'
192
192
  description: This gem is an ActiveRecord extension which provides a convenient interface
193
193
  for managing per row properties.
194
194
  email: primdahl@me.com