cloudfactory 0.1.17 → 0.1.18

data/cf.gemspec

@@ -59,14 +59,14 @@ Gem::Specification.new do |s|
 EOF
 
   s.add_dependency  "i18n"
-  s.add_dependency  "activesupport", '~> 3.0.3'
-  s.add_dependency  "hashie", "~> 1.0.0"
+  s.add_dependency  "activesupport", '~> 3.0'
+  s.add_dependency  "hashie", "~> 1.0"
   s.add_dependency  "rest-client"
   s.add_dependency  "json"
-  s.add_dependency  "thor", "~> 0.14.6"
+  s.add_dependency  "thor", "~> 0.14"
   s.add_dependency  "highline"
-  s.add_dependency  "httparty", "~> 0.7.8"
-  s.add_dependency  "terminal-table", "~> 1.4.2"
+  s.add_dependency  "httparty", "~> 0.7"
+  s.add_dependency  "terminal-table", "~> 1.4"
   s.add_dependency  "millisami-csv-hash"
   
   s.add_development_dependency 'ruby-debug19'

data/lib/cf/cli/line.rb

@@ -180,7 +180,7 @@ module Cf # :nodoc: all
 
         # Creation of Station
         stations = line_dump['stations']
-        stations.each do |station_file|
+        stations.each_with_index do |station_file, s_index|
           type = station_file['station']['station_type']
           index = station_file['station']['station_index']
           input_formats_for_station = station_file['station']['input_formats']
@@ -256,9 +256,9 @@ module Cf # :nodoc: all
               html_file = station_file['station']['custom_task_form']['html']
               html = File.read("#{line_source}/station_#{station_file['station']['station_index']}/#{html_file}")
               css_file = station_file['station']['custom_task_form']['css']
-              css = File.read("#{line_source}/station_#{station_file['station']['station_index']}/#{css_file}")
+              css = File.read("#{line_source}/station_#{station_file['station']['station_index']}/#{css_file}") if File.exist?("#{line_source}/station_#{s_index+1}/#{css_file}")
               js_file = station_file['station']['custom_task_form']['js']
-              js = File.read("#{line_source}/station_#{station_file['station']['station_index']}/#{js_file}")
+              js = File.read("#{line_source}/station_#{station_file['station']['station_index']}/#{js_file}") if File.exist?("#{line_source}/station_#{s_index+1}/#{js_file}")
               form = CF::CustomTaskForm.create({:station => s, :title => title, :instruction => instruction, :raw_html => html, :raw_css => css, :raw_javascript => js})
               say_status "form", "CustomTaskForm '#{form.title}'"
               display_error(line_title, "#{form.errors}") if form.errors.present?

data/lib/cf/cli/line_yaml_validator.rb

@@ -134,6 +134,13 @@ module Cf
 
                       instruction = custom_task_form['instruction']
                       errors << "Form Instruction is missing in Block station #{i+1}!" if instruction.nil?
+                      
+                      errors << "station_#{i+1} folder is missing! Create station_#{i+1} folder in #{Dir.pwd}" if !File.exist?("#{Dir.pwd}/station_#{i+1}")
+                      
+                      if File.exist?("#{Dir.pwd}/station_#{i+1}")
+                        station_source = "#{Dir.pwd}/station_#{i+1}"
+                        errors << "form.html is missing in folder #{Dir.pwd}/station_#{i+1} !" if !File.exist?("#{station_source}/form.html")
+                      end
                     end
                   elsif task_form.class == Hash
                     form_title = task_form['form_title']

data/lib/cf/line.rb

@@ -299,15 +299,17 @@ module CF
           @station_input_formats << i.to_hash
         end
         @station_form_fields = []
-        s.form_fields.each do |f|
-          @station_form_fields << f.to_hash
+        @temp_station = s.to_hash
+        if !s.form_fields.nil?
+          s.form_fields.each do |f|
+            @station_form_fields << f.to_hash
+          end
+          @temp_station.delete("form_fields")
+          @temp_station.merge!("form_fields" => @station_form_fields)
         end
-        temp_station = s.to_hash
-        temp_station.delete("form_fields")
-        temp_station.merge!("form_fields" => @station_form_fields)
-        temp_station.delete("input_formats")
-        temp_station.merge!("input_formats" => @station_input_formats)
-        @stations << temp_station
+        @temp_station.delete("input_formats")
+        @temp_station.merge!("input_formats" => @station_input_formats)
+        @stations << @temp_station
       end
       send_resp.delete("stations")
       send_resp.merge!("stations" => @stations)

data/lib/cf/version.rb

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

data/spec/line_spec.rb

@@ -367,9 +367,59 @@ describe CF::Line do
         end
         line_details = CF::Line.inspect("line_details")
         line_input_format_id = line_details['input_formats'].first['id']
-        from_field_id = line_details['stations'].first['form_fields'].first['id']
+        form_field_id = line_details['stations'].first['form_fields'].first['id']
         station_input_format_id = line_details['stations'].first['input_formats'].first['id']
