cloudfactory 0.5.4 → 0.5.5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.5.5 (2012-04-13)
+* Gold Fields added in the station
+
 ## 0.5.4 (2012-04-04)
 * Zipped file is removed after production run is successfully started.
 * Display error message if the csv file is greater than 2MB.

data/lib/cf/cli/line.rb

@@ -220,13 +220,14 @@ module Cf # :nodoc: all
         index = station_file['station']['station_index']
         input_formats_for_station = station_file['station']['input_formats']
         batch_size = station_file['station']['batch_size']
+        gold_fields = station_file['station']['gold_fields']
         if type == "tournament"
           jury_worker = station_file['station']['jury_worker']
           auto_judge = station_file['station']['auto_judge']
           acceptance_ratio = station_file['station']['acceptance_ratio']
-          station_params = {:line => line, :type => type, :jury_worker => jury_worker, :auto_judge => auto_judge, :input_formats => input_formats_for_station, :batch_size => batch_size, :acceptance_ratio => acceptance_ratio}
+          station_params = {:line => line, :type => type, :jury_worker => jury_worker, :auto_judge => auto_judge, :input_formats => input_formats_for_station, :batch_size => batch_size, :acceptance_ratio => acceptance_ratio, :gold_fields => gold_fields}
         else
-          station_params = {:line => line, :type => type, :input_formats => input_formats_for_station, :batch_size => batch_size}
+          station_params = {:line => line, :type => type, :input_formats => input_formats_for_station, :batch_size => batch_size, :gold_fields => gold_fields}
         end
         station = CF::Station.create(station_params) do |s|
           say "Adding Station #{index}: #{s.type}", :green

data/lib/cf/line.rb

@@ -64,6 +64,7 @@ module CF
     def stations stations = nil
       if stations
         type = stations.type
+        @gold_fields = stations.gold_fields.present? ? stations.gold_fields : []
         @batch_size = stations.batch_size
         @station_input_formats = stations.station_input_formats
         if type == "Improve" && self.stations.size < 1
@@ -79,7 +80,7 @@ module CF
                 :body =>
                 {
                   :api_key => CF.api_key,
-                  :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats}
+                  :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :gold_fields => @gold_fields}
                 }
               }
             else
@@ -89,7 +90,7 @@ module CF
                   :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}
+                    :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :batch_size => @batch_size, :gold_fields => @gold_fields}
                   }
                 }
               else
@@ -98,7 +99,7 @@ module CF
                   :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}
+                    :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :batch_size => @batch_size, :acceptance_ratio => @acceptance_ratio, :gold_fields => @gold_fields}
                   }
                 }
               end
@@ -111,7 +112,7 @@ module CF
                 :body =>
                 {
                   :api_key => CF.api_key,
-                  :station => {:type => type, :input_formats => @station_input_formats}
+                  :station => {:type => type, :input_formats => @station_input_formats, :gold_fields => @gold_fields}
                 }
               }
             else
@@ -120,7 +121,7 @@ module CF
                 :body =>
                 {
                   :api_key => CF.api_key,
-                  :station => {:type => type, :input_formats => @station_input_formats, :batch_size => @batch_size}
+                  :station => {:type => type, :input_formats => @station_input_formats, :batch_size => @batch_size, :gold_fields => @gold_fields}
                 }
               }
             end
@@ -132,6 +133,7 @@ module CF
           end
           station.batch_size = @batch_size
           station.line = self
+          station.gold_fields = @gold_fields
           station.line_title = self.title
           station.errors = resp.parsed_response['error']['message'] if resp.response.code != "200"
           @stations << station

data/lib/cf/station.rb

@@ -27,6 +27,9 @@ module CF
     # Contains Error Message if any
     attr_accessor :errors
 
+    # Contains gold_feild
+    attr_accessor :gold_fields
+
     # batch_size attribute, required for specifing size of batch
     attr_accessor :batch_size
 
@@ -46,6 +49,7 @@ module CF
       @line_instance = options[:line]
       @batch_size = options[:batch_size]
       @gold_standards = []
+      @gold_fields = options[:gold_fields]
       @acceptance_ratio = options[:acceptance_ratio]
       if @batch_size.nil?
         request_general =
