cloudfactory 0.6 → 0.6.1

data/CHANGELOG.md

@@ -1,6 +1,3 @@
-## 0.6 (2012-06-06)
-* Badge creation, update, deletion and listing added
-
 ## 0.5.6 (2012-05-17)
 * Priority field added in the line
 

data/lib/cf/badge.rb

@@ -13,132 +13,45 @@ module CF
     attr_accessor :description
 
     # number of badge provided to the worker
-    attr_accessor :max_badge_assignments
-
-    attr_accessor :allow_retake_after
+    attr_accessor :max_badges
 
     # Contains error message
     attr_accessor :errors
 
     def initialize(options={})
       options.symbolize_keys!
-      #if the form is provided as a file then explicitly add title and raw_html for the form
-      if options[:form] && options[:form].class != Hash && File.exist?(options[:form])
-        file_type = IO.popen(["file", "--brief", "--mime-type", options[:form]], in: :close, err: :close).read.chomp
-        if file_type == "text/html"
-          options[:form] = {:title => "#{options[:name]}_form",:_type => "CustomTaskForm", :raw_html => File.read(options[:form])}
-        else
-          @errors = ["Wrong type of file for the form."]
-          return @errors
-          exit(1)
+      if options[:test_attributes] && options[:test_attributes][:form_attributes]
+        form =  options[:test_attributes][:form_attributes]
+        if( form[:type] == "CustomTaskForm" && form[:file])
+          raw_html = ""
+          File.open("#{form[:file]}").each_line do |line|
+            raw_html += line
+          end
+          options[:test_attributes][:form_attributes].merge!({:raw_html => raw_html,:_type =>"CustomTaskForm"})
         end
+        options[:test_attributes][:form_attributes].merge!({:_type =>"TaskForm"}) if form[:type] == "TaskForm"
       end
-
-      #known_answers of the badge get customize because to if unique identifier doesn't present then array of hashs returns the last hash for Httparty and get all key value merge into one in rest client/ rack
-      options[:known_answers] = self.class.customize_known_answers(options[:known_answers], options[:name]) if options[:known_answers].present?
-
       @settings = options
-      @name = options[:name]
-      @description = options[:description]
-      @allow_retake_after = options[:allow_retake_after]
-
-      request =
-      {
-        :body =>
+      @station = options.delete(:station)
+      @line = options.delete(:line)
+      if @line.present? && @station.present?
+        request =
         {
-          :api_key => CF.api_key,
-          :badge => options
+          :body =>
+          {
+            :api_key => CF.api_key,
+            :badge => options
+          }
         }
-      }
 
-      resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/accounts/#{CF.account_name}/badges.json",request)
-      begin
-      self.errors = resp["error"]["message"] if resp.code != 200
-      return resp
-      rescue
-        self.errors = ["Unexpected error found. Confirm that you are in correct path and try again."]
+        resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{@line.title.downcase}/stations/#{@station.index}/badges.json",request)
+        @station.badges = self
+        self.errors = resp.parsed_response['error']['message'] if resp.code != 200
       end
     end
 
     def self.create(*args)
       Badge.new(args.first)
     end
-
-    def self.update(badge_name, update_params)
-      badge_name = badge_name.parameterize
-      update_params.symbolize_keys!
-      if update_params[:form] && update_params[:form].class != Hash && File.exist?(update_params[:form])
-        file_type = IO.popen(["file", "--brief", "--mime-type", update_params[:form]], in: :close, err: :close).read.chomp
-        if file_type == "text/html"
-          update_params[:form] = {:title => "#{update_params[:name]}_form",:_type => "CustomTaskForm", :raw_html => File.read(update_params[:form])}
-        else
-          return
-        end
-      end
-
-      update_params[:known_answers] = customize_known_answers(update_params[:known_answers], update_params[:name]) if update_params[:known_answers].present?
-
-      request =
-      {
-        :body =>
-        {
-          :api_key => CF.api_key,
-          :badge => update_params
-        }
-      }
-      resp = HTTParty.put("#{CF.api_url}#{CF.api_version}/accounts/#{CF.account_name}/badges/#{badge_name}.json",request)
-      return resp
-    end
-
-    def self.destroy(*args)
-      name = args[0].parameterize
-      options = args[1].nil? ? {} : args[1]
-      decendents = check_for_decendents(name)
-      if decendents
-        response = delete("/accounts/#{CF.account_name}/badges/#{name}.json") if options.force
-      else
-        response = delete("/accounts/#{CF.account_name}/badges/#{name}.json")
-      end
-      @errors = response['error']['message'] if response['code'] != 200
-      return response
-    end
-
-    #list all badges with in the account if name is not provided else it will return list all values of the given badge
-    def self.list(name = nil)
-      response =  get("/accounts/#{CF.account_name}/badges.json", :name => name)
-      @errors = response['error']['message'] if response['code'] != 200
-      return response
-    end
-
-    protected
-
-    #insert name to the goldstandard/known_answer if name is not provided
-    def self.customize_known_answers(known_answers, badge_name)
-      index = 1
-      known_answers.each do |known_answer|
-        unless known_answer["name"].present?
-          known_answer.merge!("name" => "#{badge_name}_answer_#{index}")
-          index +=1
-        end
-      end
-    end
-
-
-    #list the decendents for the badges like worker_associated, line_associated, number of tasks associated with the badge
-    def self.check_for_decendents(name)
-      response =  get("/accounts/#{CF.account_name}/badges.json", :name => name)
-      @errors = response["error"]["message"] unless response["code"] == 200
-      unless @errors
-        lines = response["badges"].first["line_associated"]
-        workers = response["badges"].first["workers"]
-        tasks = response["badges"].first["num_of_tasks"]
-        #if the lines of worker count is greater then 0 then return true else return lines and worker count
-        if lines > 0 || workers > 0
-          {:lines_count => lines, :workers_count => workers, :tasks => tasks }
-        else
-          false
-        end
-      end
-    end
   end
 end

data/lib/cf/cli.rb

@@ -17,15 +17,12 @@ require 'active_support/core_ext/object/blank'
 
 cli_directory = File.expand_path("../cf/cli", File.dirname(__FILE__))
 require "#{cli_directory}/config"
-require "#{cli_directory}/badge_yaml_validator"
-require "#{cli_directory}/badge"
 require "#{cli_directory}/line_yaml_validator"
 require "#{cli_directory}/line"
 require "#{cli_directory}/form"
 require "#{cli_directory}/production"
 
 
-
 if ENV['TEST']
   require 'pry'
 end
@@ -36,9 +33,9 @@ module Cf # :nodoc: all
     include Cf::Config
 
     def help(*args)
-      File.open(File.expand_path(File.dirname(__FILE__)+"/help.txt")).each_line{ |s|
-        say  s
-      }
+        File.open(File.expand_path(File.dirname(__FILE__)+"/help.txt")).each_line{ |s|
+          say  s
+        }
     end
 
     map "-v" => :version
@@ -62,7 +59,7 @@ module Cf # :nodoc: all
 
     no_tasks do
       def ask_password(message)
-        ::HighLine.new.ask(message) do |q|
+        ::HighLine.new.ask(message) do |q| 
           q.echo = '*'
         end
       end
@@ -106,9 +103,6 @@ module Cf # :nodoc: all
     # later it can be replaced with hacked millisami-thor version of the thor library with run-time dependency via Bundler
     subcommand "production", Cf::Production
 
-    desc "badge", "Commands to manage Badges. For more info cf badge help"
-    subcommand "badge", Cf::Badge
-
     desc "output <run-title>", "Get the output of run. For more info, cf output help"
     method_option :run_title, :type => :string, :required => true, :aliases => "-t", :desc => "the index of the station"
     method_option :station_index, :type => :numeric, :aliases => "-s", :desc => "the index of the station"
@@ -134,7 +128,7 @@ module Cf # :nodoc: all
             output = CF::Run.final_output(run_title)
           end
           if !output.empty?
-            output.each
+            output.each 
             csv_str = CSVHash(output,output.first.keys)
             csv_str = csv_str.gsub("\"\"", '"')
             FileUtils.mkdir("#{line_source}/output") unless Dir.exist?("#{line_source}/output") if RUBY_VERSION > "1.9"

data/lib/cf/cli/line.rb

@@ -239,14 +239,20 @@ module Cf # :nodoc: all
           number = worker['num_workers']
           reward = worker['reward']
           worker_type = worker['worker_type']
-
-          ##### Add badge to the station ########
-
           if worker_type == "human"
-            badges = station_file['station']['badges']
+            skill_badges = worker['skill_badges']
             stat_badge = worker['stat_badge']
