cloudfactory 0.1.20 → 0.1.21

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.21 (2011-08-25)
+
+* Line listing with pagination with custom flags
+* cf login now stores account_name and email as well
+* Fixed the line listing issue
+
 ## 0.1.20 (2011-08-24)
 
 * Fixed Line listing and deletion issue

data/features/support/env.rb

@@ -19,6 +19,11 @@ Before('@too_slow_process') do
 end
 
 if ENV['TEST_CLI']
+
+  require 'ruby-debug'
+  ::Debugger.start
+  ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
+  
   API_CONFIG = YAML.load_file(File.expand_path("../../../fixtures/api_credentials.yml", __FILE__))
   CF.configure do |config|
     config.api_version = API_CONFIG['api_version']

data/lib/cf.rb

@@ -89,6 +89,6 @@ require "#{directory}/cf/form_field"
 require "#{directory}/cf/custom_task_form"
 require "#{directory}/cf/run"
 require "#{directory}/cf/department"
-require "#{directory}/cf/final_output"
 require "#{directory}/cf/robot_worker"
-require "#{directory}/cf/version"
+require "#{directory}/cf/version"
+require "#{directory}/cf/output_format"

data/lib/cf/account.rb

@@ -32,6 +32,7 @@ module CF
       #   CF::Account.login("sprout@sprout-technology.com", "password")
       def login(email, passwd)
         resp = post('/account_login.json', :user => {:email => email, :password => passwd})
+        self.errors = resp.error.message if resp.code != 200
         resp
       end
     end

data/lib/cf/cli.rb

@@ -42,8 +42,9 @@ module Cf # :nodoc: all
       
       set_target_uri(false)
       resp = CF::Account.login(email, passwd)
+      
       if resp.error.blank? and resp.api_key.present?
-        File.open(config_file, 'w') {|f| f.write("#Don't change this file unless you know what you're doing\n" + { :target_url => CF.api_url, :api_version => CF.api_version, :api_key => resp.api_key }.to_yaml) }
+        File.open(config_file, 'w') {|f| f.write("#Don't change this file unless you know what you're doing\n" + { :target_url => CF.api_url, :api_version => CF.api_version, :api_key => resp.api_key, :account_name => resp.account_name, :email => email.strip }.to_yaml) }
         say("\nNow you're logged in.\nTo get started, run cf help\n", :green)
       else
         say("\n#{resp.error.message}\nTry again with valid one.\n", :red)
@@ -53,7 +54,7 @@ module Cf # :nodoc: all
     no_tasks do
       def ask_password(message)
         ::HighLine.new.ask(message) do |q| 
-          q.echo = false
+          q.echo = '*'
         end
       end
     end

data/lib/cf/cli/line.rb

@@ -267,6 +267,13 @@ module Cf # :nodoc: all
             end
 
           end
+        
+          output_formats = line_dump['output_formats'].presence
+          if output_formats
+            output_format = CF::OutputFormat.new(output_formats.merge(:line => line))
+            say "Adding Output Format #{output_formats}", :green
+            display_error(line_title, "#{output_format.errors}") if output_format.errors.present?
+          end
         end
         say " ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁", :white
         say "Line was successfully created.", :green
@@ -275,6 +282,8 @@ module Cf # :nodoc: all
     end
 
     desc "line list", "List your lines"
+    method_option :page, :type => :numeric, :aliases => '-p', :desc => "page number"
+    method_option :all, :type => :boolean, :default => false, :aliases => '-a', :desc => "list all the lines without pagination"
     def list
       line_source = Dir.pwd
       yaml_source = "#{line_source}/line.yml"
@@ -282,11 +291,28 @@ module Cf # :nodoc: all
       set_target_uri(false)
       set_api_key(yaml_source)
       CF.account_name = CF::Account.info.name
-      lines = CF::Line.all
+      
+      if options.all
+        resp_lines = CF::Line.all(:page => 'all')
+        current_page = 1
+      else
+        if page = options['page'].presence
+          resp_lines = CF::Line.all(:page => page)
+          current_page = page
+        else
+          resp_lines = CF::Line.all
+          current_page = 1
+        end
+      end
+
+      lines = resp_lines['lines'].presence
       say "\n"
       say("You don't have any lines to list", :yellow) and return if lines.blank?
       