@@ -53,7 +57,7 @@ module CF
           :body =>
           {
             :api_key => CF.api_key,
-            :station => {:type => @type, :input_formats => @station_input_formats}
+            :station => {:type => @type, :input_formats => @station_input_formats, :gold_fields => @gold_fields}
           }
         }
         if @acceptance_ratio.nil?
@@ -62,7 +66,7 @@ module CF
             :body =>
             {
               :api_key => CF.api_key,
-              :station => {:type => @type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats}
+              :station => {:type => @type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :gold_fields => @gold_fields}
             }
           }
         else
@@ -71,7 +75,7 @@ module CF
             :body =>
             {
               :api_key => CF.api_key,
-              :station => {:type => @type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :acceptance_ratio => @acceptance_ratio}
+              :station => {:type => @type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :acceptance_ratio => @acceptance_ratio, :gold_fields => @gold_fields}
             }
           }
         end
@@ -81,7 +85,7 @@ module CF
           :body =>
           {
             :api_key => CF.api_key,
-            :station => {:type => @type, :input_formats => @station_input_formats, :batch_size => @batch_size}
+            :station => {:type => @type, :input_formats => @station_input_formats, :batch_size => @batch_size, :gold_fields => @gold_fields}
           }
         }
         if @acceptance_ratio.nil?
@@ -90,7 +94,7 @@ module CF
             :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}
+              :station => {:type => @type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :batch_size => @batch_size, :gold_fields => @gold_fields}
             }
           }
         else
@@ -99,7 +103,7 @@ module CF
             :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}
+              :station => {:type => @type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :batch_size => @batch_size, :acceptance_ratio => @acceptance_ratio, :gold_fields => @gold_fields}
             }
           }
         end

data/lib/cf/version.rb

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

data/spec/station_spec.rb

@@ -8,9 +8,10 @@ describe CF::Station do
       sleep 1
       line = CF::Line.new(title, "Digitization")
       CF::InputFormat.new({:line => line, :name => "image_url", :required => true, :valid_type => "url"})
-      station = CF::Station.new({:type => "work"})
+      station = CF::Station.new({:type => "work", :gold_fields => ["name"]})
       line.stations station
       line.stations.first.type.should eql("WorkStation")
+      line.stations.first.gold_fields.should eql(["name"])
     end
 
     it "using the block variable" do
@@ -19,7 +20,7 @@ describe CF::Station do
       sleep 1
       line = CF::Line.create(title, "Digitization") do
         CF::InputFormat.new({:line => self, :name => "image_url", :required => true, :valid_type => "url"})