-        line_details.should eql({"title"=>"line_details", "description"=>"", "public"=>false, "department"=>{"name"=>"Digitization"}, "app"=>{"name"=>"default", "email"=>"manish.das@sprout-technology.com", "notification_url"=>"http://www.cloudfactory.com"}, "code"=>200, "input_formats"=>[{"id"=>"#{line_input_format_id}", "name"=>"Company", "required"=>true, "valid_type"=>"general", "source_station_index"=>0}], "stations"=>[{"index"=>1, "type"=>"WorkStation", "worker"=>{"number"=>1, "reward"=>20, "type"=>"HumanWorker", "stat_badge"=>{"approval_rating"=>80, "abandonment_rate"=>30, "country"=>nil}}, "form"=>{"title"=>"Enter text from a business card image", "instruction"=>"Describe"}, "form_fields"=>[{"id"=>"#{from_field_id}", "label"=>"First Name", "field_type"=>"short_answer", "hint"=>nil, "required"=>true, "unique"=>nil, "hide_label"=>nil, "value"=>nil}], "input_formats"=>[{"id"=>"#{station_input_format_id}", "name"=>"Company", "required"=>true, "valid_type"=>"general", "source_station_index"=>0}]}]})
+        line_details.should eql({"title"=>"line_details", "description"=>"", "public"=>false, "department"=>{"name"=>"Digitization"}, "app"=>{"name"=>"default", "email"=>"manish.das@sprout-technology.com", "notification_url"=>"http://www.cloudfactory.com"}, "code"=>200, "input_formats"=>[{"id"=>"#{line_input_format_id}", "name"=>"Company", "required"=>true, "valid_type"=>"general", "source_station_index"=>0}], "stations"=>[{"index"=>1, "type"=>"WorkStation", "worker"=>{"number"=>1, "reward"=>20, "type"=>"HumanWorker", "stat_badge"=>{"approval_rating"=>80, "abandonment_rate"=>30, "country"=>nil}}, "form"=>{"title"=>"Enter text from a business card image", "instruction"=>"Describe"}, "form_fields"=>[{"id"=>"#{form_field_id}", "label"=>"First Name", "field_type"=>"short_answer", "hint"=>nil, "required"=>true, "unique"=>nil, "hide_label"=>nil, "value"=>nil}], "input_formats"=>[{"id"=>"#{station_input_format_id}", "name"=>"Company", "required"=>true, "valid_type"=>"general", "source_station_index"=>0}]}]})
+      end
+    end
+    
+    it "for robot worker" do
+      VCR.use_cassette "lines/block/line-details_robot_worker", :record => :new_episodes do
+      # WebMock.allow_net_connect!
+        line = CF::Line.create("line_details_robot","Digitization") do |l|
+          CF::InputFormat.new({:line => l, :name => "text", :valid_type => "general", :required => "true"})
+          CF::Station.create({:line => l, :type => "work"}) do |s|
+            CF::RobotWorker.create({:station => s, :type => "entity_extraction_robot", :settings => {:document => ["Franz Kafka and George Orwell are authors. Ludwig Von Beethoven and Mozart are musicians. China and Japan are countries"]}})
+          end
+        end
+        line_details = CF::Line.inspect("line_details_robot")
+        line_input_format_id = line_details['input_formats'].first['id']
+        station_input_format_id = line_details['stations'].first['input_formats'].first['id']
+        worker_id = line_details['stations'].first['worker']['id']
+        line_details.should eql({"title"=>"line_details_robot", "description"=>"", "department"=>"Digitization", "code"=>200, "input_formats"=>[{"id"=>"#{line_input_format_id}", "name"=>"text", "required"=>true, "valid_type"=>"general"}], "stations"=>[{"index"=>1, "type"=>"WorkStation", "worker"=>{"id"=>"#{worker_id}", "number"=>1, "reward"=>0.5, "type"=>"EntityExtractionRobot"}, "input_formats"=>[{"id"=>"#{station_input_format_id}", "name"=>"text", "required"=>true, "valid_type"=>"general"}]}]})
+      end
+    end
+    
+    it "with skill test feature" do
+      VCR.use_cassette "lines/block/line-details_skill_test", :record => :new_episodes do
+      # WebMock.allow_net_connect!
+        badge = 
+        {
+          :title => 'Football Fanatic', 
+          :description => "This qualification allows you to perform work at stations which have this badge.", 
+          :max_badges => 3, 
+          :test => 
+          {
+            :input => {:name => "Lionel Andres Messi", :country => "Argentina"},
+            :expected_output => 
+            [{:birthplace => "Rosario, Santa Fe, Argentina",:match_options => {:tolerance => 10, :ignore_case => true }},{:position => "CF",:match_options => {:tolerance => 1 }},{:"current-club" => "Barcelona",:match_options => {:tolerance => 1, :ignore_case => false }}]
+          }
+        }
+        line = CF::Line.create("line_details_skill_test", "Digitization") do |l|
+          CF::InputFormat.new({:line => l, :name => "image_url", :required => true, :valid_type => "url"})
+          CF::Station.create({:line =>l, :type => "work"}) do |s|
+            CF::HumanWorker.new({:station => s, :number => 1, :reward => 20, :skill_badge => badge})
+            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"})
+            end
+          end
+        end
+        line_details = CF::Line.inspect("line_details_skill_test")
+        line_input_format_id = line_details['input_formats'].first['id']
+        station_input_format_id = line_details['stations'].first['input_formats'].first['id']
+        form_field_id = line_details['stations'].first['form_fields'].first['id']
+        worker_id = line_details['stations'].first['worker']['id']
+        line_details.should eql({"title"=>"line_details_skill_test", "description"=>"", "department"=>"Digitization", "code"=>200, "input_formats"=>[{"id"=>"#{line_input_format_id}", "name"=>"image_url", "required"=>true, "valid_type"=>"url"}], "stations"=>[{"index"=>1, "type"=>"WorkStation", "worker"=>{"id"=>"#{worker_id}", "number"=>1, "reward"=>20, "type"=>"HumanWorker", "stat_badge"=>{"abandonment_rate"=>30, "approval_rating"=>80, "country"=>nil, "adult"=>nil}, "skill_badge"=>nil}, "form"=>{"title"=>"Enter text from a business card image", "instruction"=>"Describe"}, "form_fields"=>[{"id"=>"#{form_field_id}", "label"=>"First Name", "field_type"=>"short_answer", "hint"=>nil, "required"=>true, "unique"=>nil, "hide_label"=>nil, "value"=>nil}], "input_formats"=>[{"id"=>"#{station_input_format_id}", "name"=>"image_url", "required"=>true, "valid_type"=>"url"}]}]})
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000Z
+date: 2011-08-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2154827360 !ruby/object:Gem::Requirement
+  requirement: &2153706000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154827360
+  version_requirements: *2153706000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154826860 !ruby/object:Gem::Requirement
+  requirement: &2153705500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154826860
+  version_requirements: *2153705500
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2154826360 !ruby/object:Gem::Requirement
+  requirement: &2153705000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154826360
+  version_requirements: *2153705000
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2154825980 !ruby/object:Gem::Requirement
+  requirement: &2153704620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154825980
+  version_requirements: *2153704620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2154825520 !ruby/object:Gem::Requirement
+  requirement: &2153704160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +65,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154825520
+  version_requirements: *2153704160
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2154825020 !ruby/object:Gem::Requirement
+  requirement: &2158165980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2154825020
+  version_requirements: *2158165980
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2154824600 !ruby/object:Gem::Requirement
+  requirement: &2158165560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,32 +87,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154824600
+  version_requirements: *2158165560
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2154824060 !ruby/object:Gem::Requirement
+  requirement: &2158165020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2154824060
+  version_requirements: *2158165020
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2154823560 !ruby/object:Gem::Requirement
+  requirement: &2158164520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2154823560
+  version_requirements: *2158164520
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2154823180 !ruby/object:Gem::Requirement
+  requirement: &2158164140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154823180
+  version_requirements: *2158164140
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2154822720 !ruby/object:Gem::Requirement
+  requirement: &2158163680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154822720
+  version_requirements: *2158163680
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2154838680 !ruby/object:Gem::Requirement
+  requirement: &2158163260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154838680
+  version_requirements: *2158163260
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2154838180 !ruby/object:Gem::Requirement
+  requirement: &2158162760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2154838180
+  version_requirements: *2158162760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154837680 !ruby/object:Gem::Requirement
+  requirement: &2158162260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2154837680
+  version_requirements: *2158162260
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2154837220 !ruby/object:Gem::Requirement
+  requirement: &2158161800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2154837220
+  version_requirements: *2158161800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2154836840 !ruby/object:Gem::Requirement
+  requirement: &2158161420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154836840
+  version_requirements: *2158161420
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2154836380 !ruby/object:Gem::Requirement
+  requirement: &2158160960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154836380
+  version_requirements: *2158160960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2154835880 !ruby/object:Gem::Requirement
+  requirement: &2158160460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2154835880
+  version_requirements: *2158160460
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2154835460 !ruby/object:Gem::Requirement
+  requirement: &2158160040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154835460
+  version_requirements: *2158160040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154835000 !ruby/object:Gem::Requirement
+  requirement: &2158159580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154835000
+  version_requirements: *2158159580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2154834580 !ruby/object:Gem::Requirement
+  requirement: &2158159160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154834580
+  version_requirements: *2158159160
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2154834160 !ruby/object:Gem::Requirement
+  requirement: &2158158740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154834160
+  version_requirements: *2158158740
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2154833740 !ruby/object:Gem::Requirement
+  requirement: &2158158320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +263,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154833740
+  version_requirements: *2158158320
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - info@cloudfactory.com