RubyApp 0.0.76 → 0.0.77

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. data/.gitignore +2 -2
  2. data/Gemfile.lock +1 -1
  3. data/lib/ruby_app/application.rb +2 -2
  4. data/lib/ruby_app/element.rb +3 -3
  5. data/lib/ruby_app/elements/pages/authentication/open_id/ax_authentication_page.rb +2 -2
  6. data/lib/ruby_app/elements/pages/authentication/open_id/google_authentication_page.rb +1 -1
  7. data/lib/ruby_app/elements/pages/authentication/open_id/my_open_id_authentication_page.rb +1 -1
  8. data/lib/ruby_app/elements/pages/authentication/open_id/yahoo_authentication_page.rb +1 -1
  9. data/lib/ruby_app/mixins/{configure_mixin.rb → configuration_mixin.rb} +2 -2
  10. data/lib/ruby_app/mixins/hash_mixin.rb +5 -1
  11. data/lib/ruby_app/session.rb +2 -2
  12. data/lib/ruby_app/version.rb +1 -1
  13. data/spec/mixins/configuration_mixin_spec.rb +24 -0
  14. metadata +74 -74
  15. data/spec/mixins/configure_mixin_spec.rb +0 -24
data/.gitignore CHANGED
@@ -3,11 +3,11 @@
3
3
  .DS_Store
4
4
  .idea
5
5
  .sass-cache
6
+ log
7
+ sandbox
6
8
  lib/ruby_app/elements/pages/authentication/open_id/associations
7
9
  lib/ruby_app/elements/pages/authentication/open_id/nonces
8
10
  lib/ruby_app/elements/pages/authentication/open_id/temp
9
- log
10
- sandbox
11
11
  *.gem
12
12
  *.log
13
13
  *.pid
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- RubyApp (0.0.76)
4
+ RubyApp (0.0.77)
5
5
  BlueCloth
6
6
  chronic
7
7
  chronic_duration
data/lib/ruby_app/application.rb CHANGED
@@ -6,7 +6,7 @@ require 'fileutils'
6
6
  module RubyApp
7
7
  require 'ruby_app/configuration'
8
8
  require 'ruby_app/log'
9
- require 'ruby_app/mixins/configure_mixin'
9
+ require 'ruby_app/mixins/configuration_mixin'
10
10
  require 'ruby_app/mixins/delegate_mixin'
11
11
  require 'ruby_app/mixins/hash_mixin'
12
12
  require 'ruby_app/session'
@@ -14,7 +14,7 @@ module RubyApp
14
14
 
15
15
  class Application
16
16
  extend RubyApp::Mixins::DelegateMixin
17
- include RubyApp::Mixins::ConfigureMixin
17
+ include RubyApp::Mixins::ConfigurationMixin
18
18
 
19
19
  attr_reader :options, :environment
20
20
 
data/lib/ruby_app/element.rb CHANGED
@@ -6,14 +6,14 @@ require 'json'
6
6
  require 'ruby-event'
7
7
 
8
8
  module RubyApp
9
- require 'ruby_app/mixins/configure_mixin'
9
+ require 'ruby_app/mixins/configuration_mixin'
10
10
  require 'ruby_app/mixins/render_mixin'
11
11
  require 'ruby_app/mixins/template_mixin'
12
12
  require 'ruby_app/mixins/translate_mixin'
13
13
 
14
14
  class Element
15
- extend RubyApp::Mixins::ConfigureMixin
16
- include RubyApp::Mixins::ConfigureMixin
15
+ extend RubyApp::Mixins::ConfigurationMixin
16
+ include RubyApp::Mixins::ConfigurationMixin
17
17
  extend RubyApp::Mixins::TranslateMixin
18
18
  include RubyApp::Mixins::TranslateMixin
19
19
  extend RubyApp::Mixins::TemplateMixin
data/lib/ruby_app/elements/pages/authentication/open_id/ax_authentication_page.rb CHANGED
@@ -25,14 +25,14 @@ module RubyApp
25
25
 
