ztk 1.19.2 → 2.0.0

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 +4 -4
  2. data/.ruby-version +1 -1
  3. data/.travis.yml +0 -2
  4. data/lib/ztk/ansi.rb +17 -40
  5. data/lib/ztk/dsl/core/relations/belongs_to.rb +27 -104
  6. data/lib/ztk/dsl/core/relations/has_many.rb +17 -64
  7. data/lib/ztk/version.rb +1 -1
  8. metadata +44 -44
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 03cf80347fd94de831b81ab1ff3f8691ad5e1f78
4
- data.tar.gz: 027e70a20091498e07e1c9d3775aacac8a1efa3d
3
+ metadata.gz: 69295409c314b7e3ddfa7f6501393e25224cc2ac
4
+ data.tar.gz: eaa0b7933f498ef1c4bc04bc1f052fc8d1efd3a4
5
5
  SHA512:
6
- metadata.gz: cb9ed8fea1f649dfb232079abda6aa94ee4bd038d3c18991d1a3429f8db402f2a8cdf60f1ffe6be65ee416f3231b6db9a7f813a898b5fcea492516cf4bead281
7
- data.tar.gz: 7df424f31235d4c0bf6cbb4fd392d9c7580bf66c05dd0580479abef1222b527cc205597dce67efe71bce02ea42cee865da998f57ed338af80bde8666648a8c59
6
+ metadata.gz: 71558f6d48043ecf220e840ab7efbe243ee171410e47da660ad8638ad0e16469919d97f05d144adc582cc07b0f384829f06745bd57b909fe93e08bbe6ff44179
7
+ data.tar.gz: 268c843770c004ed7f101593e3e3b279d3646c5da918490fc432c12418fd9949953c80a1cdec95174be45eade08ab3d3e95f3f81c3c6fc16c41aec4f80a0e171
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- ruby-2.0.0
1
+ ruby-2.1.0
data/.travis.yml CHANGED
@@ -1,7 +1,5 @@
1
1
  language: ruby
2
2
  rvm:
3
- - ree
4
- - 1.9.2
5
3
  - 1.9.3
6
4
  - 2.0.0
7
5
  - 2.1.0
data/lib/ztk/ansi.rb CHANGED
@@ -110,47 +110,24 @@ module ZTK
110
110
  def build_ansi_methods(hash)
111
111
  hash.each do |key, value|
112
112
 
113
- # Ruby-1.8.7 Logic:
114
- ####################
115
- module_eval <<-CODE, __FILE__, __LINE__ + 1
116
- def #{key}(string=nil, &block)
117
- result = Array.new
118
-
119
- result << %(\e[#{value}m)
120
- if block_given?
121
- result << block.call
122
- elsif string.respond_to?(:to_str)
123
- result << string.to_str
124
- elsif respond_to?(:to_str)
125
- result << to_str
126
- else
127
- return result
128
- end
129
- result << %(\e[0m)
130
-
131
- result.join
113
+ define_method(key) do |string=nil, &block|
114
+ result = Array.new
115
+
116
+ result << %(\e[#{value}m)
117
+ if block_given?
118
+ result << block.call
119
+ elsif string.respond_to?(:to_str)
120
+ result << string.to_str
121
+ elsif respond_to?(:to_str)
122
+ result << to_str
123
+ else
124
+ return result
132
125
  end
133
- CODE
134
-
135
- # > Ruby-1.8.7 Logic:
136
- ######################
137
- # define_method(key) do |string=nil, &block|
138
- # result = Array.new
139
-
140
- # result << %(\e[#{value}m)
141
- # if block_given?
142
- # result << block.call
143
- # elsif string.respond_to?(:to_str)
144
- # result << string.to_str
145
- # elsif respond_to?(:to_str)
146
- # result << to_str
147
- # else
148
- # return result
149
- # end
150
- # result << %(\e[0m)
151
-
152
- # result.join
153
- # end
126
+ result << %(\e[0m)
127
+
128
+ result.join
129
+ end
130
+
154
131
  end
155
132
 
156
133
  true
data/lib/ztk/dsl/core/relations/belongs_to.rb CHANGED
@@ -53,113 +53,36 @@ module ZTK::DSL::Core::Relations
53
53
  :key => key
54
54
  }.merge(options)
55
55
 
56
- ################################################################################
57
-
58
- # Ruby-1.8.7 Logic:
59
- ####################
60
- module_eval <<-CODE, __FILE__, __LINE__ + 1
61
- def #{key}(*args)
62
- if args.count == 0
63
- get_belongs_to_reference(#{key.inspect})
64
- else
65
- send("#{key}=", *args)
66
- end
56
+ define_method(key) do |*args|
57
+ if args.count == 0
58
+ get_belongs_to_reference(key)
59
+ else
60
+ send("#{key}=", *args)
67
61
  end
68
- CODE
69
-
70
- # > Ruby-1.8.7 Logic:
71
- ######################
72
- # define_method(key) do |*args|
73
- # if args.count == 0
74
- # get_belongs_to_reference(key)
75
- # else
76
- # send("#{key}=", *args)
77
- # end
78
- # end
79
-
80
- ################################################################################
81
-
82
- # Ruby-1.8.7 Logic:
83
- ####################
84
- module_eval <<-CODE, __FILE__, __LINE__ + 1
85
- def #{key}=(value)
86
- set_belongs_to_reference(#{key.inspect}, value)
87
- end
88
- CODE
89
-
90
- # > Ruby-1.8.7 Logic:
91
- ######################
92
- # define_method("#{key}=") do |value|
93
- # set_belongs_to_reference(key, value)
94
- # end
95
-
96
- ################################################################################
97
-
98
- # Ruby-1.8.7 Logic:
99
- ####################
100
- module_eval <<-CODE, __FILE__, __LINE__ + 1
101
- def #{key}_id(*args)
102
- if args.count == 0
103
- attributes["#{key}_id".to_sym]
104
- else
105
- send("#{key}_id=".to_sym, args.first)
106
- end
62
+ end
63
+
64
+ define_method("#{key}=") do |value|
65
+ set_belongs_to_reference(key, value)
66
+ end
67
+
68
+ define_method("#{key}_id") do |*args|
69
+ if args.count == 0
70
+ attributes["#{key}_id".to_sym]
71
+ else
72
+ send("#{key}_id=".to_sym, args.first)
107
73
  end
108
- CODE
109
-
110
- # > Ruby-1.8.7 Logic:
111
- ######################
112
- # define_method("#{key}_id") do |*args|
113
- # if args.count == 0
114
- # attributes["#{key}_id".to_sym]
115
- # else
116
- # send("#{key}_id=".to_sym, args.first)
117
- # end
118
- # end
119
-
120
- ################################################################################
121
-
122
- # Ruby-1.8.7 Logic:
123
- ####################
124
- module_eval <<-CODE, __FILE__, __LINE__ + 1
125
- def #{key}_id=(value)
126
- options = self.class.belongs_to_relations[#{key.inspect}]
127
- if value != attributes["#{key}_id".to_sym]
128
- item = options[:class_name].constantize.find(value).first
129
- set_belongs_to_reference(#{key.inspect}, item)
130
- else
131
- value
132
- end
74
+ end
75
+
76
+ define_method("#{key}_id=") do |value|
77
+ options = self.class.belongs_to_relations[key]
78
+ if value != attributes["#{key}_id".to_sym]
79
+ item = options[:class_name].constantize.find(value).first
80
+ set_belongs_to_reference(key, item)
81
+ else
82
+ value
133
83
  end
134
- CODE
135
-
136
- # > Ruby-1.8.7 Logic:
137
- ######################
138
- # define_method("#{key}_id=") do |value|
139
- # options = self.class.belongs_to_relations[key]
140
- # if value != attributes["#{key}_id".to_sym]
141
- # item = options[:class_name].constantize.find(value).first
142
- # set_belongs_to_reference(key, item)
143
- # else
144
- # value
145
- # end
146
- # end
147
-
148
- ################################################################################
149
-
150
- # OLD CODE
151
- ###########
152
-
153
- # define_method(singularize(key)) do |value|
154
- # set_belongs_to_reference(key, value)
155
- # end
156
-
157
- # define_method(singularize(key)) do |&block|
158
- # puts get_belongs_to_reference(key).inspect
159
- # data = constantize(classify(key.to_s)).new(&block)
160
- # get_belongs_to_reference(key) << data
161
- # data
162
- # end
84
+ end
85
+
163
86
  end
164
87
 
165
88
  end
data/lib/ztk/dsl/core/relations/has_many.rb CHANGED
@@ -46,75 +46,28 @@ module ZTK::DSL::Core::Relations
46
46
  :key => key
47
47
  }.merge(options)
48
48
 
49
- ################################################################################
50
-
51
- # Ruby-1.8.7 Logic:
52
- ####################
53
- module_eval <<-CODE, __FILE__, __LINE__ + 1
54
- def #{key}(*args)
55
- if args.count == 0
56
- get_has_many_reference(#{key.inspect})
57
- else
58
- send("#{key}=", *args)
59
- end
49
+ define_method(key) do |*args|
50
+ if args.count == 0
51
+ get_has_many_reference(key)
52
+ else
53
+ send("#{key}=", *args)
60
54
  end
61
- CODE
62
-
63
- # > Ruby-1.8.7 Logic:
64
- ######################
65
- # define_method(key) do |*args|
66
- # if args.count == 0
67
- # get_has_many_reference(key)
68
- # else
69
- # send("#{key}=", *args)
70
- # end
71
- # end
72
-
73
- ################################################################################
74
-
75
- # Ruby-1.8.7 Logic:
76
- ####################
77
- module_eval <<-CODE, __FILE__, __LINE__ + 1
78
- def #{key}=(value)
79
- set_has_many_reference(#{key.inspect}, value)
80
- end
81
- CODE
82
-
83
- # > Ruby-1.8.7 Logic:
84
- ######################
85
- # define_method("#{key}=") do |value|
86
- # set_has_many_reference(key, value)
87
- # end
88
-
89
- ################################################################################
90
-
91
- # Ruby-1.8.7 Logic:
92
- ####################
93
- module_eval <<-CODE, __FILE__, __LINE__ + 1
94
- def #{key.to_s.singularize}(id=nil, &block)
95
- options = self.class.has_many_relations[#{key.inspect}]
96
- data = options[:class_name].constantize.new(id, &block)
97
- get_has_many_reference(#{key.inspect}) << data
98
-
99
- klass = self.class.to_s.demodulize.singularize.downcase + '='
55
+ end
100
56
 
101
- data.send(klass, self)
102
- data
103
- end
104
- CODE
57
+ define_method("#{key}=") do |value|
58
+ set_has_many_reference(key, value)
59
+ end
105
60
 
106
- # > Ruby-1.8.7 Logic:
107
- ######################
108
- # define_method(key.to_s.singularize) do |id=nil, &block|
109
- # options = self.class.has_many_relations[key]
110
- # data = options[:class_name].constantize.new(id, &block)
111
- # get_has_many_reference(key) << data
61
+ define_method(key.to_s.singularize) do |id=nil, &block|
62
+ options = self.class.has_many_relations[key]
63
+ data = options[:class_name].constantize.new(id, &block)
64
+ get_has_many_reference(key) << data
112
65
 
113
- # klass = self.class.to_s.demodulize.singularize.downcase
66
+ klass = self.class.to_s.demodulize.singularize.downcase
114
67
 
115
- # data.send("#{klass}=", self)
116
- # data
117
- # end
68
+ data.send("#{klass}=", self)
69
+ data
70
+ end
118
71
  end
119
72
 
120
73
  end
data/lib/ztk/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module ZTK
2
2
 
3
3
  # ZTK Version String
4
- VERSION = "1.19.2"
4
+ VERSION = "2.0.0"
5
5
 
6
6
  end
metadata CHANGED
@@ -1,251 +1,251 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ztk
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.19.2
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Zachary Patten
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-15 00:00:00.000000000 Z
11
+ date: 2014-04-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: erubis
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: net-ssh
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: net-ssh-gateway
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: net-sftp
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: net-scp
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '>='
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: pry
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: rake
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - '>='
115
+ - - ">="
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - '>='
122
+ - - ">="
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rspec
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - '>='
129
+ - - ">="
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - '>='
136
+ - - ">="
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: yard
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - '>='
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - '>='
150
+ - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: redcarpet
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - '>='
157
+ - - ">="
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - '>='
164
+ - - ">="
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: coveralls
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - '>='
171
+ - - ">="
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - '>='
178
+ - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: yarjuf
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - '>='
185
+ - - ">="
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - '>='
192
+ - - ">="
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: simplecov-rcov
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - '>='
199
+ - - ">="
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - '>='
206
+ - - ">="
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: travis
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - '>='
213
+ - - ">="
214
214
  - !ruby/object:Gem::Version
215
215
  version: '0'
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - '>='
220
+ - - ">="
221
221
  - !ruby/object:Gem::Version
222
222
  version: '0'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: typhoeus
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - ~>
227
+ - - "~>"
228
228
  - !ruby/object:Gem::Version
229
229
  version: 0.6.7
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - ~>
234
+ - - "~>"
235
235
  - !ruby/object:Gem::Version
236
236
  version: 0.6.7
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: websocket-native
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - '>='
241
+ - - ">="
242
242
  - !ruby/object:Gem::Version
243
243
  version: '0'
244
244
  type: :development
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - '>='
248
+ - - ">="
249
249
  - !ruby/object:Gem::Version
250
250
  version: '0'
251
251
  description: Zachary's Tool Kit contains a collection of reusable classes meant to
@@ -262,12 +262,12 @@ executables:
262
262
  extensions: []
263
263
  extra_rdoc_files: []
264
264
  files:
265
- - .gitignore
266
- - .rspec
267
- - .ruby-gemset
268
- - .ruby-version
269
- - .travis.yml
270
- - .yardopts
265
+ - ".gitignore"
266
+ - ".rspec"
267
+ - ".ruby-gemset"
268
+ - ".ruby-version"
269
+ - ".travis.yml"
270
+ - ".yardopts"
271
271
  - Gemfile
272
272
  - LICENSE
273
273
  - README.md
@@ -354,12 +354,12 @@ require_paths:
354
354
  - lib
355
355
  required_ruby_version: !ruby/object:Gem::Requirement
356
356
  requirements:
357
- - - '>='
357
+ - - ">="
358
358
  - !ruby/object:Gem::Version
359
359
  version: '0'
360
360
  required_rubygems_version: !ruby/object:Gem::Requirement
361
361
  requirements:
362
- - - '>='
362
+ - - ">="
363
363
  - !ruby/object:Gem::Version
364
364
  version: '0'
365
365
  requirements: []