-        CF::Station.create({:line => self, :type => "work"}) do |s|
+        CF::Station.create({:line => self, :type => "work", :gold_fields => ["name"]}) do |s|
           CF::HumanWorker.new({:station => s, :number => 1, :reward => 20})
           CF::TaskForm.create({:station => s, :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"})
@@ -29,6 +30,7 @@ describe CF::Station do
         end
       end
       line.stations.first.type.should eq("WorkStation")
+      line.stations.first.gold_fields.should eql(["name"])
       line.stations.first.worker.number.should eql(1)
       line.stations.first.worker.reward.should eql("20")
       line.stations.first.form.title.should eq("Enter text from a business card image")
@@ -82,7 +84,7 @@ describe CF::Station do
       line.stations.first.jury_worker.should eql({"max_judges"=>10, "tournament_restarts"=>0, "number"=>2})
       line.stations.first.auto_judge.should eql({"enabled"=>true})
       line.stations.first.worker.number.should eql(3)
-      line.stations.first.worker.reward.should eql(20)
+      line.stations.first.worker.reward.should eql("20")
       line.stations.first.form.title.should eq("Enter text from a business card image")
       line.stations.first.form.instruction.should eq("Describe")
       line.stations.first.form.form_fields[0].label.should eq("First Name")
@@ -123,7 +125,9 @@ describe CF::Station do
           CF::HumanWorker.new({:station => s, :number => 2, :reward => 20})
         end
       end
-      line.stations.first.to_s.should eql("{:type => TournamentStation, :index => 1, :line_title => #{title}, :station_input_formats => , :jury_worker => {\"max_judges\"=>10,  \"tournament_restarts\"=>0, \"number\"=>2}, auto_judge => {\"enabled\"=>true, \"finalize_percentage\"=>51}, :errors => }")
+      line.stations.first.to_s.should eql("{:type => TournamentStation, :index => 1, :line_title => #{title}, :station_input_formats => , :jury_worker => {\"max_judges\"=>10, \"tournament_restarts\"=>0, \"number\"=>2}, auto_judge => {\"enabled\"=>true}, :errors => }")
+
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2162539380 !ruby/object:Gem::Requirement
+  requirement: &2152554380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162539380
+  version_requirements: *2152554380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2162538880 !ruby/object:Gem::Requirement
+  requirement: &2160901500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162538880
+  version_requirements: *2160901500
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2162538200 !ruby/object:Gem::Requirement
+  requirement: &2160901000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162538200
+  version_requirements: *2160901000
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2162537640 !ruby/object:Gem::Requirement
+  requirement: &2160900620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162537640
+  version_requirements: *2160900620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2162537040 !ruby/object:Gem::Requirement
+  requirement: &2160900160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162537040
+  version_requirements: *2160900160
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2162536500 !ruby/object:Gem::Requirement
+  requirement: &2160899660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2162536500
+  version_requirements: *2160899660
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2162535960 !ruby/object:Gem::Requirement
+  requirement: &2160899240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162535960
+  version_requirements: *2160899240
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2162535180 !ruby/object:Gem::Requirement
+  requirement: &2160898700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2162535180
+  version_requirements: *2160898700
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2162534520 !ruby/object:Gem::Requirement
+  requirement: &2160898200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2162534520
+  version_requirements: *2160898200
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2162534100 !ruby/object:Gem::Requirement
+  requirement: &2160897820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162534100
+  version_requirements: *2160897820
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2162533600 !ruby/object:Gem::Requirement
+  requirement: &2160897360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162533600
+  version_requirements: *2160897360
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2162533040 !ruby/object:Gem::Requirement
+  requirement: &2160896940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162533040
+  version_requirements: *2160896940
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2162532520 !ruby/object:Gem::Requirement
+  requirement: &2160896520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162532520
+  version_requirements: *2160896520
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2162531860 !ruby/object:Gem::Requirement
+  requirement: &2160896100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162531860
+  version_requirements: *2160896100
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2162547620 !ruby/object:Gem::Requirement
+  requirement: &2160895680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162547620
+  version_requirements: *2160895680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2162547120 !ruby/object:Gem::Requirement
+  requirement: &2160895180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2162547120
+  version_requirements: *2160895180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2162546660 !ruby/object:Gem::Requirement
+  requirement: &2160894760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162546660
+  version_requirements: *2160894760
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2162545820 !ruby/object:Gem::Requirement
+  requirement: &2160894220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *2162545820
+  version_requirements: *2160894220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2162545220 !ruby/object:Gem::Requirement
+  requirement: &2160893800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162545220
+  version_requirements: *2160893800
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2162544500 !ruby/object:Gem::Requirement
+  requirement: &2152553000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162544500
+  version_requirements: *2152553000
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2162543780 !ruby/object:Gem::Requirement
+  requirement: &2152551660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -241,10 +241,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2162543780
+  version_requirements: *2152551660
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2162543160 !ruby/object:Gem::Requirement
+  requirement: &2152549980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162543160
+  version_requirements: *2152549980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2162542500 !ruby/object:Gem::Requirement
+  requirement: &2152548520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162542500
+  version_requirements: *2152548520
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2162542080 !ruby/object:Gem::Requirement
+  requirement: &2152547180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162542080
+  version_requirements: *2152547180
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2162541640 !ruby/object:Gem::Requirement
+  requirement: &2152545320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,7 +285,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162541640
+  version_requirements: *2152545320
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - administrator@sprout-technology.com
@@ -426,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cloudfactory
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper and CLI for Cloudfactory.com
@@ -481,3 +481,4 @@ test_files:
 - spec/term_extraction_robot_spec.rb
 - spec/test_run_spec.rb
 - spec/text_appending_robot_spec.rb
+has_rdoc: