cloudfactory 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.4.1 (2011-10-20)
+
+* removed directory for custom forms from CLI
+* find methods in Line and Run classes now returns nil if not found
+* custom task form modified
+* removed the requirement for css and js files while doing production run
+
 ## 0.4.0 (2011-10-1)
 
 * removed the hashie from the client response that was causing problem while debugging and the response was pretty messed up
@@ -9,8 +16,6 @@
 
 ## 0.3.0 (2011-09-21)
 
-* removed the clouds due to utf-8 chars issue on some system while installing the gem
-
 * removed the clouds due to utf-8 chars issue on some system while installing the gem
 * cf production list now has --live flag to list the live production runs
 

data/lib/cf/cli/line.rb

@@ -14,10 +14,8 @@ module Cf # :nodoc: all
       arr.pop
       line_destination = arr.join("/")
       template("sample-line/line.yml.erb", yaml_destination)
-      copy_file("sample-line/form.css",    "#{line_destination}/station_2/form.css")
-      copy_file("sample-line/form.html",   "#{line_destination}/station_2/form.html")
-      copy_file("sample-line/form.js",     "#{line_destination}/station_2/form.js")
-      copy_file("sample-line/sample-line.csv",        "#{line_destination}/input/#{title.underscore.dasherize}.csv")
+      copy_file("sample-line/form.html", "#{line_destination}/station2.html")
+      copy_file("sample-line/sample-line.csv", "#{line_destination}/input/#{title.underscore.dasherize}.csv")
       FileUtils.mkdir("#{line_destination}/output")
     end
   end
@@ -31,7 +29,6 @@ module Cf # :nodoc: all
     
     desc "line generate LINE-TITLE", "generates a line template at <line-title>/line.yml"
     method_option :force, :type => :boolean, :default => false, :aliases => "-f", :desc => "force to overwrite the files if the line already exists, default is false"
-    # method_option :with_custom_form, :type => :boolean, :default => false, :aliases => "-wcf", :desc => "generate the template with custom task form and the sample files, default is true"
 
     def generate(title=nil)
       if title.present?
@@ -72,8 +69,12 @@ module Cf # :nodoc: all
       end
 
       resp_line = CF::Line.find(line_title)
-      line = Hashie::Mash.new(resp_line)
-      if line.title == line_title
+      if resp_line.nil?
+        say("Line does not exist entitled #{line_title} !!!", :red) and exit(1)
+      else
+        line = Hashie::Mash.new(resp_line) 
+      end
+      if line.title == line_title && !resp_line.nil?
         if options.force
           CF::Line.destroy(line_title, :forced => true)
           say("The line #{line_title} deleted forcefully!", :yellow)
@@ -289,12 +290,8 @@ module Cf # :nodoc: all
               instruction = station_file['station']['custom_task_form']['instruction']
 
               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}") 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}") 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})
+              html = File.read("#{line_source}/station#{station_file['station']['station_index']}.html")
+              form = CF::CustomTaskForm.create({:station => s, :title => title, :instruction => instruction, :raw_html => html})
               say_status "form", "CustomTaskForm '#{form.title}'"
               display_error(line_title, "#{form.errors}") if form.errors.present?
             end

data/lib/cf/cli/line_yaml_validator.rb

@@ -140,12 +140,12 @@ 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
+                        errors << "station#{i+1} is missing in folder #{Dir.pwd}/station_#{i+1} !" if !File.exist?("station#{i+1}.html")
+                                              # 
+                                              # if File.exist?("#{Dir.pwd}")
+                                              #   station_source = "#{Dir.pwd}/station_#{i+1}"
+                                              #   errors << "station#{i+1} is missing in folder #{Dir.pwd}/station_#{i+1} !" if !File.exist?("station#{i+1}.html")
+                                              # end
                       end
                     elsif task_form.class == Hash
                       form_title = task_form['form_title']

data/lib/cf/cli/production.rb

@@ -24,18 +24,21 @@ module Cf # :nodoc: all
 
       if options[:line].present?
         line = CF::Line.find(options[:line])
-        line = Hashie::Mash.new(line)
-        if line.error.blank?
-          line_title = options[:line]
+        if line.nil?
+          say("Line named #{options[:line]} does not exist !!!", :red) and exit(1)
         else
