houdini-rails3 0.1.5 → 0.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/Gemfile +4 -4
  2. data/VERSION +1 -1
  3. data/houdini-rails3.gemspec +4 -5
  4. data/lib/houdini_rails/model.rb +11 -5
  5. data/lib/houdini_rails/task.rb +4 -2
  6. metadata +69 -67
data/Gemfile CHANGED
@@ -3,11 +3,11 @@ source "http://rubygems.org"
3
3
  gem "rails", "~>3.0.0"
4
4
  gem "tilt", "~> 1.1"
5
5
 
6
- if RUBY_VERSION < '1.9'
7
- gem "ruby-debug", ">= 0.10.3"
8
- end
9
-
10
6
  group :development do
7
+ if RUBY_VERSION < '1.9'
8
+ gem "ruby-debug", ">= 0.10.3"
9
+ end
10
+
11
11
  gem "rspec-rails", ">= 2.0.0.beta"
12
12
  gem "capybara", ">= 0.3.9"
13
13
  gem "sqlite3-ruby", :require => "sqlite3"
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.5
1
+ 0.1.7
data/houdini-rails3.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{houdini-rails3}
8
- s.version = "0.1.5"
8
+ s.version = "0.1.7"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Chris Conley"]
12
- s.date = %q{2011-01-24}
12
+ s.date = %q{2011-02-19}
13
13
  s.description = %q{Rails 3 Engine for using the Houdini Mechanical Turk API}
14
14
  s.email = %q{chris@chrisconley.me}
15
15
  s.extra_rdoc_files = [
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
75
75
  ]