+            if stat_badge.nil?
+              human_worker = CF::HumanWorker.new({:station => s, :number => number, :reward => reward})
+            else
+              human_worker = CF::HumanWorker.new({:station => s, :number => number, :reward => reward, :stat_badge => stat_badge})
+            end
 
-            human_worker =  CF::HumanWorker.new({:station => s, :number => number, :reward => reward, :badge => badges, :stat_badge => stat_badge})
+            if worker['skill_badges'].present?
+              skill_badges.each do |badge|
+                human_worker.badge = badge
+              end
+            end
 
             say_status "worker", "#{number} Cloud #{pluralize(number, "Worker")} with reward of #{reward} #{pluralize(reward, "cent")}"
             display_error(line_title, "#{human_worker.errors}") if human_worker.errors.present?
@@ -260,7 +266,6 @@ module Cf # :nodoc: all
             display_error(line_title, "Invalid worker type: #{worker_type}")
           end
 
-
           # Creation of Form
           # Creation of TaskForm
           if station_file['station']['task_form'].present?
@@ -293,15 +298,6 @@ module Cf # :nodoc: all
             display_error(line_title, "#{form.errors}") if form.errors.present?
           end
 
-          # print if the badge for the station exist NOTE: addition of the badge is done above.
-          # it is printed here for better UI
-          if badges
-            say "Adding Badges For Station#{index}", :green
-            badges.each do |name|
-              say_status "-", "#{name}"
-            end
-          end
-
           #check the presence of gold standard and create goldstandards for the station
           gold_standards = station_file['station']['gold_standards']
           if gold_standards
@@ -327,6 +323,29 @@ module Cf # :nodoc: all
               end
             end
           end
+
+          #######create badge #########
+          badges = station_file['station']['badges']
+          if badges
+            say "Adding Badges to station", :green
+            badges.each do |s_badge|
+              if s_badge.length == 1 && s_badge.keys.include?("name")
+              else
+                form = s_badge["test_attributes"]["form_attributes"]
+                unless form.blank?
+                  if form["type"] == "CustomTaskForm"
+                    file = File.read("#{line_source}/#{form["file"]}") || File.read("#{line_source}/badges/station#{station_file['station']['station_index']}.html")
+                    s_badge["test_attributes"]["form_attributes"].merge!({:raw_html => file, :_type =>"CustomTaskForm" })
+                  else
+                    s_badge["test_attributes"]["form_attributes"].merge!({:_type =>"TaskForm" })
+                  end
+                end
+              end
+              badge = CF::Badge.new(s_badge.merge({:line => line,:station => s }))
+              say_status "Badge","'#{s_badge["name"] }'"
+              display_error(line_title, "#{badge.errors}") if badge.errors.present?
+            end
+          end
         end
       end
 
@@ -351,17 +370,17 @@ module Cf # :nodoc: all
           end
         end
         if gold_standards.class == Hash#gold_standards["file"]
-          gold_standard = CF::GoldStandard.new(gold_standards.merge!({:line => line}))
-          say_status "GoldStandard from file", "'#{gold_standards[:file]}'"
-          display_error(line_title, "#{gold_standard.errors}") if gold_standard.errors.present?
+           gold_standard = CF::GoldStandard.new(gold_standards.merge!({:line => line}))
+           say_status "GoldStandard from file", "'#{gold_standards[:file]}'"
+           display_error(line_title, "#{gold_standard.errors}") if gold_standard.errors.present?
         else
-          gold_standards.each do |gold_options|
-            gold_standard = CF::GoldStandard.new(gold_options.merge(:line => line))
-            say_status "GoldStandard", "'#{gold_options["name"]}'"
-            display_error(line_title, "#{gold_standard.errors}") if gold_standard.errors.present?
-          end
+        gold_standards.each do |gold_options|
+          gold_standard = CF::GoldStandard.new(gold_options.merge(:line => line))
+          say_status "GoldStandard", "'#{gold_options["name"]}'"
+          display_error(line_title, "#{gold_standard.errors}") if gold_standard.errors.present?
         end
       end
+      end
 
       say " ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁", :white
       say "Line was successfully created.", :green

data/lib/cf/cli/templates/sample-line/line.yml.erb

@@ -30,8 +30,6 @@ stations:
         worker_type: human    # "human" or name of robot (google_translate_robot, etc)
         num_workers: 2
         reward: 2
-      badge:
-         - bizcard-digitizer
       custom_task_form:
         form_title: Clink a link and paste in url
         instruction: Look through search results and find the best date