-      lines.sort! {|a, b| a[:name] <=> b[:name] }
+      if resp_lines['total_pages']
+        say("Showing page #{current_page} of #{resp_lines['total_pages']} (Total lines: #{resp_lines['total_lines']})")
+      end
+      lines.sort! { |a, b| a['title'] <=> b['title'] }
       lines_table = table do |t|
         t.headings = ["Line Title", 'URL']
         lines.each do |line|

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

@@ -20,13 +20,13 @@ department: Web Research
 input_formats:
 #   - name: email
 #     required: true
-#     valid_type: email         # email, url, number, date, phone
+#     valid_type: email         # email, url, number, date, time, datetime
 #   - name: location
 #     required: true
-#     valid_type: text          # email, url, number, date, phone
+#     valid_type: text          # email, url, number, date, time, datetime
 #   - name: photo
 #     required: true
-#     valid_type: url           # email, url, number, date, phone
+#     valid_type: url           # email, url, number, date, time, datetime
 # # Stations (see http://cloudfactory.com/developers/resources/station.html)
 stations:
 #   # Sample Station #1: WORKER looks at photo of person seeking a date and determines their gender and approximate age

data/lib/cf/human_worker.rb

@@ -153,6 +153,7 @@ module CF
         }
       }
       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
     

data/lib/cf/line.rb

@@ -26,7 +26,7 @@ module CF
     attr_accessor :input_formats
     
     # Contains Error Messages
-    attr_accessor :errors
+    attr_accessor :errors, :output_formats
 
     # ==Initializes a new line
     # ==Usage of line.new("line_name")
@@ -186,6 +186,28 @@ module CF
       @input_formats << input_formats_value
     end
 
+    def output_formats output_format = nil
+      if output_format
+        settings = output_format.settings
+        request = 
+        {
+          :body => 
+          {
+            :api_key => CF.api_key,
+            :output_formats => settings
+          }
+        }
+        resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{self.title.downcase}/output_format.json",request)
+        output_format.errors = resp.parsed_response['error']['message'] if resp.code != 200
+        self.output_formats = output_format
+      else
+        @output_formats
+      end
+    end
+    
+    def output_formats=(output_format)
+      @output_formats = output_format
+    end
     # ==Returns the content of a line by making an Api call
     # ===Usage Example:
     #   CF::Line.info(line)
@@ -197,6 +219,8 @@ module CF
       else
         resp = get("/lines/#{CF.account_name}/#{line.downcase}.json")
       end
+      @errors = resp.error.message if resp.code != 200
+      return resp
     end
 
     # ==Finds a line
@@ -216,6 +240,7 @@ module CF
           resp = get("/lines/#{CF.account_name}/#{line.downcase}.json")
         end
       end
+      @errors = resp.error.message if resp.code != 200
       return resp.to_hash
     end
     
@@ -223,19 +248,23 @@ module CF
     # ===Syntax for all method is
     #   CF::Line.all
     def self.all(options={})
-      page = options[:page].nil? ? nil : options[:page]
+      page = options[:page].presence
       if page
         resp = get("/lines/#{CF.account_name}.json", :page => page)
       else
         resp = get("/lines/#{CF.account_name}.json")
       end
+      @errors = resp.error.message if resp.code != 200
       new_resp = []
-      if resp.count > 0
-        resp.each do |l|
-          new_resp << l.to_hash
+      if resp.lines
+        if resp.lines.count > 0
+          resp.lines.each do |l|
+            new_resp << l.to_hash
+          end
         end
       end
-      return new_resp
+      send_resp = {"lines" => new_resp, "total_pages" => resp.total_pages, "total_lines" => resp.total_lines}
+      return send_resp
     end
     
     # ==Returns all the stations of a line
@@ -293,11 +322,14 @@ module CF
       else
         resp = delete("/lines/#{CF.account_name}/#{title.downcase}.json")
       end
+      @errors = resp.error.message if resp.code != 200
+      return resp
     end
     
     def self.inspect(line_title)
       resp = get("/lines/#{CF.account_name}/#{line_title.downcase}/inspect.json")
-      if !resp.code == 200
+      @errors = resp.error.message if resp.code != 200
+      if resp.code == 200
         send_resp = resp.to_hash
         @line_input_formats = []
         resp.input_formats.each do |l_i|

data/lib/cf/output_format.rb