26
26
  def process_request(request)
27
27
  ax_request = ::OpenId::AX::FetchRequest.new
28
- ax_request.add(::OpenId::AX::AttrInfo.new(self.configure.attributes.email, 'Email', true))
28
+ ax_request.add(::OpenId::AX::AttrInfo.new(self.configuration.attributes.email, 'Email', true))
29
29
  request.add_extension(ax_request)
30
30
  end
31
31
 
32
32
  def create_identity_from_response(response)
33
33
  ax_response = ::OpenId::AX::FetchResponse.from_success_response(response)
34
34
  if ax_response
35
- self.create_identity_from_email(ax_response.data[self.configure.attributes.email].first)
35
+ self.create_identity_from_email(ax_response.data[self.configuration.attributes.email].first)
36
36
  else
37
37
  super(response)
38
38
  end
data/lib/ruby_app/elements/pages/authentication/open_id/google_authentication_page.rb CHANGED
@@ -13,7 +13,7 @@ module RubyApp
13
13
 
14
14
  template_path(:all, File.dirname(__FILE__))
15
15
 
16
- def initialize(identifier = self.configure.identifier)
16
+ def initialize(identifier = self.configuration.identifier)
17
17
  super(identifier)
18
18
  end
19
19
 
data/lib/ruby_app/elements/pages/authentication/open_id/my_open_id_authentication_page.rb CHANGED
@@ -13,7 +13,7 @@ module RubyApp
13
13
 
14
14
  template_path(:all, File.dirname(__FILE__))
15
15
 
16
- def initialize(identifier = self.configure.identifier)
16
+ def initialize(identifier = self.configuration.identifier)
17
17
  super(identifier)
18
18
  end
19
19
 
data/lib/ruby_app/elements/pages/authentication/open_id/yahoo_authentication_page.rb CHANGED
@@ -13,7 +13,7 @@ module RubyApp
13
13
 
14
14
  template_path(:all, File.dirname(__FILE__))
15
15
 
16
- def initialize(identifier = self.configure.identifier)
16
+ def initialize(identifier = self.configuration.identifier)
17
17
  super(identifier)
18
18
  end
19
19
 
data/lib/ruby_app/mixins/{configure_mixin.rb → configuration_mixin.rb} RENAMED
@@ -2,10 +2,10 @@ module RubyApp
2
2
 
3
3
  module Mixins
4
4
 
5
- module ConfigureMixin
5
+ module ConfigurationMixin
6
6
  require 'ruby_app/configuration'
7
7
 
8
- def configure
8
+ def configuration
9
9
 
10
10
  name = self.is_a?(Class) ? self.to_s : self.class.to_s
11
11
  name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
data/lib/ruby_app/mixins/hash_mixin.rb CHANGED
@@ -6,7 +6,11 @@ module RubyApp
6
6
 
7
7
  def method_missing(name, *arguments)
8
8
  if name.to_s.match(/(.*)=/)
9
- self[$~.captures[0].to_sym] = arguments[0]
9
+ capture = $~.captures[0]
10
+ string = capture.to_s
11
+ self[string] = arguments[0] if self.key?(string)
12
+ symbol = capture.to_sym
13
+ self[symbol] = arguments[0] unless self.key?(string)
10
14
  else
11
15
  self[name.to_s] || self[name.to_sym]
12
16
  end
data/lib/ruby_app/session.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module RubyApp
2
2
  require 'ruby_app/application'
3
3
  require 'ruby_app/log'
4
- require 'ruby_app/mixins/configure_mixin'
4
+ require 'ruby_app/mixins/configuration_mixin'
5
5
  require 'ruby_app/mixins/delegate_mixin'
6
6
  require 'ruby_app/mixins/hash_mixin'
7
7
  require 'ruby_app/mixins/translate_mixin'
@@ -10,7 +10,7 @@ module RubyApp
10
10
  class Session
11
11
  extend RubyApp::Mixins::DelegateMixin
