adify 0.1.0 → 0.1.1

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 (4) hide show
  1. data/VERSION +1 -1
  2. data/adify.gemspec +2 -2
  3. data/lib/adify.rb +3 -2
  4. metadata +37 -37
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.0
1
+ 0.1.1
data/adify.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{adify}
8
- s.version = "0.1.0"
8
+ s.version = "0.1.1"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Eric Harrison"]
12
- s.date = %q{2011-05-30}
12
+ s.date = %q{2011-07-05}
13
13
  s.description = %q{Adify lets you create ad tags easily and quickly with a simple common structure}
14
14
  s.email = %q{eharrison@classifiedadventures.com}
15
15
  s.extra_rdoc_files = [
data/lib/adify.rb CHANGED
@@ -2,8 +2,6 @@ require 'action_controller'
2
2
  require "active_record"
3
3
  require "active_support"
4
4
 
5
- require 'deep_merge'
6
-
7
5
  require 'adify/controller'
8
6
  require "adify/model"
9
7
  require "adify/helper"
@@ -50,4 +48,7 @@ class Hash
50
48
  def update_values(&block)
51
49
  self.update(self){|k,v| block.call v}
52
50
  end
51
+ def deep_merge(h)
52
+ self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.recursive_merge(_new) else _new end }
53
+ end
53
54
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: adify
3
3
  version: !ruby/object:Gem::Version
4
- hash: 27
4
+ hash: 25
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 1
9
- - 0
10
- version: 0.1.0
9
+ - 1
10
+ version: 0.1.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Eric Harrison
@@ -15,12 +15,11 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-05-30 00:00:00 +10:00
18
+ date: 2011-07-05 00:00:00 +10:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- name: rails
23
- prerelease: false
22
+ type: :runtime
24
23
  requirement: &id001 !ruby/object:Gem::Requirement
25
24
  none: false
26
25
  requirements:
@@ -32,11 +31,11 @@ dependencies:
32
31
  - 3
33
32
  - 5
34
33
  version: 2.3.5
35
- type: :runtime
34
+ name: rails
36
35
  version_requirements: *id001
37
- - !ruby/object:Gem::Dependency
38
- name: activesupport
39
36
  prerelease: false
37
+ - !ruby/object:Gem::Dependency
38
+ type: :runtime
40
39
  requirement: &id002 !ruby/object:Gem::Requirement
41
40
  none: false
42
41
  requirements:
@@ -48,11 +47,11 @@ dependencies:
48
47
  - 3
49
48
  - 5
50
49
  version: 2.3.5
51
- type: :runtime
50
+ name: activesupport
52
51
  version_requirements: *id002
53
- - !ruby/object:Gem::Dependency
54
- name: activerecord
55
52
  prerelease: false
53
+ - !ruby/object:Gem::Dependency
54
+ type: :runtime
56
55
  requirement: &id003 !ruby/object:Gem::Requirement
57
56
  none: false
58
57
  requirements:
@@ -64,11 +63,11 @@ dependencies:
64
63
  - 3
65
64
  - 5
66
65
  version: 2.3.5
67
- type: :runtime
66
+ name: activerecord
68
67
  version_requirements: *id003
69
- - !ruby/object:Gem::Dependency
70
- name: actionpack
71
68
  prerelease: false
69
+ - !ruby/object:Gem::Dependency
70
+ type: :runtime
72
71
  requirement: &id004 !ruby/object:Gem::Requirement
73
72
  none: false
74
73
  requirements:
@@ -80,11 +79,11 @@ dependencies:
80
79
  - 3
81
80
  - 5
82
81
  version: 2.3.5
83
- type: :runtime
82
+ name: actionpack
84
83
  version_requirements: *id004
85
- - !ruby/object:Gem::Dependency
86
- name: deep_merge
87
84
  prerelease: false
85
+ - !ruby/object:Gem::Dependency
86
+ type: :runtime
88
87
  requirement: &id005 !ruby/object:Gem::Requirement
89
88
  none: false
90
89
  requirements:
@@ -94,11 +93,11 @@ dependencies:
94
93
  segments:
95
94
  - 0
96
95
  version: "0"
97
- type: :runtime
96
+ name: deep_merge
98
97
  version_requirements: *id005
99
- - !ruby/object:Gem::Dependency
100
- name: rspec-rails
101
98
  prerelease: false
99
+ - !ruby/object:Gem::Dependency
100
+ type: :development
102
101
  requirement: &id006 !ruby/object:Gem::Requirement
103
102
  none: false
104
103
  requirements:
@@ -110,11 +109,11 @@ dependencies:
110
109
  - 3
111
110
  - 0
112
111
  version: 2.3.0
113
- type: :development
112
+ name: rspec-rails
114
113
  version_requirements: *id006
115
- - !ruby/object:Gem::Dependency
116
- name: bundler
117
114
  prerelease: false
115
+ - !ruby/object:Gem::Dependency
116
+ type: :development
118
117
  requirement: &id007 !ruby/object:Gem::Requirement
119
118
  none: false
120
119
  requirements:
@@ -126,11 +125,11 @@ dependencies:
126
125
  - 0
127
126
  - 0
128
127
  version: 1.0.0
129
- type: :development
128
+ name: bundler
130
129
  version_requirements: *id007
131
- - !ruby/object:Gem::Dependency
132
- name: jeweler
133
130
  prerelease: false
131
+ - !ruby/object:Gem::Dependency
132
+ type: :development
134
133
  requirement: &id008 !ruby/object:Gem::Requirement
135
134
  none: false
136
135
  requirements:
@@ -142,11 +141,11 @@ dependencies:
142
141
  - 6
143
142
  - 0
144
143
  version: 1.6.0
145
- type: :development
144
+ name: jeweler
146
145
  version_requirements: *id008
147
- - !ruby/object:Gem::Dependency
148
- name: rcov
149
146
  prerelease: false
147
+ - !ruby/object:Gem::Dependency
148
+ type: :development
150
149
  requirement: &id009 !ruby/object:Gem::Requirement
151
150
  none: false
152
151
  requirements:
@@ -156,11 +155,11 @@ dependencies:
156
155
  segments:
157
156
  - 0
158
157
  version: "0"
159
- type: :development
158
+ name: rcov
160
159
  version_requirements: *id009
161
- - !ruby/object:Gem::Dependency
162
- name: ruby-debug
163
160
  prerelease: false
161
+ - !ruby/object:Gem::Dependency
162
+ type: :development
164
163
  requirement: &id010 !ruby/object:Gem::Requirement
165
164
  none: false
166
165
  requirements:
@@ -170,11 +169,11 @@ dependencies:
170
169
  segments:
171
170
  - 0
172
171
  version: "0"
173
- type: :development
172
+ name: ruby-debug
174
173
  version_requirements: *id010
175
- - !ruby/object:Gem::Dependency
176
- name: sqlite3
177
174
  prerelease: false
175
+ - !ruby/object:Gem::Dependency
176
+ type: :development
178
177
  requirement: &id011 !ruby/object:Gem::Requirement
179
178
  none: false
180
179
  requirements:
@@ -184,8 +183,9 @@ dependencies:
184
183
  segments:
185
184
  - 0
186
185
  version: "0"
187
- type: :development
186
+ name: sqlite3
188
187
  version_requirements: *id011
188
+ prerelease: false
189
189
  description: Adify lets you create ad tags easily and quickly with a simple common structure
190
190
  email: eharrison@classifiedadventures.com
191
191
  executables: []