@@ -0,0 +1,30 @@
+module CF
+  class OutputFormat
+    require 'httparty'
+    include Client
+
+    # type of the station, e.g. station = Station.new({:type => "Work"})
+    attr_accessor :settings, :errors, :line, :output_formats_settings
+    
+    def initialize(options={})
+      if !options.blank?
+        @settings = options
+        @line = options[:line] if options[:line].nil? ? nil : options[:line]
+        if !@line.nil?
+          options.delete(:line)
+          request = 
+          {
+            :body => 
+            {
+              :api_key => CF.api_key,
+              :output_formats => options
+            }
+          }
+          resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{@line.title.downcase}/output_format.json",request)
+          self.errors = resp.parsed_response['error']['message'] if resp.code != 200
+          self.line.output_formats = self
+        end
+      end
+    end
+  end
+end

data/lib/cf/run.rb

@@ -86,11 +86,28 @@ module CF
       Run.new(line, title, file)
     end
 
+    def self.add_units(options={})
+      units = options[:units].presence
+      run_title = options[:run_title].presence
+
+      request = 
+      {
+        :body => 
+        {
+          :api_key => CF.api_key,
+          :data => units
+        }
+      }
+      resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/runs/#{CF.account_name}/#{run_title.downcase}/units.json",request)
+      @errors = resp['error']['message'] if resp.code != 200
+      return resp.parsed_response
+    end
     # ==Returns Final Output of production Run
     # ===Usage Example:
     #   run_object.final_output
     def final_output
       resp = self.class.get("/runs/#{CF.account_name}/#{self.title.downcase}/output.json")
+      self.errors = resp.error.message if resp.code != 200
       output = []
       if resp['output'].class == Array
         resp['output'].each do |o|
@@ -105,6 +122,7 @@ module CF
     #   CF::Run.final_output("run_title")
     def self.final_output(title)
       resp = get("/runs/#{CF.account_name}/#{title.downcase}/output.json")
+      @errors = resp.error.message if resp.code != 200
       output = []
       if resp['output'].class == Array
         resp['output'].each do |o|
@@ -122,6 +140,7 @@ module CF
       station_no = options[:station]
       title = options[:title]
       resp = get("/runs/#{CF.account_name}/#{title.downcase}/output/#{station_no}.json")
+      @errors = resp.error.message if resp.code != 200
       output = []
       if resp['output'].class == Array
         resp['output'].each do |o|
@@ -138,6 +157,7 @@ module CF
     def output(options={})
       station_no = options[:station]
       resp = self.class.get("/runs/#{CF.account_name}/#{self.title.downcase}/output/#{station_no}.json")
+      self.errors = resp.error.message if resp.code != 200
       output = []
       if resp['output'].class == Array
         resp['output'].each do |o|
@@ -153,6 +173,7 @@ module CF
     def self.find(title)
       resp = get("/runs/#{CF.account_name}/#{title.downcase}.json")
       if resp.code != 200
+        @errors = resp.error.message
         resp.error = resp.error.message
         resp.merge!(:errors => "#{resp.error}")
         resp.delete(:error)
@@ -192,22 +213,28 @@ module CF
         if page.nil?
           resp = get("/lines/#{CF.account_name}/#{line_title}/list_runs.json")
         else
-          resp = get("/lines/#{CF.account_name}/#{line_title}/list_runs.json")
+          resp = get("/lines/#{CF.account_name}/#{line_title}/list_runs.json", :page => page)
         end
       end
-      
+      @errors = resp.error.message if resp.code != 200
       new_resp = []
-      
-      if resp.count > 0
-        resp.each do |r|
-          new_resp << r.to_hash
+      if resp.code == 200
+        if resp.runs
+          if resp.runs.count > 0
+            resp.runs.each do |r|
+              new_resp << r.to_hash
+            end
+          end
         end
+        send_resp = {"runs" => new_resp, "total_pages" => resp.total_pages}
+        return send_resp
       end
-      return new_resp
     end
     
     def self.resume(run_title)
-      post("/runs/#{CF.account_name}/#{run_title}/resume.json")
+      resp = post("/runs/#{CF.account_name}/#{run_title}/resume.json")
+      @errors = resp.error.message if resp.code != 200
+      return resp
     end
   end
 end

data/lib/cf/station.rb