12
12
  include RubyApp::Mixins::HashMixin
13
- include RubyApp::Mixins::ConfigureMixin
13
+ include RubyApp::Mixins::ConfigurationMixin
14
14
  extend RubyApp::Mixins::TranslateMixin
15
15
 
16
16
  class Identity
data/lib/ruby_app/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module RubyApp
2
- VERSION = "0.0.76"
2
+ VERSION = "0.0.77"
3
3
  ROOT = File.expand_path(File.dirname(__FILE__))
4
4
  end
data/spec/mixins/configuration_mixin_spec.rb ADDED
@@ -0,0 +1,24 @@
1
+ require 'spec_helper'
2
+
3
+ require 'ruby_app/mixins/configuration_mixin'
4
+
5
+ describe RubyApp::Mixins::ConfigurationMixin do
6
+ include_context 'RubyApp::Request'
7
+
8
+ describe 'positive' do
9
+
10
+ before(:all) do
11
+
12
+ class TestConfigurationMixin
13
+ include RubyApp::Mixins::ConfigurationMixin
14
+ end
15
+
16
+ end
17
+
18
+ let(:instance_a) { TestConfigurationMixin.new }
19
+
20
+ specify { instance_a.should respond_to(:configuration) }
21
+
22
+ end
23
+
24
+ end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: RubyApp
3
3
  version: !ruby/object:Gem::Version
4
- hash: 135
4
+ hash: 133
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
- - 76
10
- version: 0.0.76
9
+ - 77
10
+ version: 0.0.77
11
11
  platform: ruby
12
12
  authors:
13
13
  - Frank G. Ficnar
@@ -15,11 +15,9 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-01-20 00:00:00 Z
18
+ date: 2012-01-24 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
- prerelease: false
22
- name: BlueCloth
23
21
  version_requirements: &id001 !ruby/object:Gem::Requirement
24
22
  none: false
25
23
  requirements:
@@ -29,11 +27,11 @@ dependencies:
29
27
  segments:
30
28
  - 0
31
29
  version: "0"
32
- type: :runtime
33
30
  requirement: *id001
34
- - !ruby/object:Gem::Dependency
31
+ type: :runtime
35
32
  prerelease: false
36
- name: chronic
33
+ name: BlueCloth
34
+ - !ruby/object:Gem::Dependency
37
35
  version_requirements: &id002 !ruby/object:Gem::Requirement
38
36
  none: false
39
37
  requirements:
@@ -43,11 +41,11 @@ dependencies:
43
41
  segments:
44
42
  - 0
45
43
  version: "0"
46
- type: :runtime
47
44
  requirement: *id002
48
- - !ruby/object:Gem::Dependency
45
+ type: :runtime
49
46
  prerelease: false
50
- name: chronic_duration
47
+ name: chronic
48
+ - !ruby/object:Gem::Dependency
51
49
  version_requirements: &id003 !ruby/object:Gem::Requirement
52
50
  none: false
53
51
  requirements:
@@ -57,11 +55,11 @@ dependencies:
57
55
  segments:
58
56
  - 0
59
57
  version: "0"
60
- type: :runtime
61
58
  requirement: *id003
62
- - !ruby/object:Gem::Dependency
59
+ type: :runtime
63
60
  prerelease: false
64
- name: facets
61
+ name: chronic_duration
62
+ - !ruby/object:Gem::Dependency
65
63
  version_requirements: &id004 !ruby/object:Gem::Requirement
66
64
  none: false
67
65
  requirements:
@@ -71,11 +69,11 @@ dependencies:
71
69
  segments:
72
70
  - 0
73
71
  version: "0"
74
- type: :runtime
75
72
  requirement: *id004
76
- - !ruby/object:Gem::Dependency
73
+ type: :runtime
77
74
  prerelease: false
78
- name: fileutils
75
+ name: facets
76
+ - !ruby/object:Gem::Dependency
79
77
  version_requirements: &id005 !ruby/object:Gem::Requirement
80
78
  none: false