76
76
  s.homepage = %q{http://github.com/chrisconley/houdini-rails3}
77
77
  s.require_paths = ["lib"]
78
- s.rubygems_version = %q{1.3.7}
78
+ s.rubygems_version = %q{1.5.2}
79
79
  s.summary = %q{Rails 3 Engine for using the Houdini Mechanical Turk API}
80
80
  s.test_files = [
81
81
  "spec/controllers/houdini/postbacks_controller_spec.rb",
@@ -101,13 +101,12 @@ Gem::Specification.new do |s|
101
101
  ]
102
102
 
103
103
  if s.respond_to? :specification_version then
104
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
105
104
  s.specification_version = 3
106
105
 
107
106
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
108
107
  s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
109
108
  s.add_runtime_dependency(%q<tilt>, ["~> 1.1"])
110
- s.add_runtime_dependency(%q<ruby-debug>, [">= 0.10.3"])
109
+ s.add_development_dependency(%q<ruby-debug>, [">= 0.10.3"])
111
110
  s.add_development_dependency(%q<rspec-rails>, [">= 2.0.0.beta"])
112
111
  s.add_development_dependency(%q<capybara>, [">= 0.3.9"])
113
112
  s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
data/lib/houdini_rails/model.rb CHANGED
@@ -18,7 +18,7 @@ module Houdini
18
18
  end
19
19
 
20
20
  def houdini_tasks
21
- @houdini_task ||= {}
21
+ @houdini_tasks ||= {}
22
22
  end
23
23
 
24
24
  end
@@ -28,12 +28,18 @@ module Houdini
28
28
  params = {
29
29
  :api_key => Houdini::KEY,
30
30
  :identifier => houdini_task.name,
31
- :price => houdini_task.price,
32
- :title => houdini_task.title,
33
- :form_html => generate_form_html(houdini_task.form_template),
34
31
  :postback_url => houdini_postbacks_url(self.class.name, self.id, houdini_task.name, :host => Houdini::RAILS_HOST)
35
32
  }
33
+ params[:price] = houdini_task.price if houdini_task.price
34
+ params[:title] = houdini_task.title if houdini_task.title
35
+ params[:form_html] = generate_form_html(houdini_task.form_template) if houdini_task.form_template
36
+ if houdini_task.text #TODO: Refactor this logic and make available on all params
37
+ params[:text] = houdini_task.text
38
+ params[:text] = houdini_task.text.call if houdini_task.text.respond_to?(:call)
39
+ params[:text] = self.send(houdini_task.text) if self.respond_to?(houdini_task.text)
40
+ end
36
41
  params[:matched_answers_size] = houdini_task.matched_answers_size if houdini_task.matched_answers_size
42
+ params[:max_iterations] = houdini_task.max_iterations if houdini_task.max_iterations
37
43
 
38
44
  result = Houdini::Base.request(houdini_task.api, params)
39
45
 
@@ -56,4 +62,4 @@ module Houdini
56
62
  template.render(self, self.class.name.downcase.to_sym => self)
57
63
  end
58
64
  end
59
- end
65
+ end
data/lib/houdini_rails/task.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Houdini
2
2
  class Task
3
- attr_accessor :name, :api, :on, :if, :price, :title, :form_template, :after_submit, :on_task_completion, :matched_answers_size
3
+ attr_accessor :name, :api, :on, :if, :price, :title, :form_template, :text, :after_submit, :on_task_completion, :matched_answers_size, :max_iterations
4
4
 
5
5
  def initialize(name, options)
6
6
  @name = name
@@ -10,9 +10,11 @@ module Houdini
10
10
  @price = options[:price]
11
11
  @title = options[:title]
12
12
  @form_template = options[:form_template]
13
+ @text = options[:text]
13
14
  @after_submit = options[:after_submit]
14
15
  @on_task_completion = options[:on_task_completion] || :update_attributes
15
16
  @matched_answers_size = options[:matched_answers_size]
17
+ @max_iterations = option[:max_iterations]
16
18
  end
17
19
  end
18
- end
20
+ end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: houdini-rails3
3
3
  version: !ruby/object:Gem::Version
4
- hash: 17
5
- prerelease: false
4
+ hash: 21
5
+ prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 1
9
- - 5
10
- version: 0.1.5
9
+ - 7
10
+ version: 0.1.7
11
11
  platform: ruby
12
12
  authors:
13
13
  - Chris Conley
@@ -15,14 +15,12 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-01-24 00:00:00 -05:00
18
+ date: 2011-02-19 00:00:00 -05:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  type: :runtime
23
- prerelease: false
24
- name: rails
25
- version_requirements: &id001 !ruby/object:Gem::Requirement
23
+ requirement: &id001 !ruby/object:Gem::Requirement
26
24
  none: false
27
25
  requirements:
28
26
  - - ~>
@@ -33,12 +31,12 @@ dependencies:
33
31
  - 0
34
32
  - 0
35
33
  version: 3.0.0
36
- requirement: *id001
34
+ name: rails
35
+ version_requirements: *id001
36
+ prerelease: false
37
37
  - !ruby/object:Gem::Dependency
38
38
  type: :runtime
39
- prerelease: false
40
- name: tilt
41
- version_requirements: &id002 !ruby/object:Gem::Requirement
39
+ requirement: &id002 !ruby/object:Gem::Requirement
42
40
  none: false
43
41
  requirements:
44
42
  - - ~>
@@ -48,12 +46,12 @@ dependencies:
48
46
  - 1
49
47
  - 1
50
48
  version: "1.1"
51
- requirement: *id002
52
- - !ruby/object:Gem::Dependency
53
- type: :runtime
49
+ name: tilt
50
+ version_requirements: *id002
54
51
  prerelease: false
55
- name: ruby-debug
56
- version_requirements: &id003 !ruby/object:Gem::Requirement
52
+ - !ruby/object:Gem::Dependency
53
+ type: :development
54
+ requirement: &id003 !ruby/object:Gem::Requirement
57
55
  none: false
58
56
  requirements:
59
57
  - - ">="
@@ -64,12 +62,12 @@ dependencies:
64
62
  - 10
65
63
  - 3
66
64
  version: 0.10.3
67
- requirement: *id003
65
+ name: ruby-debug
66
+ version_requirements: *id003
67
+ prerelease: false
68
68
  - !ruby/object:Gem::Dependency
69
69
  type: :development
70
- prerelease: false
71
- name: rspec-rails
72
- version_requirements: &id004 !ruby/object:Gem::Requirement
70
+ requirement: &id004 !ruby/object:Gem::Requirement
73
71
  none: false
74
72
  requirements:
75
73
  - - ">="
@@ -81,12 +79,12 @@ dependencies:
81
79
  - 0
82
80
  - beta
83
81
  version: 2.0.0.beta
84
- requirement: *id004
82
+ name: rspec-rails
83
+ version_requirements: *id004
84
+ prerelease: false
85
85
  - !ruby/object:Gem::Dependency
86
86
  type: :development
87
- prerelease: false
88
- name: capybara
89
- version_requirements: &id005 !ruby/object:Gem::Requirement
87
+ requirement: &id005 !ruby/object:Gem::Requirement
90
88
  none: false
91
89
  requirements:
92
90
  - - ">="
@@ -97,12 +95,12 @@ dependencies:
97
95
  - 3
98
96
  - 9
99
97
  version: 0.3.9
100
- requirement: *id005
98
+ name: capybara
99
+ version_requirements: *id005
100
+ prerelease: false
101
101
  - !ruby/object:Gem::Dependency
102
102
  type: :development
103
- prerelease: false
104
- name: sqlite3-ruby
105
- version_requirements: &id006 !ruby/object:Gem::Requirement
103
+ requirement: &id006 !ruby/object:Gem::Requirement
106
104
  none: false
107
105
  requirements:
108
106
  - - ">="
@@ -111,12 +109,12 @@ dependencies:
111
109
  segments:
112
110
  - 0
113
111
  version: "0"
114
- requirement: *id006
112
+ name: sqlite3-ruby
113
+ version_requirements: *id006
114
+ prerelease: false
115
115
  - !ruby/object:Gem::Dependency
116
116
  type: :development
117
- prerelease: false
118
- name: bundler
119
- version_requirements: &id007 !ruby/object:Gem::Requirement
117
+ requirement: &id007 !ruby/object:Gem::Requirement
120
118
  none: false
121
119
  requirements:
122
120
  - - ~>
@@ -127,29 +125,30 @@ dependencies:
127
125
  - 0
128
126
  - 0
129
127
  version: 1.0.0
130
- requirement: *id007
128
+ name: bundler
129
+ version_requirements: *id007
130
+ prerelease: false
131
131
  - !ruby/object:Gem::Dependency
132
132
  type: :development
133
- prerelease: false
134
- name: jeweler
135
- version_requirements: &id008 !ruby/object:Gem::Requirement
133
+ requirement: &id008 !ruby/object:Gem::Requirement
136
134
  none: false
137
135
  requirements:
138
136
  - - ~>
139
137
  - !ruby/object:Gem::Version
140
- hash: -1876988218
138
+ hash: 1923832031
141
139
  segments:
142
140
  - 1
143
141
  - 5
144
142
  - 0
145
- - pre3
143
+ - pre
144
+ - 3
146
145
  version: 1.5.0.pre3
147
- requirement: *id008
146
+ name: jeweler
147
+ version_requirements: *id008
148
+ prerelease: false
148
149
  - !ruby/object:Gem::Dependency
149
150
  type: :development
150
- prerelease: false
151
- name: rcov
152
- version_requirements: &id009 !ruby/object:Gem::Requirement
151
+ requirement: &id009 !ruby/object:Gem::Requirement
153
152
  none: false
154
153
  requirements:
155
154
  - - ">="
@@ -158,12 +157,12 @@ dependencies:
158
157
  segments:
159
158
  - 0
160
159
  version: "0"
161
- requirement: *id009
160
+ name: rcov
161
+ version_requirements: *id009
162
+ prerelease: false
162
163
  - !ruby/object:Gem::Dependency
163
164
  type: :runtime
164
- prerelease: false
165
- name: tilt
166
- version_requirements: &id010 !ruby/object:Gem::Requirement
165
+ requirement: &id010 !ruby/object:Gem::Requirement
167
166
  none: false
168
167
  requirements:
169
168
  - - ~>
@@ -173,12 +172,12 @@ dependencies:
173
172
  - 1
174
173
  - 1
175
174
  version: "1.1"
176
- requirement: *id010
175
+ name: tilt
176
+ version_requirements: *id010
177
+ prerelease: false
177
178
  - !ruby/object:Gem::Dependency
178
179
  type: :development
179
- prerelease: false
180
- name: rspec
181
- version_requirements: &id011 !ruby/object:Gem::Requirement
180
+ requirement: &id011 !ruby/object:Gem::Requirement
182
181
  none: false
183
182
  requirements:
184
183
  - - ">="
@@ -191,12 +190,12 @@ dependencies:
191
190
  - beta
192
191
  - 19
193
192
  version: 2.0.0.beta.19
194
- requirement: *id011
193
+ name: rspec
194
+ version_requirements: *id011
195
+ prerelease: false
195
196
  - !ruby/object:Gem::Dependency
196
197
  type: :development
197
- prerelease: false
198
- name: bundler
199
- version_requirements: &id012 !ruby/object:Gem::Requirement
198
+ requirement: &id012 !ruby/object:Gem::Requirement
200
199
  none: false
201
200
  requirements:
202
201
  - - ~>
@@ -207,29 +206,30 @@ dependencies:
207
206
  - 0
208
207
  - 0
209
208
  version: 1.0.0
210
- requirement: *id012
209
+ name: bundler
210
+ version_requirements: *id012
211
+ prerelease: false
211
212
  - !ruby/object:Gem::Dependency
212
213
  type: :development
213
- prerelease: false
214
- name: jeweler
215
- version_requirements: &id013 !ruby/object:Gem::Requirement
214
+ requirement: &id013 !ruby/object:Gem::Requirement
216
215
  none: false
217
216
  requirements:
218
217
  - - ~>
219
218
  - !ruby/object:Gem::Version
220
- hash: -1876988218
219
+ hash: 1923832031
221
220
  segments:
222
221
  - 1
223
222
  - 5
224
223
  - 0
225
- - pre3
224
+ - pre
225
+ - 3
226
226
  version: 1.5.0.pre3
227
- requirement: *id013
227
+ name: jeweler
228
+ version_requirements: *id013
229
+ prerelease: false
228
230
  - !ruby/object:Gem::Dependency
229
231
  type: :development
230
- prerelease: false
231
- name: rcov
232
- version_requirements: &id014 !ruby/object:Gem::Requirement
232
+ requirement: &id014 !ruby/object:Gem::Requirement
233
233
  none: false
234
234
  requirements:
235
235
  - - ">="
@@ -238,7 +238,9 @@ dependencies:
238
238
  segments:
239
239
  - 0
240
240
  version: "0"
241
- requirement: *id014
241
+ name: rcov
242
+ version_requirements: *id014
243
+ prerelease: false
242
244
  description: Rails 3 Engine for using the Houdini Mechanical Turk API
243
245
  email: chris@chrisconley.me
244
246
  executables: []
@@ -334,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
334
336
  requirements: []
335
337
 
336
338
  rubyforge_project:
337
- rubygems_version: 1.3.7
339
+ rubygems_version: 1.5.2
338
340
  signing_key:
339
341
  specification_version: 3
340
342
  summary: Rails 3 Engine for using the Houdini Mechanical Turk API