data/lib/cf/help.txt

@@ -65,16 +65,3 @@ Output:
     Get the output of run. For more info, cf output help
   More:
     cf output help [sub-command]                                                     #list all help related to output subcommands
-
-
-Badge:
-  Usage:
-    cf badge create                                                                  # Create badges that are in badge.yml
-    cf badge delete <badge name>                                                     # Delete the given badge within your account
-    cf badge generate                                                                # Generate a new badge template at badges/badge.yml
-    cf badge list                                                                    # List all badges asscociated with your account. Use 'cf badge list <badge_name>' for single badge
-    cf badge update <badge_name>                                                     # Update the given badge within with your account. Use 'cf badge update' to update all badges in badge.yml
-  Description:
-    Commands to manage the badges.
-  More:
-    cf help [COMMAND]                                                                # Describe subcommands or one specific subcommand

data/lib/cf/human_worker.rb

@@ -45,7 +45,7 @@ module CF
     attr_accessor :errors
 
     # Badge setting for "worker" object
-    attr_accessor :badges
+    attr_accessor :badge
 
     # ==Initializes a new "worker" object
     # ==Usage of HumanWorker.new(hash):
@@ -72,26 +72,34 @@ module CF
       @station = options[:station]
       @number  = options[:number].nil? ? 1 : options[:number]
       @reward  = options[:reward]
-      @stat_badge = options[:stat_badge]
-      @badges = options[:badge]
+      @stat_badge = options[:stat_badge].nil? ? nil : options[:stat_badge]
       if @station
-        request =
-        {
-          :body =>
+        if options[:stat_badge].nil?
+          request =
           {
-            :api_key => CF.api_key,
-            :worker => {:number => @number, :reward => @reward, :type => "HumanWorker"},
-            :badge => options[:badge],
-            :stat_badge => options[:stat_badge]
+            :body =>
+            {
+              :api_key => CF.api_key,
+              :worker => {:number => @number, :reward => @reward, :type => "HumanWorker"}
+            }
           }
-        }
+        else
+          request =
+          {
+            :body =>
+            {
+              :api_key => CF.api_key,
+              :worker => {:number => @number, :reward => @reward, :type => "HumanWorker"},
+              :stat_badge => options[:stat_badge]
+            }
+          }
+        end
         resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{@station.line['title'].downcase}/stations/#{@station.index}/workers.json",request)
 
         self.id =  resp.parsed_response['id']
         self.number =  resp.parsed_response['number']
         self.reward =  resp.parsed_response['reward']
         self.stat_badge =  resp.parsed_response['stat_badge']
-        self.badges = resp.parsed_response['badges']
 
         if resp.code != 200
           self.errors = resp.parsed_response['error']['message']
@@ -101,8 +109,52 @@ module CF
       end
     end
 
+    # ==Creation a new "worker" object with Badge
+    # ==Usage Example:
+    # ==In Plain Ruby way
+    #   badge_settings =
+    #   {
+    #       :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.new("human_worker", "Digitization")
+    #   input_format = CF::InputFormat.new({:name => "image_url", :required => true, :valid_type => "url"})
+    #   line.input_formats input_format
+    #
+    #   station = CF::Station.new({:type => "work"})
+    #   line.stations station
+    #
+    #   worker = CF::HumanWorker.new({:number => 2, :reward => 20, :skill_badge => skill_badge})
+    #   line.stations.first.worker = worker
+    #
+    #   line.stations.first.worker.badge = badge_settings
+    def badge=(badge)
+      request =
+      {
+        :body =>
+        {
+          :api_key => CF.api_key,
+          :skill_badge => badge
+        }
+      }
+      resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{@station.line['title'].downcase}/stations/#{@station.index}/workers/#{self.id}/badge.json",request)
+      self.errors = resp['error']['message'] if resp.code != 200
+      self.skill_badges << resp.parsed_response['skill_badges']
+    end
+
     def to_s # :nodoc:
-      "{:id => => #{self.id}, :number => #{self.number}, :reward => #{self.reward}, :stat_badge => #{self.stat_badge}, :errors => #{self.errors},:badges =>#{self.badges}}"
+      "{:id => => #{self.id}, :number => #{self.number}, :reward => #{self.reward}, :stat_badge => #{self.stat_badge}, :errors => #{self.errors}}"
     end
   end
 end