cloudfactory 0.4.4 → 0.4.5

data/lib/cf/line.rb

@@ -38,6 +38,7 @@ module CF
     def initialize(title, department_name, options={})
       @input_formats =[]
       @stations =[]
+      @gold_standards = []
       @title = title
       @department_name = department_name
       @public = options[:public].nil? ? true : options[:public]
@@ -222,10 +223,59 @@ module CF
         @output_formats
       end
     end
-    
+
     def output_formats=(output_format) # :nodoc:
       @output_formats = output_format
     end
+
+
+    #specify the goldstandards for the line
+    # ===Usage Example:
+    # CF::GoldStandard.new({ :line => line,:name => "easy", :input => [{'image_url' =>"http://onwired.com/images/portfolio/linda-stanley-business-card.jpg"}],:expected_output => [{"first_name" => {"value" => "John"}, "last_name" => {"value" => "Lennon"}, "company" => {"value" => "Sprout"}}]})
+    def gold_standards gold_standard = nil
+      if gold_standard
+        line = self
+        gold_standard_options = gold_standard.settings
+        if !gold_standard_options.nil?
+          # check whether the gold standard is from a file or not(check for bulk assignment of goldstandards)
+          if gold_standard_options[:file]
+            puts  gold_standard_options[:file]
+            if File.exist?(gold_standard_options[:file].to_s)
+              file_upload = File.new(gold_standard_options[:file], 'rb')
+              resp = self.class.post("/lines/#{CF.account_name}/#{line.title.downcase}/gold_standards.json", {:file => file_upload})
+              gold_standard = CF::GoldStandard.new()
+              resp.each do |gs|
+                gold_standard.settings.merge!(gs.to_hash)
+              end
+            end
+          else
+            request =
+            {
+              :body =>
+              {
+                :api_key => CF.api_key,
+                :gold_standard => gold_standard_options
+              }
+            }
+            resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{line.title.downcase}/gold_standards.json",request)
+            gold_standard = CF::GoldStandard.new()
+            resp.parsed_response.first.delete("id")
+            gold_standard.settings.merge!(resp.parsed_response.first.symbolize_keys)
+            self.errors = resp.parsed_response['error']['message'] if resp.code != 200
+          end
+          @gold_standards << gold_standard
+        end
+      else
+        @gold_standards
+      end
+    end
+
+
+    def gold_standards=(gold_standard) # :nodoc:
+      @gold_standards << gold_standard
+    end
+
+
     # ==Returns the content of a line by making an Api call
     # ===Usage Example:
     #   CF::Line.info(line)

data/lib/cf/run.rb

@@ -168,38 +168,38 @@ module CF
         return resp
       end
     end
-    
+
     # ==Returns progress of the production run
     # ===Usage Example:
     #   progress = CF::Run.progress("run_title")
     def self.progress(run_title)
       get("/runs/#{CF.account_name}/#{run_title}/progress.json")
     end
-    
+
     def progress # :nodoc:
       self.class.get("/runs/#{CF.account_name}/#{self.title}/progress.json")
     end
-    
+
     # ==Returns progress details of the production run
     # ===Usage Example:
     #   progress = CF::Run.progress_details("run_title")
     def self.progress_details(run_title)
-      resp = get("/runs/#{CF.account_name}/#{run_title}/details.json")
-      return resp['progress_details']
+      resp = get("/runs/#{CF.account_name}/#{run_title}/progress.json")
+      return resp['progress']
     end
-    
+
     def progress_details # :nodoc:
-      resp = self.class.get("/runs/#{CF.account_name}/#{self.title}/details.json")
-      return resp['progress_details']
+      resp = self.class.get("/runs/#{CF.account_name}/#{self.title}/progress.json")
+      return resp['progress']
     end
-    
+
     # ==Returns all runs of a line
     # ===Usage Example:
     #   progress = CF::Run.all({:line_title => "line_title", :page => 1)
     def self.all(options={})
       page = options[:page].presence
       line_title = options[:line_title].presence
-      
+
       if line_title.nil?
         if page.nil?
           resp = get("/runs/#{CF.account_name}.json")

data/lib/cf/station.rb

@@ -11,22 +11,22 @@ module CF
 
     # Index number of station
     attr_accessor :index
-    
+
     # Line attribute of the station with which station is associated
     attr_accessor :line
-    
+
     # Manual input format settings for the station
     attr_accessor :station_input_formats
-    
+
     # Jury worker settings for the Tournament Station
     attr_accessor :jury_worker
-    
+
     # Auto Judge settings for the Tournament Station
     attr_accessor :auto_judge
-    
+
     # Contains Error Message if any
     attr_accessor :errors
-    
+
     # batch_size attribute, required for specifing size of batch
     attr_accessor :batch_size
 
@@ -37,6 +37,7 @@ module CF
     #   line.stations station
     def initialize(options={})
       @input_formats =[]
+      @badges = []
       @line_title = options[:line].nil? ? nil : options[:line].title
       @type = options[:type].nil? ? nil : options[:type].camelize
       @jury_worker = options[:jury_worker]
@@ -44,29 +45,30 @@ module CF
       @station_input_formats = options[:input_formats]
       @line_instance = options[:line]
       @batch_size = options[:batch_size]
+      @gold_standards = []
       @acceptance_ratio = options[:acceptance_ratio]
       if @batch_size.nil?
-        request_general = 
+        request_general =
         {
-          :body => 
+          :body =>
           {
             :api_key => CF.api_key,
             :station => {:type => @type, :input_formats => @station_input_formats}
           }
         }
         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}
             }
           }
         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, :acceptance_ratio => @acceptance_ratio}
@@ -74,27 +76,27 @@ module CF
           }
         end
       else
-        request_general = 
+        request_general =
         {
-          :body => 
+          :body =>
           {
             :api_key => CF.api_key,
             :station => {:type => @type, :input_formats => @station_input_formats, :batch_size => @batch_size}
           }
         }
         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}
@@ -172,25 +174,23 @@ module CF
         else
           number = worker_instance.number
           reward = worker_instance.reward
-          badge = worker_instance.badge
           stat_badge = worker_instance.stat_badge
-          if badge.nil? && stat_badge.nil?
-            request = 
+          if stat_badge.nil?
+            request =
             {
-              :body => 
+              :body =>
               {
                 :api_key => CF.api_key,
                 :worker => {:number => number, :reward => reward, :type => "HumanWorker"}
               }
             }
           else
-            request = 
+            request =
             {
-              :body => 
+              :body =>
               {
                 :api_key => CF.api_key,
                 :worker => {:number => number, :reward => reward, :type => "HumanWorker"},
-                :skill_badge => badge,
                 :stat_badge => stat_badge
               }
             }
@@ -200,8 +200,7 @@ module CF
           worker.id =  resp.parsed_response['id']
           worker.number =  resp.parsed_response['number']
           worker.reward =  resp.parsed_response['reward']
-          worker.stat_badge =  resp.parsed_response['stat_badge'] 
-          worker.skill_badges << resp.parsed_response['skill_badges']
+          worker.stat_badge =  resp.parsed_response['stat_badge']
           if resp.code != 200
             worker.errors = resp.parsed_response['error']['message']
           end
@@ -264,7 +263,7 @@ module CF
           @html = @form.raw_html
           @resp = CF::CustomTaskForm.post("/lines/#{CF.account_name}/#{self.line_title.downcase}/stations/#{self.index}/form.json", :form => {:title => @title, :instruction => @instruction, :_type => "CustomTaskForm", :raw_html => @html})
         else
-          @resp = CF::TaskForm.post("/lines/#{CF.account_name}/#{self.line_title.downcase}/stations/#{self.index}/form.json", :form => {:title => @title, :instruction => @instruction, :_type => type}) 
+          @resp = CF::TaskForm.post("/lines/#{CF.account_name}/#{self.line_title.downcase}/stations/#{self.index}/form.json", :form => {:title => @title, :instruction => @instruction, :_type => type})
         end
         @resp.to_hash.each_pair do |k,v|
           form.send("#{k}=",v) if form.respond_to?(k)
@@ -319,7 +318,7 @@ module CF
       self.errors = resp.error.message if resp.code != 200
       return resp
     end
-    
+
     def to_s # :nodoc:
       if self.type == "TournamentStation"
         "{:type => #{self.type}, :index => #{self.index}, :line_title => #{self.line_title}, :station_input_formats => #{self.station_input_formats}, :jury_worker => #{self.jury_worker}, auto_judge => #{self.auto_judge}, :errors => #{self.errors}}"
@@ -327,5 +326,88 @@ module CF
         "{:type => #{self.type}, :index => #{self.index}, :line_title => #{self.line_title}, :station_input_formats => #{self.station_input_formats}, :errors => #{self.errors}}"
       end
     end
