cloudfactory 0.5 → 0.5.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.1 (2012-02-22)
+* Bug fixed for problem in options with block DSL
+* Default Worker Pool changed to mTurk
+
 ## 0.5 (2012-02-16)
 * All updates from  0.4x
 * worker pool added, by default it is cloudfactory

data/lib/cf/gold_standard.rb

@@ -45,6 +45,7 @@ module CF
             resp = self.class.post("/lines/#{CF.account_name}/#{@line.title.downcase}/gold_standards.json", {:file => file_upload,:template => options[:template]})
             @line.gold_standards = self
           end
+           #self.errors = resp['error']['message'] if resp["code"] != 200
         else
         request =
         {

data/lib/cf/line.rb

@@ -28,10 +28,10 @@ module CF
 
     # input_formats contained within line object
     attr_accessor :input_formats
-    
+
     # Contains Error Messages
     attr_accessor :errors
-    
+
     # output_formats of the final output for a line
     attr_accessor :output_formats
 
@@ -46,7 +46,7 @@ module CF
       @title = title
       @department_name = department_name
       @public = options[:public].nil? ? true : options[:public]
-      @worker_pool = options[:worker_pool].nil? ? "cloudfactory" : options[:worker_pool]
+      @worker_pool = options[:worker_pool].nil? ? "mturk" : options[:worker_pool]
       @description = options[:description]
       resp = self.class.post("/lines/#{CF.account_name}.json", {:line => {:title => title, :department_name => department_name, :public => @public,:worker_pool => @worker_pool, :description => @description}})
       self.errors = resp['error']['message'] if resp['code'] != 200
@@ -74,9 +74,9 @@ module CF
             @auto_judge = stations.auto_judge
             @acceptance_ratio = stations.acceptance_ratio
             if @batch_size.nil?
-              request_tournament = 
+              request_tournament =
               {
-                :body => 
+                :body =>
                 {
                   :api_key => CF.api_key,
                   :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats}
@@ -84,18 +84,18 @@ module CF
               }
             else
               if @acceptance_ratio.nil?
-                request_tournament = 
+                request_tournament =
                 {
-                  :body => 
+                  :body =>
                   {
                     :api_key => CF.api_key,
                     :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :batch_size => @batch_size}
                   }
                 }
               else