-          say("#{line.error.message}", :red) and return
+          line = Hashie::Mash.new(line)
+          line_title = options[:line]
         end
       elsif File.exist?("#{yaml_source}")
         line_yaml_dump = YAML::load(File.read(yaml_source).strip)
         line_title = line_yaml_dump['title'].parameterize        
         line = CF::Line.find(line_title)
-        line = Hashie::Mash.new(line)
-        say("#{line.error.message}", :red) and return if line.error.present? 
+        if line.nil?
+          say("Line named #{options[:line]} does not exist !!!", :red) and exit(1)
+        else
+          line = Hashie::Mash.new(line)
+        end
       else
         say("Looks like you're not in the Line directory or did not provide the line title to use the line", :red) and return
       end

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

@@ -81,8 +81,6 @@ stations:
         form_title: Clink a link and paste in url
         instruction: Look through search results and find the best date
         html: form.html
-        css: form.css
-        js: form.js
 
   # Sample Station #3: ROBOT to email the person seeking a date with their recommended match!
   - station:

data/lib/cf/custom_task_form.rb

@@ -11,12 +11,6 @@ module CF
     # raw_html is an attribute to store the custom html contents
     attr_accessor :raw_html
     
-    # raw_css is an attribute to store the custom css contents 
-    attr_accessor :raw_css
-    
-    # raw_javascript is an attribute to store the custom javascript contents
-    attr_accessor :raw_javascript
-    
     # station attribute is required for association with custom_from object
     attr_accessor :station
     
@@ -27,19 +21,15 @@ module CF
     # ===Usage custom_instruction.new(hash):
     #
     #     html = 'html_content'
-    #     css = 'css_content'
-    #     javascript = 'javascript_content'
     #
-    #     instruction = CF::CustomTaskForm.new({:title => "Enter text from a business card image", :instruction => "Describe", :raw_html => html, :raw_css => css, :raw_javascript => javascript})
+    #     instruction = CF::CustomTaskForm.new({:title => "Enter text from a business card image", :instruction => "Describe", :raw_html => html})
     def initialize(options={})
       @station     = options[:station]
       @title       = options[:title]
       @instruction = options[:instruction]
       @raw_html = options[:raw_html]
-      @raw_css = options[:raw_css]
-      @raw_javascript = options[:raw_javascript]
       if @station
-        resp = self.class.post("/lines/#{CF.account_name}/#{@station.line_title.downcase}/stations/#{@station.index}/form.json", :form => {:title => @title, :instruction => @instruction, :_type => "CustomTaskForm", :raw_html => @raw_html, :raw_css => @raw_css, :raw_javascript => @raw_javascript})
+        resp = self.class.post("/lines/#{CF.account_name}/#{@station.line_title.downcase}/stations/#{@station.index}/form.json", :form => {:title => @title, :instruction => @instruction, :_type => "CustomTaskForm", :raw_html => @raw_html})
         resp.to_hash.each_pair do |k,v|
           self.send("#{k}=",v) if self.respond_to?(k)
         end
@@ -53,16 +43,14 @@ module CF
     # ===Usage custom_instruction.create(hash):
     #
     #     html = 'html_content'
-    #     css = 'css_content'
-    #     javascript = 'javascript_content'
     #
-    #     instruction = CF::CustomTaskForm.create({:title => "Enter text from a business card image", :instruction => "Describe", :raw_html => html, :raw_css => css, :raw_javascript => javascript})
+    #     instruction = CF::CustomTaskForm.create({:title => "Enter text from a business card image", :instruction => "Describe", :raw_html => html})
     def self.create(form)
       instruction = CustomTaskForm.new(form)
     end
     
     def to_s # :nodoc:
-      "{:title => #{self.title}, :instruction => #{self.instruction}, :raw_html => #{self.raw_html}, :raw_css => #{self.raw_css}, :raw_javascript => #{self.raw_javascript}, :errors => #{self.errors}}"
+      "{:title => #{self.title}, :instruction => #{self.instruction}, :raw_html => #{self.raw_html}, :errors => #{self.errors}}"
     end
   end
 end