81
79
  requirements:
@@ -85,11 +83,11 @@ dependencies:
85
83
  segments:
86
84
  - 0
87
85
  version: "0"
88
- type: :runtime
89
86
  requirement: *id005
90
- - !ruby/object:Gem::Dependency
87
+ type: :runtime
91
88
  prerelease: false
92
- name: haml
89
+ name: fileutils
90
+ - !ruby/object:Gem::Dependency
93
91
  version_requirements: &id006 !ruby/object:Gem::Requirement
94
92
  none: false
95
93
  requirements:
@@ -99,11 +97,11 @@ dependencies:
99
97
  segments:
100
98
  - 0
101
99
  version: "0"
102
- type: :runtime
103
100
  requirement: *id006
104
- - !ruby/object:Gem::Dependency
101
+ type: :runtime
105
102
  prerelease: false
106
- name: json
103
+ name: haml
104
+ - !ruby/object:Gem::Dependency
107
105
  version_requirements: &id007 !ruby/object:Gem::Requirement
108
106
  none: false
109
107
  requirements:
@@ -113,11 +111,11 @@ dependencies:
113
111
  segments:
114
112
  - 0
115
113
  version: "0"
116
- type: :runtime
117
114
  requirement: *id007
118
- - !ruby/object:Gem::Dependency
115
+ type: :runtime
119
116
  prerelease: false
120
- name: mime-types
117
+ name: json
118
+ - !ruby/object:Gem::Dependency
121
119
  version_requirements: &id008 !ruby/object:Gem::Requirement
122
120
  none: false
123
121
  requirements:
@@ -127,11 +125,11 @@ dependencies:
127
125
  segments:
128
126
  - 0
129
127
  version: "0"
130
- type: :runtime
131
128
  requirement: *id008
132
- - !ruby/object:Gem::Dependency
129
+ type: :runtime
133
130
  prerelease: false
134
- name: r18n-core
131
+ name: mime-types
132
+ - !ruby/object:Gem::Dependency
135
133
  version_requirements: &id009 !ruby/object:Gem::Requirement
136
134
  none: false
137
135
  requirements:
@@ -141,11 +139,11 @@ dependencies:
141
139
  segments:
142
140
  - 0
143
141
  version: "0"
144
- type: :runtime
145
142
  requirement: *id009
146
- - !ruby/object:Gem::Dependency
143
+ type: :runtime
147
144
  prerelease: false
148
- name: rack
145
+ name: r18n-core
146
+ - !ruby/object:Gem::Dependency
149
147
  version_requirements: &id010 !ruby/object:Gem::Requirement
150
148
  none: false
151
149
  requirements:
@@ -155,11 +153,11 @@ dependencies:
155
153
  segments:
156
154
  - 0
157
155
  version: "0"
158
- type: :runtime
159
156
  requirement: *id010
160
- - !ruby/object:Gem::Dependency
157
+ type: :runtime
161
158
  prerelease: false
162
- name: ruby-event
159
+ name: rack
160
+ - !ruby/object:Gem::Dependency
163
161
  version_requirements: &id011 !ruby/object:Gem::Requirement
164
162
  none: false
165
163
  requirements:
@@ -169,11 +167,11 @@ dependencies:
169
167
  segments:
170
168
  - 0
171
169
  version: "0"
172
- type: :runtime
173
170
  requirement: *id011
174
- - !ruby/object:Gem::Dependency
171
+ type: :runtime
175
172
  prerelease: false
176
- name: ruby-openid
173
+ name: ruby-event
174
+ - !ruby/object:Gem::Dependency
177
175
  version_requirements: &id012 !ruby/object:Gem::Requirement
178
176
  none: false
179
177
  requirements:
@@ -183,11 +181,11 @@ dependencies:
183
181
  segments:
184
182
  - 0
185
183
  version: "0"
186
- type: :runtime
187
184
  requirement: *id012
188
- - !ruby/object:Gem::Dependency
185
+ type: :runtime
189
186
  prerelease: false
190
- name: sass
187
+ name: ruby-openid
188
+ - !ruby/object:Gem::Dependency
191
189
  version_requirements: &id013 !ruby/object:Gem::Requirement
192
190
  none: false
193
191
  requirements:
@@ -197,11 +195,11 @@ dependencies:
197
195
  segments:
198
196
  - 0
199
197
  version: "0"
200
- type: :runtime
201
198
  requirement: *id013
202
- - !ruby/object:Gem::Dependency
199
+ type: :runtime
203
200
  prerelease: false
204
- name: term-ansicolor
201
+ name: sass
202
+ - !ruby/object:Gem::Dependency
205
203
  version_requirements: &id014 !ruby/object:Gem::Requirement
206
204
  none: false
207
205
  requirements:
@@ -211,11 +209,11 @@ dependencies:
211
209
  segments:
212
210
  - 0
213
211
  version: "0"
214
- type: :runtime
215
212
  requirement: *id014
216
- - !ruby/object:Gem::Dependency
213
+ type: :runtime
217
214
  prerelease: false
218
- name: yajl-ruby
215
+ name: term-ansicolor
216
+ - !ruby/object:Gem::Dependency
219
217
  version_requirements: &id015 !ruby/object:Gem::Requirement
220
218
  none: false
221
219
  requirements:
@@ -225,11 +223,11 @@ dependencies:
225
223
  segments:
226
224
  - 0
227
225
  version: "0"
228
- type: :runtime
229
226
  requirement: *id015
230
- - !ruby/object:Gem::Dependency
227
+ type: :runtime
231
228
  prerelease: false
232
- name: capybara
229
+ name: yajl-ruby
230
+ - !ruby/object:Gem::Dependency
233
231
  version_requirements: &id016 !ruby/object:Gem::Requirement
234
232
  none: false
235
233
  requirements:
@@ -239,11 +237,11 @@ dependencies:
239
237
  segments:
240
238
  - 0
241
239
  version: "0"
242
- type: :development
243
240
  requirement: *id016
244
- - !ruby/object:Gem::Dependency
241
+ type: :development
245
242
  prerelease: false
246
- name: cucumber
243
+ name: capybara
244
+ - !ruby/object:Gem::Dependency
247
245
  version_requirements: &id017 !ruby/object:Gem::Requirement
248
246
  none: false
249
247
  requirements:
@@ -253,11 +251,11 @@ dependencies:
253
251
  segments:
254
252
  - 0
255
253
  version: "0"
256
- type: :development
257
254
  requirement: *id017
258
- - !ruby/object:Gem::Dependency
255
+ type: :development
259
256
  prerelease: false
260
- name: launchy
257
+ name: cucumber
258
+ - !ruby/object:Gem::Dependency
261
259
  version_requirements: &id018 !ruby/object:Gem::Requirement
262
260
  none: false
263
261
  requirements:
@@ -267,11 +265,11 @@ dependencies:
267
265
  segments:
268
266
  - 0
269
267
  version: "0"
270
- type: :development
271
268
  requirement: *id018
272
- - !ruby/object:Gem::Dependency
269
+ type: :development
273
270
  prerelease: false
274
- name: rake
271
+ name: launchy
272
+ - !ruby/object:Gem::Dependency
275
273
  version_requirements: &id019 !ruby/object:Gem::Requirement
276
274
  none: false
277
275
  requirements:
@@ -281,11 +279,11 @@ dependencies:
281
279
  segments:
282
280
  - 0
283
281
  version: "0"
284
- type: :development
285
282
  requirement: *id019
286
- - !ruby/object:Gem::Dependency
283
+ type: :development
287
284
  prerelease: false
288
- name: rspec
285
+ name: rake
286
+ - !ruby/object:Gem::Dependency
289
287
  version_requirements: &id020 !ruby/object:Gem::Requirement
290
288
  none: false
291
289
  requirements:
@@ -295,11 +293,11 @@ dependencies:
295
293
  segments:
296
294
  - 0