@@ -265,6 +265,7 @@ module CF
     # returns the station object
     def get
       resp = self.class.get("/lines/#{CF.account_name}/#{self.line_title.downcase}/stations/#{self.index}.json")
+      self.errors = resp.error.message if resp.code != 200
       return resp
     end
 
@@ -272,7 +273,9 @@ module CF
     # ===Usage example:
     #   @got_form = line.stations[0].get_form
     def get_form
-      self.class.get("/lines/#{CF.account_name}/#{self.line_title.downcase}/stations/#{self.index}/form.json")
+      resp = self.class.get("/lines/#{CF.account_name}/#{self.line_title.downcase}/stations/#{self.index}/form.json")
+      self.errors = resp.error.message if resp.code != 200
+      return resp
     end
 
     # ==Returns all the stations associated with a particular line
@@ -292,7 +295,9 @@ module CF
     #
     #   line.stations.first.delete
     def delete
-      self.class.delete("/lines/#{CF.account_name}/#{self.line_title.downcase}/stations/#{self.index}.json")
+      resp = self.class.delete("/lines/#{CF.account_name}/#{self.line_title.downcase}/stations/#{self.index}.json")
+      self.errors = resp.error.message if resp.code != 200
+      return resp
     end
     
     def to_s

data/lib/cf/version.rb

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

data/spec/line_spec.rb

@@ -103,7 +103,7 @@ describe CF::Line do
           CF::Line.new("Digitizeard---#{i}", "Digitization", {:public => false, :description => "#{i}-this is description"})
         end
         lines = CF::Line.all
-        lines.last['title'].should eq("digitizeard---4")
+        lines.class.should eql(Hash)
       end
     end
 
@@ -176,7 +176,7 @@ describe CF::Line do
         resp = CF::Line.destroy("Digitizerd-2")
         resp.code.should eql(200)
         deleted_resp = CF::Line.info(line)
-        deleted_resp.error.message.should eql("Line document not found using selector: {:public=>true, :title=>\"digitizerd-2\"}")
+        deleted_resp.error.message.should eql("Line not found for title: digitizerd-2 under your account")
       end
     end
   end
@@ -427,7 +427,19 @@ describe CF::Line do
       VCR.use_cassette "lines/plain-ruby/line_pagination", :record => :new_episodes do
       # WebMock.allow_net_connect!
         line = CF::Line.all(:page => 1)
-        line.class.should eql(Array)
+        line.class.should eql(Hash)
+      end
+    end
+    
+    it "should get all lines with pagination all" do
+      VCR.use_cassette "lines/plain-ruby/line_pagination_all", :record => :new_episodes do
+      # WebMock.allow_net_connect!
+        25.times do |i|
+          CF::Line.new("lines-listing--#{i}", "Digitization", {:public => true, :description => "#{i}-this is description"})
+        end
+        line = CF::Line.all(:page => "all")
+        line['total_pages'].should eql(1)
+        line['lines'].class.should eql(Array)
       end
     end
   end
@@ -455,4 +467,94 @@ describe CF::Line do
       end
     end
   end
+  
+  context "create line with output format" do
+    it "should create in block Dsl way with two stations" do
+      # WebMock.allow_net_connect!
+      VCR.use_cassette "lines/block/create-output-format", :record => :new_episodes do
+        line = CF::Line.create("line_with_output_format","Digitization") do |l|
+          CF::InputFormat.new({:line => l, :name => "Company", :required => true, :valid_type => "general"})
+          CF::InputFormat.new({:line => l, :name => "Website", :required => true, :valid_type => "url"})
+          CF::Station.create({:line => l, :type => "work"}) do |s|
+            CF::HumanWorker.new({:station => s, :number => 1, :reward => 10})
+            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"})
+              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
+          CF::Station.create({:line => l, :type => "work"}) 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 => "Address", :field_type => "short_answer", :required => "true"})
+              CF::FormField.new({:form => i, :label => "Mobile", :field_type => "short_answer"})
+              CF::FormField.new({:form => i, :label => "Email", :field_type => "email", :required => "true"})
+            end
+          end
+          CF::OutputFormat.new({:line => l, :station_1 => [{:name => "First Name"}],:station_2 => [{:name => "Mobile", :except => true}]})
+        end
+        line.title.should eq("line_with_output_format")
+        line.input_formats.first.name.should eql("Company")
+        line.stations.first.type.should eq("WorkStation")
+        line.stations.first.worker.number.should eq(1)
+        line.stations.first.worker.reward.should eq(10)
+        line.output_formats.settings.should eql({:station_1 => [{:name => "First Name"}],:station_2 => [{:name => "Mobile", :except => true}]})
+      end
+    end
+    
+    it "should create in plain ruby way with two stations" do
+      # WebMock.allow_net_connect!
+      VCR.use_cassette "lines/plain-ruby/create-output-format", :record => :new_episodes do
+        line = CF::Line.create("line_with_output_format_1","Digitization") do |l|
+          CF::InputFormat.new({:line => l, :name => "Company", :required => true, :valid_type => "general"})
+          CF::InputFormat.new({:line => l, :name => "Website", :required => true, :valid_type => "url"})
+          CF::Station.create({:line => l, :type => "work"}) do |s|
+            CF::HumanWorker.new({:station => s, :number => 1, :reward => 10})
+            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"})
+              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
+          CF::Station.create({:line => l, :type => "work"}) 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 => "Address", :field_type => "short_answer", :required => "true"})
+              CF::FormField.new({:form => i, :label => "Mobile", :field_type => "short_answer"})
+              CF::FormField.new({:form => i, :label => "Email", :field_type => "email", :required => "true"})
+            end
+          end
+        end
+        output_format = CF::OutputFormat.new({:station_1 => [{:name => "First Name"}],:station_2 => [{:name => "Mobile", :except => true}]})
+        line.output_formats output_format
+        line.title.should eq("line_with_output_format_1")
+        line.input_formats.first.name.should eql("Company")
+        line.stations.first.type.should eq("WorkStation")
+        line.stations.first.worker.number.should eq(1)
+        line.stations.first.worker.reward.should eq(10)
+        line.output_formats.settings.should eql({:station_1 => [{:name => "First Name"}],:station_2 => [{:name => "Mobile", :except => true}]})
+      end
+    end
+  
+    it "should through error if line is incomplete" do
+      # WebMock.allow_net_connect!
+      VCR.use_cassette "lines/block/create-output-format-error", :record => :new_episodes do
+        line = CF::Line.create("line_with_output_format","Digitization") do |l|
+          CF::InputFormat.new({:line => l, :name => "Company", :required => true, :valid_type => "general"})
+          CF::InputFormat.new({:line => l, :name => "Website", :required => true, :valid_type => "url"})
+          CF::Station.create({:line => l, :type => "work"}) do |s|
+            CF::HumanWorker.new({:station => s, :number => 1, :reward => 10})
+            # CF::TaskForm.new({:station => s, :title => "Enter text from a business card image", :instruction => "Describe"}) 
+          end
+          CF::OutputFormat.new({:line => l, :station_1 => [{:name => "First Name"}],:station_2 => [{:name => "Mobile", :except => true}]})
+        end
+        line.title.should eq("line_with_output_format")
+        line.input_formats.first.name.should eql("Company")
+        line.stations.first.type.should eq("WorkStation")
+        line.stations.first.worker.number.should eq(1)
+        line.stations.first.worker.reward.should eq(10)
+        line.output_formats.errors.should eql("Line is not complete or valid")
+      end
+    end
+  end
 end

data/spec/run_spec.rb

@@ -378,10 +378,8 @@ module CF
           run_2 = CF::Run.create(line_2, "progress_run_32", [{"url"=> "http://www.sprout-technology.com"}])
           
           got_run = CF::Run.all
-          got_run.first['line']['title'].should eql("keyword_matching_robot_result")
-          got_run.first['title'].should eql("keyword_matching_robot_run_result")
-          got_run.last['line']['title'].should eql("digarde-007")
-          got_run.last['title'].should eql("runnamee1")
+          got_run['runs'].class.should eql(Array)
+          got_run['total_pages'].should eql(2)
         end
       end
       
@@ -398,9 +396,9 @@ module CF
           run_1 = CF::Run.create(line, "progress_run_12", [{"url"=> "http://www.sprout-technology.com"}])
           run_2 = CF::Run.create(line, "progress_run_13", [{"url"=> "http://www.sprout-technology.com"}])
           got_run = CF::Run.all({:line_title => "progress_run_line_11"})