data/lib/cf/line.rb

@@ -258,8 +258,12 @@ module CF
           resp = get("/lines/#{CF.account_name}/#{line.downcase}.json")
         end
       end
-      @errors = resp['error']['message'] if resp['code'] != 200
-      return resp
+      if resp['code'] != 200
+        @errors = resp['error']['message'] 
+        return nil
+      else
+        return resp
+      end
     end
     
     # ==Returns all the lines of an account

data/lib/cf/run.rb

@@ -163,8 +163,10 @@ module CF
         resp['error'] = resp['error']['message']
         resp.merge!('errors' => "#{resp['error']}")
         resp.delete('error')
+        return nil
+      else
+        return resp
       end
-      return resp
     end
     
     # ==Returns progress of the production run

data/lib/cf/station.rb

@@ -262,9 +262,7 @@ module CF
         form = @form.class.new({})
         if type == "CustomTaskForm"
           @html = @form.raw_html
-          @css = @form.raw_css
-          @javascript = @form.raw_javascript
-          @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, :raw_css => @css, :raw_javascript => @javascript})
+          @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}) 
         end

data/lib/cf/version.rb

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

data/spec/custom_task_form_spec.rb

@@ -4,8 +4,8 @@ describe CF::CustomTaskForm do
   context "create a Custom Task Form" do
     it "in block DSL way" do
       WebMock.allow_net_connect!
-      html =   '<div id="form-content">
-                  <div id="instructions">
+      html =   '<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html>\n<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><div id="form-content">
+                  <body><form><div id="instructions">
                     <ul>
                       <li>Look at the business card properly and fill in asked data.</li>
                       <li>Make sure you enter everything found on business card.</li>
@@ -18,60 +18,18 @@ describe CF::CustomTaskForm do
                     </div>
                     <div id = "field-panel">
                       Name<br />
-                      <input class="input-field first_name" type="text" name="final_output[first_name]" />
-                      <input class="input-field middle_name" type="text" name="final_output[middle_name]" />
-                      <input class="input-field last_name" type="text" name="final_output[last_name]" /><br />
+                      <input class="input-field first_name" type="text" name="output[first_name]" />
+                      <input class="input-field middle_name" type="text" name="output[middle_name]" />
+                      <input class="input-field last_name" type="text" name="output[last_name]" /><br />
 
                       <br />Contact<br />
-                      <input class="input-field email" type="text" name="final_output[email]" placeholder="Email"/>
-                      <input class="input-field phone" type="text" name="final_output[phone]" placeholder="Phone"/>
-                      <input class="input-field mobile" type="text" name="final_output[mobile]" placeholder="Mobile"/><br />
+                      <input class="input-field email" type="text" name="output[email]" placeholder="Email"/>
+                      <input class="input-field phone" type="text" name="output[phone]" placeholder="Phone"/>
+                      <input class="input-field mobile" type="text" name="output[mobile]" placeholder="Mobile"/><br />
 
                     </div>
                   </div>
-                </div>'
-                
-      css = '<style>body {background:#fbfbfb;}
-                #instructions{
-                  text-align:center;
-                }
-
-                #image-field-wrapper{
-                  float-left;
-                  min-width:1050px;
-                  overflow:hidden;
-                }
-
-                #field-panel{
-                  float:left;
-                  padding: 10px 10px 0 10px;
-                  min-width:512px;
-                  overflow:hidden;
-                }
-
-                .input-field{
-                  width:150px;
-                  margin:4px;
-                }</style>'
-                
-      javascript = '<script src="http://code.jquery.com/jquery-latest.js"></script>
-                      <script type="text/javascript" src="http://www.bizcardarmy.com/javascripts/jquery.autocomplete-min.js"></script>
-                      <script type="text/javascript">
-                        $(document).ready(function(){
-                          autocomplete_fields = ["first_name", "middle_name", "last_name", "company", "job_title", "city", "state", "zip"];
-
-                          $.each(autocomplete_fields, function(index, value){
-                            var inputField = "input." + value;
-                            $(inputField).autocomplete({
-                              serviceUrl: "http://www.bizcardarmy.com/cards/return_data_for_autocompletion.json",
-                              maxHeight: 400,
-                              width: 300,
-                              zIndex: 9999,
-                              params: { field: value }
-                            });
-                          });
-                        });
-                      </script>'
+                </div></form></body></html>'
 
       title = "line_title#{Time.new.strftime('%Y%b%d-%H%M%S')}".downcase
       sleep 1
@@ -80,21 +38,23 @@ describe CF::CustomTaskForm do
         CF::InputFormat.new({:line => self, :name => "Contact", :required => true, :valid_type => "url"})
         CF::Station.create({:line => self, :type => "work"}) do |s|
           CF::HumanWorker.new({:station => s, :number => 1, :reward => 20})
-          CF::CustomTaskForm.create({:station => s, :title => "Enter text from a business card image", :instruction => "Describe", :raw_html => html, :raw_css => css, :raw_javascript => javascript})
+          CF::CustomTaskForm.create({:station => s, :title => "Enter text from a business card image", :instruction => "Describe", :raw_html => html})
         end
       end
       line.title.should eql(title)
       line.department_name.should eql("Digitization")
       line.stations.first.type.should eql("WorkStation")
-      CGI.unescape_html(line.stations.first.form.raw_html).should eql(html)
-      CGI.unescape_html(line.stations.first.form.raw_css).should eql(css)
-      CGI.unescape_html(line.stations.first.form.raw_javascript).should eql(javascript)
+      CGI.unescape_html(line.stations.first.form.raw_html).should eql("<!DOCTYPE html>\n<html>\n<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head>\n<body>\n<p>\"-//W3C//DTD HTML 4.0 Transitional//EN\\\" \\\"http://www.w3.org/TR/REC-html40/loose.dtd\\\"&gt;\\n\\n</p>\n<meta http-equiv='\\\"Content-Type\\\"' content='\\\"text/html;' charset='UTF-8\\\"'>\n<div id=\"form-content\">\n                  <form>\n<div id=\"instructions\">\n                    <ul>\n<li>Look at the business card properly and fill in asked data.</li>\n                      <li>Make sure you enter everything found on business card.</li>\n                      <li>Work may be rejected if it is incomplete or mistakes are found.</li>\n                    </ul>\n</div>\n                  <div id=\"image-field-wrapper\">\n                    <div id=\"image-panel\">\n                      <img class=\"card-image\" src=\"%7B%7Bimage_url%7D%7D\">\n</div>\n                    <div id=\"field-panel\">\n                      Name<br><input class=\"input-field first_name\" type=\"text\" name=\"output[first_name]\"><input class=\"input-field middle_name\" type=\"text\" name=\"output[middle_name]\"><input class=\"input-field last_name\" type=\"text\" name=\"output[last_name]\"><br><br>Contact<br><input class=\"input-field email\" type=\"text\" name=\"output[email]\" placeholder=\"Email\"><input class=\"input-field phone\" type=\"text\" name=\"output[phone]\" placeholder=\"Phone\"><input class=\"input-field mobile\" type=\"text\" name=\"output[mobile]\" placeholder=\"Mobile\"><br>\n</div>\n                  </div>\n                </form>\n</div>\n</body>\n</html>\n")
     end
     
     it "in plain ruby way" do
       WebMock.allow_net_connect!
-      html =   '<form><div id="form-content">
-                  <div id="instructions">
+      html = '<!DOCTYPE html>
+<html>
+<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head>
+<body>
+<div id="form-content">
+      <form><div id="instructions">
                     <ul>
                       <li>Look at the business card properly and fill in asked data.</li>
                       <li>Make sure you enter everything found on business card.</li>
@@ -118,49 +78,8 @@ describe CF::CustomTaskForm do
 
                     </div>
                   </div>
-                </div></form>'
+                </div></form></body></html>'
                 