297
295
  version: "0"
298
- type: :development
299
296
  requirement: *id020
300
- - !ruby/object:Gem::Dependency
297
+ type: :development
301
298
  prerelease: false
302
- name: rspec-mocks
299
+ name: rspec
300
+ - !ruby/object:Gem::Dependency
303
301
  version_requirements: &id021 !ruby/object:Gem::Requirement
304
302
  none: false
305
303
  requirements:
@@ -309,11 +307,11 @@ dependencies:
309
307
  segments:
310
308
  - 0
311
309
  version: "0"
312
- type: :development
313
310
  requirement: *id021
314
- - !ruby/object:Gem::Dependency
311
+ type: :development
315
312
  prerelease: false
316
- name: ya2yaml
313
+ name: rspec-mocks
314
+ - !ruby/object:Gem::Dependency
317
315
  version_requirements: &id022 !ruby/object:Gem::Requirement
318
316
  none: false
319
317
  requirements:
@@ -323,8 +321,10 @@ dependencies:
323
321
  segments:
324
322
  - 0
325
323
  version: "0"
326
- type: :development
327
324
  requirement: *id022
325
+ type: :development
326
+ prerelease: false
327
+ name: ya2yaml
328
328
  description: A web application framework in Ruby
329
329
  email:
330
330
  - frank.ficnar@gmail.com
@@ -508,7 +508,7 @@ files:
508
508
  - lib/ruby_app/exceptions/session_invalid_exception.rb
509
509
  - lib/ruby_app/language.rb
510
510
  - lib/ruby_app/log.rb
511
- - lib/ruby_app/mixins/configure_mixin.rb
511
+ - lib/ruby_app/mixins/configuration_mixin.rb
512
512
  - lib/ruby_app/mixins/delegate_mixin.rb
513
513
  - lib/ruby_app/mixins/hash_mixin.rb
514
514
  - lib/ruby_app/mixins/render_mixin.rb
@@ -579,7 +579,7 @@ files:
579
579
  - spec/elements/page_spec.rb
580
580
  - spec/language_spec.rb
581
581
  - spec/log_spec.rb
582
- - spec/mixins/configure_mixin_spec.rb
582
+ - spec/mixins/configuration_mixin_spec.rb
583
583
  - spec/mixins/delegate_mixin_spec.rb
584
584
  - spec/mixins/hash_mixin_spec.rb
585
585
  - spec/mixins/render_mixin_spec.rb
@@ -628,7 +628,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
628
628
  requirements: []
629
629
 
630
630
  rubyforge_project:
631
- rubygems_version: 1.8.13
631
+ rubygems_version: 1.8.10
632
632
  signing_key:
633
633
  specification_version: 3
634
634
  summary: A web application framework in Ruby
@@ -652,7 +652,7 @@ test_files:
652
652
  - spec/elements/page_spec.rb
653
653
  - spec/language_spec.rb
654
654
  - spec/log_spec.rb
655
- - spec/mixins/configure_mixin_spec.rb
655
+ - spec/mixins/configuration_mixin_spec.rb
656
656
  - spec/mixins/delegate_mixin_spec.rb
657
657
  - spec/mixins/hash_mixin_spec.rb
658
658
  - spec/mixins/render_mixin_spec.rb
data/spec/mixins/configure_mixin_spec.rb DELETED
@@ -1,24 +0,0 @@
1
- require 'spec_helper'
2
-
3
- require 'ruby_app/mixins/configure_mixin'
4
-
5
- describe RubyApp::Mixins::ConfigureMixin do
6
- include_context 'RubyApp::Request'
7
-
8
- describe 'positive' do
9
-
10
- before(:all) do
11
-
12
- class TestConfigureMixin
13
- include RubyApp::Mixins::ConfigureMixin
14
- end
15
-
16
- end
17
-
18
- let(:instance_a) { TestConfigureMixin.new }
19
-
20
- specify { instance_a.should respond_to(:configure) }
21
-
22
- end
23
-
24
- end