-          got_run[0]['title'].should eql("progress_run_11")
-          got_run[1]['title'].should eql("progress_run_12")
-          got_run[2]['title'].should eql("progress_run_13")
+          got_run['runs'][0]['title'].should eql("progress_run_11")
+          got_run['runs'][1]['title'].should eql("progress_run_12")
+          got_run['runs'][2]['title'].should eql("progress_run_13")
         end
       end
       
@@ -408,7 +406,25 @@ module CF
         VCR.use_cassette "run/plain-ruby/get-run-with-page", :record => :new_episodes do
         # WebMock.allow_net_connect!
           run = CF::Run.all({:page => 1})
-          run.class.should eql(Array)
+          run['runs'].class.should eql(Array)
+        end
+      end
+      
+      it "should get all runs with pagination all" do
+        VCR.use_cassette "run/plain-ruby/get-run-with-page-all", :record => :new_episodes do
+        # WebMock.allow_net_connect!
+          line = CF::Line.create("pagination_line","Digitization") do |l|
+            CF::InputFormat.new({:line => l, :name => "url", :valid_type => "url", :required => "true"})
+            CF::Station.create({:line => l, :type => "work"}) do |s|
+              CF::RobotWorker.create({:station => s, :settings => {:url => ["{{url}}"], :max_retrieve => 5, :show_source_text => true}, :type => "term_extraction_robot"})
+            end
+          end
+          25.times do |i|
+            CF::Run.create(line, "pagination_run#{i}", [{"url"=> "http://www.sprout-technology.com"}])
+          end
+          run = CF::Run.all({:page => "all"})
+          run['total_pages'].should eql(1)
+          run['runs'].class.should eql(Array)
         end
       end
     end
@@ -441,5 +457,73 @@ module CF
         end
       end
     end