+
+    #specify the goldstandards for the station
+    # ===Usage Example:
+    # CF::GoldStandard.new({ :station => station,:name => "easy",:input => [{'image_url' =>"http://onwired.com/images/portfolio/linda-stanley-business-card.jpg"}],:expected_output => [{"first_name" => {"value" => "John"}, "last_name" => {"value" => "Lennon"}, "company" => {"value" => "Sprout"}}]})
+    def gold_standards gold_standard = nil
+      if gold_standard
+        station = self
+        gold_standard_options = gold_standard.settings
+        if !gold_standard_options.nil?
+          if gold_standard_options[:file]
+            if File.exist?(gold_standard_options[:file].to_s)
+              file_upload = File.new(gold_standard_options[:file], 'rb')
+              resp = self.class.post("/lines/#{CF.account_name}/#{line.title.downcase}/gold_standards.json", {:file => file_upload})
+              gold_standard = CF::GoldStandard.new()
+              resp.each do |gs|
+                gold_standard.settings.merge!(gs.to_hash)
+              end
+            end
+          else
+            request =
+            {
+              :body =>
+              {
+                :api_key => CF.api_key,
+                :gold_standard => gold_standard_options
+              }
+            }
+            resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{line.title.downcase}/stations/#{station.index.to_i}/gold_standards.json",request)
+            gold_standard = CF::GoldStandard.new()
+            resp.parsed_response.first.delete("id")
+            gold_standard.settings.merge!(resp.parsed_response.first.symbolize_keys)
+            self.errors = resp.parsed_response['error']['message'] if resp.code != 200
+          end
+          @gold_standards << gold_standard
+        end
+      else
+        @gold_standards
+      end
+    end
+
+    def gold_standards=(gold_standard) # :nodoc:
+      @gold_standards << gold_standard
+    end
+
+    #specify the badges for the station
+    # ===Usage Example:
+    # CF::Badge.new({:line => line, :station => s,:name => "Tomb Digitizer", :description    => "This badge qualifies you to work on tomb digitization tasks.",:max_badges     => 100,:gold_standards => ["#{@gold_standard.settings[:name]}"],:test_attributes =>{:type => "default",:retries => 10,:pass_percentage => 100,:check_manually => true}})
+    def badges badge = nil
+      line_title = line["title"] || line.title
+      if badge
+        if badge.settings[:test_attributes][:form_attributes].present?
+          form =  badge.settings[:test_attributes][:form_attributes]
+          if( form[:type] == "CustomTaskForm" && form[:file])
+            raw_html = ""
+            File.open("#{form[:file]}").each_line do |line|
+              raw_html += line
+            end
+            badge.settings[:test_attributes][:form_attributes].merge!({:raw_html => raw_html,:_type =>"CustomTaskForm"})
+          end
+          badge.settings[:test_attributes][:form_attributes].merge!({:_type =>"TaskForm"}) if form[:type] == "TaskForm"
+        end
+        request =
+        {
+          :body =>
+          {
+            :api_key => CF.api_key,
+            :badge => badge.settings
+          }
+        }
+        resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{line_title.downcase}/stations/#{self.index}/badges.json",request)
+        badge = CF::Badge.new()
+        badge.settings.merge!(resp.to_hash)
+        self.errors = resp.parsed_response['error']['message'] if resp.code != 200
+        @badges << badge
+      else
+        @badges
+      end
+    end
+
+    def badges=(badge)
+      @badges << badge
+    end
+
   end
 end

data/lib/cf/test_run.rb

@@ -0,0 +1,66 @@
+module CF
+  class TestRun
+    require 'httparty'
+    include Client
+
+    # Title of the "run" object
+    attr_accessor :title
+
+    # Input to be passed for Production Run
+    attr_accessor :gold_standard_inputs
+
+    # Line attribute with which run is associated
+    attr_accessor :line
+
+    # Contains Error Message if any
+    attr_accessor :errors
+
+    # ==Initializes a new Run
+    # ===Usage Example:
+    #
+    #   run = CF::Run.new("line_title", "run name", file_path)
+    #
+    # ==OR
+    # You can pass line object instead of passing line title:
+    #   run = CF::Run.new(line_object, "run name", file_path)
+    def initialize(line, title, gold_standards_number)
+      @gold_standards_number = gold_standards_number # a number that denotes how many goldstandard form line should be included to create units
+      if line.class == CF::Line || line.class == Hashie::Mash
+        @line = line
+        @line_title = line.title
+      elsif line.class == String
+        if line.split("/").count == 2
+          @account = line.split("/").first
+          @line_title = line.split("/").last
+        elsif line.split("/").count == 1
+          @line_title = line
+        end
+      end
+      @title = title
+      if gold_standards_number
+        options =
+        {
+          :body =>
+          {
+            :api_key => CF.api_key,
+            :data =>{:run => { :title => @title ,:test =>"true"}, :gold_standard_inputs => @gold_standards_number}
+          }
+        }
+        if line.class == String && line.split("/").count == 2
+          run =  HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{@account}/#{@line_title.downcase}/runs.json",options)
+        else
+          run =  HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{@line_title.downcase}/runs.json",options)
+        end
+        if run.code != 200
+          self.errors = run.parsed_response['error']['message']
+        end
+      else
+        self.errors = "Number of GoldStandards to be used is not provided"
+      end
+    end
+
+    def self.create(line, title, input_number)
+      TestRun.new(line, title, input_number)
+    end
+  end
+end

data/lib/cf/version.rb

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

data/spec/account_spec.rb

@@ -4,6 +4,6 @@ describe CF::Account do
   it "should get the account info" do
     WebMock.allow_net_connect!
     account_info = CF::Account.info
-    account_info['name'].should eql("kickass")
+    account_info['name'].should eql("chandra")
   end
 end