-      css = '<style>body {background:#fbfbfb;}
-                #instructions{
-                  text-align:center;
-                }
-
-                #image-field-wrapper{
-                  float-left;
-                  min-width:1050px;
-                  overflow:hidden;
-                }
-
-                #field-panel{
-                  float:left;
-                  padding: 10px 10px 0 10px;
-                  min-width:512px;
-                  overflow:hidden;
-                }
-
-                .input-field{
-                  width:150px;
-                  margin:4px;
-                }</style>'
-                
-        javascript = '<script src="http://code.jquery.com/jquery-latest.js"></script>
-                      <script type="text/javascript" src="http://www.bizcardarmy.com/javascripts/jquery.autocomplete-min.js"></script>
-                      <script type="text/javascript">
-                        $(document).ready(function(){
-                          autocomplete_fields = ["first_name", "middle_name", "last_name", "company", "job_title", "city", "state", "zip"];
-
-                          $.each(autocomplete_fields, function(index, value){
-                            var inputField = "input." + value;
-                            $(inputField).autocomplete({
-                              serviceUrl: "http://www.bizcardarmy.com/cards/return_data_for_autocompletion.json",
-                              maxHeight: 400,
-                              width: 300,
-                              zIndex: 9999,
-                              params: { field: value }
-                            });
-                          });
-                        });
-                      </script>'
       title = "line_title#{Time.new.strftime('%Y%b%d-%H%M%S')}".downcase
       sleep 1
       line = CF::Line.new(title, "Digitization")
@@ -176,14 +95,12 @@ describe CF::CustomTaskForm do
       worker = CF::HumanWorker.new({:number => 1, :reward => 20})
       line.stations.first.worker = worker
 
-      form = CF::CustomTaskForm.new({:title => "Enter text from a business card image", :instruction => "Describe", :raw_html => html, :raw_css => css, :raw_javascript => javascript})
+      form = CF::CustomTaskForm.new({:title => "Enter text from a business card image", :instruction => "Describe", :raw_html => html})
       line.stations.first.form = form
       line.title.should eql(title)
       line.department_name.should eql("Digitization")
       line.stations.first.type.should eql("WorkStation")
-      CGI.unescape_html(line.stations.first.form.raw_html).should eql(html)
-      CGI.unescape_html(line.stations.first.form.raw_css).should eql(css)
-      CGI.unescape_html(line.stations.first.form.raw_javascript).should eql(javascript)
+      CGI.unescape_html(line.stations.first.form.raw_html).should eql("<!DOCTYPE html>\n<html>\n<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n<meta http-equiv='\\\"Content-Type\\\"' content='\\\"text/html;' charset='UTF-8\\\"'>\n</head>\n<body>\n<div id=\"form-content\">\n      <form>\n<div id=\"instructions\">\n                    <ul>\n<li>Look at the business card properly and fill in asked data.</li>\n                      <li>Make sure you enter everything found on business card.</li>\n                      <li>Work may be rejected if it is incomplete or mistakes are found.</li>\n                    </ul>\n</div>\n                  <div id=\"image-field-wrapper\">\n                    <div id=\"image-panel\">\n                      <img class=\"card-image\" src=\"%7B%7Bimage_url%7D%7D\">\n</div>\n                    <div id=\"field-panel\">\n                      Name<br><input class=\"input-field first_name\" type=\"text\" name=\"output[first_name]\"><input class=\"input-field middle_name\" type=\"text\" name=\"output[middle_name]\"><input class=\"input-field last_name\" type=\"text\" name=\"output[last_name]\"><br><br>Contact<br><input class=\"input-field email\" type=\"text\" name=\"output[email]\" placeholder=\"Email\"><input class=\"input-field phone\" type=\"text\" name=\"output[phone]\" placeholder=\"Phone\"><input class=\"input-field mobile\" type=\"text\" name=\"output[mobile]\" placeholder=\"Mobile\"><br>\n</div>\n                  </div>\n                </form>\n</div>\n</body>\n</html>\n")
     end
   end
   

data/spec/image_processing_robot_spec.rb

@@ -14,8 +14,8 @@ module CF
             CF::RobotWorker.create({:station => s, :type => "image_processing_robot", :settings => {:image => ["{{url}}"], :sharpen => {:radius => "10"}}})
           end
         end