+    
+    context "creation of run by adding units" do
+      it "should manually add units" do
+        VCR.use_cassette "run/block/adding_units", :record => :new_episodes do
+        # WebMock.allow_net_connect!
+          line = CF::Line.create("adding_units","Digitization") do |l|
+            CF::InputFormat.new({:line => l, :name => "Company", :required => true, :valid_type => "general"})
+            CF::InputFormat.new({:line => l, :name => "Website", :required => true, :valid_type => "url"})
+            CF::Station.create({:line => l, :type => "work"}) 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"})
+                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
+          run = CF::Run.create(line, "adding_units_run", [{"Company"=>"Apple,Inc","Website"=>"Apple.com"}])
+          added_units = CF::Run.add_units(:run_title => "adding_units_run", :units => [{"Company"=>"Apple,Inc","Website"=>"Apple.com"}, {"Company"=>"Sprout","Website"=>"sprout.com"}])
+          added_units['successfull'].should eql("sucessfully added 2 units, failed :0")
+          run.title.should eql("adding_units_run")
+        end
+      end
+      
+      it "should throw errors for invalid input while adding units" do
+        VCR.use_cassette "run/block/adding_units_errors", :record => :new_episodes do
+        # WebMock.allow_net_connect!
+          line = CF::Line.create("adding_units_error","Digitization") do |l|
+            CF::InputFormat.new({:line => l, :name => "Company", :required => true, :valid_type => "general"})
+            CF::InputFormat.new({:line => l, :name => "Website", :required => true, :valid_type => "url"})
+            CF::Station.create({:line => l, :type => "work"}) 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"})
+                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
+          run = CF::Run.create(line, "adding_units_error_run", [{"Company"=>"Apple,Inc","Website"=>"Apple.com"}])
+          added_units = CF::Run.add_units(:run_title => "adding_units_error_run", :units => [{"Company"=>"Sprout","Url"=>"sprout.com"}])
+          added_units['error']['message'].should eql(["Extra Headers in file: [url]", "Insufficient Headers in file: [website]"])
+          run.title.should eql("adding_units_error_run")
+        end
+      end
+      
+      xit "should throw errors for empty input while adding units" do
+        VCR.use_cassette "run/block/adding_units_empty_errors", :record => :new_episodes do
+        # WebMock.allow_net_connect!
+          line = CF::Line.create("adding_units_error_1","Digitization") do |l|
+            CF::InputFormat.new({:line => l, :name => "Company", :required => true, :valid_type => "general"})
+            CF::InputFormat.new({:line => l, :name => "Website", :required => true, :valid_type => "url"})
+            CF::Station.create({:line => l, :type => "work"}) 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"})
+                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
+          run = CF::Run.create(line, "adding_units_error_run_1", [{"Company"=>"Apple,Inc","Website"=>"Apple.com"}])
+          added_units = CF::Run.add_units(:run_title => "adding_units_error_run", :units => [])
+          added_units['error']['message'].should eql(["Extra Headers in file: [url]", "Insufficient Headers in file: [website]"])
+          run.title.should eql("adding_units_error_run_1")
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000Z
+date: 2011-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156814280 !ruby/object:Gem::Requirement
+  requirement: &2154423560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156814280
+  version_requirements: *2154423560
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156813780 !ruby/object:Gem::Requirement
+  requirement: &2154423060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156813780
+  version_requirements: *2154423060
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2156813280 !ruby/object:Gem::Requirement
+  requirement: &2154422560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156813280
+  version_requirements: *2154422560
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156812900 !ruby/object:Gem::Requirement
+  requirement: &2157390480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156812900
+  version_requirements: *2157390480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156812440 !ruby/object:Gem::Requirement
+  requirement: &2157390020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156812440
+  version_requirements: *2157390020
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156811940 !ruby/object:Gem::Requirement
+  requirement: &2157389520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2156811940
+  version_requirements: *2157389520
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2156811520 !ruby/object:Gem::Requirement
+  requirement: &2157389100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156811520
+  version_requirements: *2157389100
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2156810980 !ruby/object:Gem::Requirement
+  requirement: &2157388560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2156810980
+  version_requirements: *2157388560
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2156810480 !ruby/object:Gem::Requirement
+  requirement: &2157388060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2156810480
+  version_requirements: *2157388060
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2156810100 !ruby/object:Gem::Requirement
+  requirement: &2157387680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156810100
+  version_requirements: *2157387680
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2156809640 !ruby/object:Gem::Requirement
+  requirement: &2157387220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156809640
+  version_requirements: *2157387220
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2156809220 !ruby/object:Gem::Requirement
+  requirement: &2157386800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156809220
+  version_requirements: *2157386800
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2156808800 !ruby/object:Gem::Requirement
+  requirement: &2157386380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156808800
+  version_requirements: *2157386380
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156808300 !ruby/object:Gem::Requirement
+  requirement: &2157385880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2156808300
+  version_requirements: *2157385880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156824160 !ruby/object:Gem::Requirement
+  requirement: &2157385380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156824160
+  version_requirements: *2157385380
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2156823700 !ruby/object:Gem::Requirement
+  requirement: &2157384920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2156823700
+  version_requirements: *2157384920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2156823320 !ruby/object:Gem::Requirement
+  requirement: &2157384540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156823320
+  version_requirements: *2157384540
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156822860 !ruby/object:Gem::Requirement
+  requirement: &2157384080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156822860
+  version_requirements: *2157384080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2156822360 !ruby/object:Gem::Requirement
+  requirement: &2157383580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2156822360
+  version_requirements: *2157383580
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2156821940 !ruby/object:Gem::Requirement
+  requirement: &2157383160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156821940
+  version_requirements: *2157383160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156821480 !ruby/object:Gem::Requirement
+  requirement: &2157382700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156821480
+  version_requirements: *2157382700
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2156821060 !ruby/object:Gem::Requirement
+  requirement: &2157398660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156821060
+  version_requirements: *2157398660
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2156820640 !ruby/object:Gem::Requirement
+  requirement: &2157398240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +263,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156820640
+  version_requirements: *2157398240
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - info@cloudfactory.com
@@ -318,11 +318,11 @@ files:
 - lib/cf/client.rb
 - lib/cf/custom_task_form.rb
 - lib/cf/department.rb
-- lib/cf/final_output.rb
 - lib/cf/form_field.rb
 - lib/cf/human_worker.rb
 - lib/cf/input_format.rb
 - lib/cf/line.rb
+- lib/cf/output_format.rb
 - lib/cf/robot_worker.rb
 - lib/cf/run.rb
 - lib/cf/station.rb

data/lib/cf/final_output.rb

@@ -1,6 +0,0 @@
-module CF # :nodoc:
-  class FinalOutput # :nodoc:
-    include Client
-    attr_accessor :final_outputs, :unit_id, :final_output, :output
-  end
-end