-                request_tournament = 
+                request_tournament =
                 {
-                  :body => 
+                  :body =>
                   {
                     :api_key => CF.api_key,
                     :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :batch_size => @batch_size, :acceptance_ratio => @acceptance_ratio}
@@ -106,18 +106,18 @@ module CF
             resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{self.title.downcase}/stations.json",request_tournament)
           else
             if @batch_size.nil?
-              request_general = 
+              request_general =
               {
-                :body => 
+                :body =>
                 {
                   :api_key => CF.api_key,
                   :station => {:type => type, :input_formats => @station_input_formats}
                 }
               }
             else
-              request_general = 
+              request_general =
               {
-                :body => 
+                :body =>
                 {
                   :api_key => CF.api_key,
                   :station => {:type => type, :input_formats => @station_input_formats, :batch_size => @batch_size}
@@ -161,7 +161,7 @@ module CF
     #     CF::Station.new({:line => self, :type => "Work"})
     #   end
     def self.create(title, department_name, options={}, &block)
-      line = Line.new(title,department_name,options={})
+      line = Line.new(title,department_name,options)
       @public = options[:public]
       @worker_pool = options[:worker_pool]
       @description = options[:description]
@@ -200,9 +200,9 @@ module CF
       else
         @input_formats
       end
-      
+
     end
-    
+
     def input_formats=(input_formats_value) # :nodoc:
       @input_formats << input_formats_value
     end
@@ -214,9 +214,9 @@ module CF
     def output_formats output_format = nil
       if output_format
         settings = output_format.settings
-        request = 
+        request =
         {
-          :body => 
+          :body =>
           {
             :api_key => CF.api_key,
             :output_formats => settings
@@ -315,13 +315,13 @@ module CF
         end
       end
       if resp['code'] != 200
-        @errors = resp['error']['message'] 
+        @errors = resp['error']['message']
         return nil
       else
         return resp
       end
     end
-    
+
     # ==Returns all the lines of an account
     # ===Syntax for all method is
     #   CF::Line.all
@@ -346,7 +346,7 @@ module CF
       #      send_resp = {"lines" => new_resp, "total_pages" => resp.total_pages, "total_lines" => resp.total_lines}
       return resp
     end
-    
+
     # ==Returns all the stations of a line
     # ===Usage Example:
     #   CF::Line.get_stations
@@ -394,7 +394,7 @@ module CF
       self.errors = resp['error']['message'] if resp['code'] != 200
       return resp
     end
-    
+
     # ==Deletes a line by passing it's title
     # ===Usage Example:
     #   line = CF::Line.new("line_title", "Survey")
@@ -409,7 +409,7 @@ module CF
       @errors = resp['error']['message'] if resp['code'] != 200
       return resp
     end
-    
+
     # ==Return all the associated elements of a line
     # ===Usage Example:
     #   line = CF::Line.inspect("line_title")
@@ -425,7 +425,7 @@ module CF
       #         #        send_resp.delete("input_formats")
       #         #        send_resp.merge!("input_formats" => @line_input_formats)
       #         # @stations = []
-      #       
+      #
       #         # resp.stations.each do |s|
       #         #           @station_input_formats = []
       #         #           s.input_formats.each do |i|
@@ -444,7 +444,7 @@ module CF
       #         #           @temp_station.merge!("input_formats" => @station_input_formats)
       #         #           @stations << @temp_station
       #         #         end
-      #               # 
+      #               #
       #               # send_resp.delete("stations")
       #               # send_resp.merge!("stations" => @stations)
       #         send_resp

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF # :nodoc: all
-  VERSION = "0.5"
+  VERSION = "0.5.1"
 end

data/spec/line_spec.rb

@@ -10,7 +10,7 @@ describe CF::Line do
       sleep 1
       line = CF::Line.new(title, "Digitization", {:public => false, :description => "this is description"})
       line.title.should eq(title)
-      line.worker_pool.should eql("cloudfactory")
+      line.worker_pool.should eql("mturk")
       line.department_name.should eq("Digitization")
     end
 
@@ -18,9 +18,9 @@ describe CF::Line do
       WebMock.allow_net_connect!
       title = "line_title#{Time.new.strftime('%Y%b%d-%H%M%S')}".downcase
       sleep 1
-      line = CF::Line.new(title, "Digitization", {:public => false,:worker_pool => "mturk", :description => "this is description"})
+      line = CF::Line.new(title, "Digitization", {:public => false,:worker_pool => "cloudfactory", :description => "this is description"})
       line.title.should eq(title)
-      line.worker_pool.should eql("mturk")
+      line.worker_pool.should eql("cloudfactory")
       line.department_name.should eq("Digitization")
     end
 
@@ -80,7 +80,7 @@ describe CF::Line do
       line.title.should eq(title)
       line.department_name.should eq("Digitization")
       line.public.should eql(true)
-      line.worker_pool.should eql("cloudfactory")
+      line.worker_pool.should eql("mturk")
       line.description.should eq("this is description")
     end
 
@@ -88,11 +88,11 @@ describe CF::Line do
       WebMock.allow_net_connect!
       title = "line_title#{Time.new.strftime('%Y%b%d-%H%M%S')}".downcase
       sleep 1
-      line = CF::Line.new(title, "Digitization", {:public => true,:worker_pool => "mturk", :description => "this is description"})
+      line = CF::Line.new(title, "Digitization", {:public => true,:worker_pool => "cloudfactory", :description => "this is description"})
       line.title.should eq(title)
       line.department_name.should eq("Digitization")
       line.public.should eql(true)
-      line.worker_pool.should eql("mturk")
+      line.worker_pool.should eql("cloudfactory")
       line.description.should eq("this is description")
     end
 
@@ -133,6 +133,25 @@ describe CF::Line do
       line.stations.first.form.form_fields.first.field_type.should eq("short_answer")
       line.stations.first.form.form_fields.first.required.should eq(true)
     end
+
+    it "create with a new station with worker_pool specified" do
+      WebMock.allow_net_connect!
+      title = "line_title#{Time.new.strftime('%Y%b%d-%H%M%S')}".downcase
+      sleep 1
+      line = CF::Line.create(title, "Digitization", :worker_pool => "mturk") do |l|
+        CF::InputFormat.new({:line => l, :name => "image_url", :required => true, :valid_type => "url"})
+        CF::Station.create({:line => l, :type => "work"}) do |station|
+          CF::HumanWorker.new({:line => l, :station => station, :number => 1, :reward => 20})
+          CF::TaskForm.create({:station => station, :title => "Enter text from a business card image", :instruction => "Describe"}) do |i|
+            CF::FormField.new({:form => i, :label => "First Name", :field_type => "short_answer", :required => "true"})
+            CF::FormField.new({:form => i, :label => "Middle Name", :field_type => "short_answer"})
+            CF::FormField.new({:form => i, :label => "Last Name", :field_type => "short_answer", :required => "true"})
+          end
+        end
+      end
+      line.title.should eq(title)
+      line.worker_pool.should eq("mturk")
+    end
   end
 
   context "listing lines" do

metadata

@@ -2,7 +2,7 @@
 name: cloudfactory
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
 - CloudFactory.com
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-16 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n