-        run = CF::Run.create(line, "image_processing_robot_run", [{"url"=> "http://wwwdelivery.superstock.com/WI/223/1527/PreviewComp/SuperStock_1527R-020214.jpg"}])
-        sleep 10
+        run = CF::Run.create(line, "run-#{title}", [{"url"=> "http://wwwdelivery.superstock.com/WI/223/1527/PreviewComp/SuperStock_1527R-020214.jpg"}])
+        sleep 20
         output = run.final_output
         converted_url = output.first['processed_image_of_url']
         File.exist?("/Users/manish/apps/cloudfactory/public#{converted_url}").should eql(true)
@@ -40,8 +40,8 @@ module CF
         worker = CF::RobotWorker.create({:type => "image_processing_robot", :settings => {:image => ["{{url}}"], :sharpen => {:radius => "10"}}})
         line.stations.first.worker = worker
 
-        run = CF::Run.create(line, "image_processing_robot_run_1", [{"url"=> "http://wwwdelivery.superstock.com/WI/223/1527/PreviewComp/SuperStock_1527R-020214.jpg"}])
-        sleep 10
+        run = CF::Run.create(line, "run-#{title}", [{"url"=> "http://wwwdelivery.superstock.com/WI/223/1527/PreviewComp/SuperStock_1527R-020214.jpg"}])
+        sleep 20
         output = run.final_output
         converted_url = output.first['processed_image_of_url']
         File.exist?("/Users/manish/apps/cloudfactory/public#{converted_url}").should eql(true)

data/spec/line_spec.rb

@@ -344,8 +344,7 @@ describe CF::Line do
       forced_delete = CF::Line.destroy(title, :forced => true)
 
       search_line = CF::Line.find(title)
-      search_line['code'].should eql(404)
-      search_line['error']['message'].should eql("Line not found for title: #{title} under your account")
+      search_line.should eql(nil)
     end
   end
 
@@ -490,8 +489,7 @@ describe CF::Line do
         config.api_key = API_CONFIG['api_key']
       end
       got_line = CF::Line.find("hero/#{title}")
-      got_line['code'].should eql(404)
-      got_line['error']['message'].should eql("Line with title: #{title} under account hero is not public")
+      got_line.should eql(nil)
     end
   end
 

data/spec/run_spec.rb

@@ -167,7 +167,7 @@ module CF
           end
         end
         run = CF::Run.create(line, "run-#{title}", [{"url"=> "http://www.sprout-technology.com"}])
-        sleep 10
+        sleep 20
         output = run.final_output
         output.first['keyword_relevance_of_url'].should eql([96.7417, 57.3763, 56.8721, 54.6844, 17.7066])
         output.first['keywords_of_url'].should eql(["tech startup thing", "nights", "Nepal", "Canada", "U.S."])
@@ -284,8 +284,7 @@ module CF
         end
         run = CF::Run.create(line, "run-#{title}", [{"url"=> "http://media-robot.s3.amazonaws.com/media_robot/media/upload/8/ten.mov"}])
         found_run = CF::Run.find("unused_title")
-        found_run['code'].should eql(404)
-        found_run['errors'].should eql("Run document not found using selector: {:title=>\"unused_title\"}")
+        found_run.should eql(nil)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2155542960 !ruby/object:Gem::Requirement
+  requirement: &2154693260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155542960
+  version_requirements: *2154693260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2155542040 !ruby/object:Gem::Requirement
+  requirement: &2154691240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155542040
+  version_requirements: *2154691240
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2155541520 !ruby/object:Gem::Requirement
+  requirement: &2154690520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155541520
+  version_requirements: *2154690520
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2155540940 !ruby/object:Gem::Requirement
+  requirement: &2154689840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155540940
+  version_requirements: *2154689840
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2155540260 !ruby/object:Gem::Requirement
+  requirement: &2154688400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155540260
+  version_requirements: *2154688400
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2155526460 !ruby/object:Gem::Requirement
+  requirement: &2154683820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2155526460
+  version_requirements: *2154683820
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2155525840 !ruby/object:Gem::Requirement
+  requirement: &2154682740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155525840
+  version_requirements: *2154682740
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2155525000 !ruby/object:Gem::Requirement
+  requirement: &2154680840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2155525000
+  version_requirements: *2154680840
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2155524260 !ruby/object:Gem::Requirement
+  requirement: &2154677800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2155524260
+  version_requirements: *2154677800
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2155523840 !ruby/object:Gem::Requirement
+  requirement: &2154672600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155523840
+  version_requirements: *2154672600
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2155523360 !ruby/object:Gem::Requirement
+  requirement: &2154670200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155523360
+  version_requirements: *2154670200
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2155522920 !ruby/object:Gem::Requirement
+  requirement: &2154667660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155522920
+  version_requirements: *2154667660
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2155522340 !ruby/object:Gem::Requirement
+  requirement: &2154666820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155522340
+  version_requirements: *2154666820
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2155521780 !ruby/object:Gem::Requirement
+  requirement: &2154662400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2155521780
+  version_requirements: *2154662400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155521220 !ruby/object:Gem::Requirement
+  requirement: &2154640560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2155521220
+  version_requirements: *2154640560
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2155520580 !ruby/object:Gem::Requirement
+  requirement: &2154639100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2155520580
+  version_requirements: *2154639100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2155520060 !ruby/object:Gem::Requirement
+  requirement: &2154637140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155520060
+  version_requirements: *2154637140
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2155519320 !ruby/object:Gem::Requirement
+  requirement: &2154635380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155519320
+  version_requirements: *2154635380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2155518780 !ruby/object:Gem::Requirement
+  requirement: &2154633760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2155518780
+  version_requirements: *2154633760
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2155518340 !ruby/object:Gem::Requirement
+  requirement: &2154632980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155518340
+  version_requirements: *2154632980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155517640 !ruby/object:Gem::Requirement
+  requirement: &2154632160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155517640
+  version_requirements: *2154632160
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2155516900 !ruby/object:Gem::Requirement
+  requirement: &2154631420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155516900
+  version_requirements: *2154631420
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2155515980 !ruby/object:Gem::Requirement
+  requirement: &2154630500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +263,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155515980
+  version_requirements: *2154630500
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - info@cloudfactory.com
@@ -313,9 +313,7 @@ files:
 - lib/cf/cli/templates/form_preview.html.erb
 - lib/cf/cli/templates/html_file.html.erb
 - lib/cf/cli/templates/js_file.js.erb
-- lib/cf/cli/templates/sample-line/form.css
 - lib/cf/cli/templates/sample-line/form.html
-- lib/cf/cli/templates/sample-line/form.js
 - lib/cf/cli/templates/sample-line/line.yml.erb
 - lib/cf/cli/templates/sample-line/sample-line.csv
 - lib/cf/client.rb

data/lib/cf/cli/templates/sample-line/form.css

@@ -1,50 +0,0 @@
-body {
-  margin: 0 auto;
-  padding: 0;
-  color: #000;
-  width: 960px;
-  background: #302D2F;
-  font-family: georgia;
-}
-#wrapper {
-  background: #FFF;
-  position: relative;
-  padding:0 10px;
-}
-#header {
-  border-bottom: solid 1px grey;
-  padding: 10px;
-  height: 50px;
-  text-align: center;
-  font-size: 36px;
-  font-weight: bold;
-  color: #666666;
-}
-
-ul{
-  list-style: decimal;
-}
-input[type=text] {
-  width:660px;
-  margin:4px;
-  font-size: 12px;
-  height:40px;
-}
-input[type=submit]{
-  width: 160px;
-  height: 40px;
-  border: solid 1px black;
-}
-
-#gender, #age, #location {
-	font-weight: bold;
-	color: #A9BED4;
-}
-a{
-  color: #007EB9;
-}
-#footer{
-  border-top: solid 1px grey;
-  padding: 10px;
-  text-align: center;
-}

data/lib/cf/cli/templates/sample-line/form.js

@@ -1,12 +0,0 @@
-$(document).ready(function() {
-    var url = $("#instructions a").attr('href');
-    var splitted_url = url.split("/");
-    var gender = splitted_url[splitted_url.length - 3];
-    var new_gender = gender.toLowerCase() == "male" ? "female" : "male";
-    splitted_url[splitted_url.length - 3] = new_gender;
-    var age = splitted_url[splitted_url.length - 1];
-    age = decodeURI(age).split(" ")[0];
-    splitted_url[splitted_url.length - 1] = age;
-    var new_url = splitted_url.join("/");
-    $("#instructions a").attr('href',new_url);
-});