cloudfactory 0.4.5 → 0.4.5.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.5 (2012-02-14)
+* Template and Template file added for bulk goldstandards from csv
+* Line deletion with runs bug fixed
+
 ## 0.4.5 (2012-02-01)
 
 * Gold Standard added for line

data/lib/cf/cli/line.rb

@@ -82,12 +82,11 @@ module Cf # :nodoc: all
 
           # Check whether this line has existing runs or not
           resp_runs = CF::Run.all({:line_title => line_title})
-
-          if resp_runs.has_key?("runs") && resp_runs['runs'].present?
+          if resp_runs.has_key?('total_runs') && (resp_runs['runs'] || resp_runs['test_runs'])
             say("!!! Warning !!!\nThe following are the existing production runs based on this line.", :yellow)
             existing_runs = Cf::Production.new([],{'line' => line_title, 'all' => true})
             existing_runs.list
-            
+
             say("\n!!! Warning !!!\nDeleting this line will also delete all the existing production runs based on this line.\n", :yellow)
             delete_forcefully = agree("Do you still want to delete this line? [y/n] ")
             say("\n")
@@ -297,26 +296,33 @@ module Cf # :nodoc: all
           end
 
           #check the presence of gold standard and create goldstandards for the station
-          say "Adding Gold Standards to stations", :green
           gold_standards = station_file['station']['gold_standards']
           if gold_standards
+            say "Adding Gold Standards to stations", :green
+            if gold_standards["template_file"]
+              gold_template_source = gold_standards["template_file"]
+              if File.exist?(gold_template_source)
+                gold_template = YAML::load(File.read(gold_template_source).strip)
+                gold_standards.merge!("template" => gold_template)
+              end
+            end
             if gold_standards.class == Hash#gold_standards["file"]
               gold_standard = CF::GoldStandard.new(gold_standards.merge!({:line => line,:station => s }))
-              say_status "GoldStandard", "parameters '#{gold_standards}'"
+              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,:station => s }))
-                say_status "GoldStandard", "parameters '#{gold_options}'"
+                say_status "GoldStandard", "'#{gold_options["name"]}'"
                 display_error(line_title, "#{gold_standard.errors}") if gold_standard.errors.present?
               end
             end
           end
 
           #######create badge #########
-          say "Adding Badges to station", :green
           badges = station_file['station']['badges']
           if badges
+            say "Adding Badges to station", :green
             badges.each do |s_badge|
               form = s_badge["test_attributes"]["form_attributes"]
               unless form.blank?
@@ -328,7 +334,7 @@ module Cf # :nodoc: all
                 end
               end
               badge = CF::Badge.new(s_badge.merge({:line => line,:station => s }))
-              say_status "Badge","parameters '#{s_badge}'"
+              say_status "Badge","'#{s_badge["name"] }'"
               display_error(line_title, "#{badge.errors}") if badge.errors.present?
             end
           end
@@ -343,17 +349,24 @@ module Cf # :nodoc: all
       end
 
       #check the presence of gold standard and create goldstandards for the line
-      say "Adding GoldStandards to Line", :green
       gold_standards = line_dump['gold_standards'].presence
       if gold_standards
+        say "Adding GoldStandards to Line", :green
+        if gold_standards["template_file"]
+          gold_template_source = gold_standards["template_file"]
+          if File.exist?(gold_template_source)
+            gold_template = YAML::load(File.read(gold_template_source).strip)
+            gold_standards.merge!("template" => gold_template)
+          end
+        end
         if gold_standards.class == Hash#gold_standards["file"]
            gold_standard = CF::GoldStandard.new(gold_standards.merge!({:line => line}))
-           say_status "GoldStandard", "parameters '#{gold_standards}'"
+           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", "parameters '#{gold_options}'"
+          say_status "GoldStandard", "'#{gold_options["name"]}'"
           display_error(line_title, "#{gold_standard.errors}") if gold_standard.errors.present?
         end
       end

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

@@ -9,7 +9,6 @@
 
 title: <%= title.underscore.dasherize %>
 public: false
-public: true
 description: A shiny new assembly line ready for you to customize. Right now it is finding people dates (uncomment and try for fun) but you should just replace everything below accordingly for your line.
 
 # Department to build line in (See http://cloudfactory.com/developers/resources/department.html)

data/lib/cf/gold_standard.rb

@@ -34,14 +34,15 @@ module CF
       if !@line.nil? || @station
         options.delete(:station) if @settings[:station].present?
         options.delete(:line)
+        # for bulk_gold_standard
         if options[:file] || options["file"]
           options.symbolize_keys!
           file_upload = File.new(options[:file], 'rb')
           if @station
-            resp = self.class.post("/lines/#{CF.account_name}/#{@line.title.downcase}/stations/#{@station.index}/gold_standards.json", {:file => file_upload})
+            resp = self.class.post("/lines/#{CF.account_name}/#{@line.title.downcase}/stations/#{@station.index}/gold_standards.json", {:file => file_upload,:template => options[:template]})
             @station.gold_standards = self
           else
-            resp = self.class.post("/lines/#{CF.account_name}/#{@line.title.downcase}/gold_standards.json", {:file => file_upload})
+            resp = self.class.post("/lines/#{CF.account_name}/#{@line.title.downcase}/gold_standards.json", {:file => file_upload,:template => options[:template]})
             @line.gold_standards = self
           end
         else

data/lib/cf/line.rb

@@ -242,7 +242,7 @@ module CF
             puts  gold_standard_options[:file]
             if File.exist?(gold_standard_options[:file].to_s)
               file_upload = File.new(gold_standard_options[:file], 'rb')
-              resp = self.class.post("/lines/#{CF.account_name}/#{line.title.downcase}/gold_standards.json", {:file => file_upload})
+              resp = self.class.post("/lines/#{CF.account_name}/#{line.title.downcase}/gold_standards.json", {:file => file_upload, :template => gold_standard_options[:template]})
               gold_standard = CF::GoldStandard.new()
               resp.each do |gs|
                 gold_standard.settings.merge!(gs.to_hash)

data/lib/cf/station.rb

@@ -338,7 +338,7 @@ module CF
           if gold_standard_options[:file]
             if File.exist?(gold_standard_options[:file].to_s)
               file_upload = File.new(gold_standard_options[:file], 'rb')
-              resp = self.class.post("/lines/#{CF.account_name}/#{line.title.downcase}/gold_standards.json", {:file => file_upload})
+              resp = self.class.post("/lines/#{CF.account_name}/#{line.title.downcase}/gold_standards.json", {:file => file_upload,:template => gold_standard_options[:template]})
               gold_standard = CF::GoldStandard.new()
               resp.each do |gs|
                 gold_standard.settings.merge!(gs.to_hash)

data/lib/cf/version.rb

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

data/spec/badges_spec.rb

@@ -27,7 +27,7 @@ describe CF::Badge do
           @badge = CF::Badge.create({
             :line => line,
             :station => s,
-            :name           => "Tomb Digitizer",
+            :name           => "Tomb Digitizer#{Time.now}",
             :description    => "This badge qualifies you to work on tomb digitization tasks.",
             :max_badges     => 100,
             :gold_standards => ["#{@gold_standard.settings[:name]}"],
@@ -65,7 +65,7 @@ describe CF::Badge do
               })
             end
             badge = CF::Badge.new({
-              :name           => "Tomb Digitizer",
+              :name           => "Tomb Digitizer#{Time.now}",
               :description    => "This badge qualifies you to work on tomb digitization tasks.",
               :max_badges     => 100,
               :gold_standards => ["#{@gold_standard.settings[:name]}"],
@@ -109,7 +109,7 @@ describe CF::Badge do
                   @badge = CF::Badge.new({
                     :line => line,
                     :station => s,
-                    :name           => "Tomb Digitizer",
+                    :name           => "Tomb Digitizer#{Time.now}",
                     :description    => "This badge qualifies you to work on tomb digitization tasks.",
                     :max_badges     => 100,
                     :gold_standards => ["#{@gold_standard.settings[:name]}"],
@@ -163,7 +163,7 @@ describe CF::Badge do
                       @badge = CF::Badge.new({
                         :line => line,
                         :station => s,
-                        :name           => "Tomb Digitizer",
+                        :name           => "Tomb Digitizer#{Time.now}",
                         :description    => "This badge qualifies you to work on tomb digitization tasks.",
                         :max_badges     => 100,
                         :gold_standards => ["#{@gold_standard.settings[:name]}"],
@@ -209,7 +209,7 @@ describe CF::Badge do
                           })
                         end
                         badge = CF::Badge.new({
-                          :name           => "Tomb Digitizer",
+                          :name           => "Tomb Digitizer#{Time.now}",
                           :description    => "This badge qualifies you to work on tomb digitization tasks.",
                           :max_badges     => 100,
                           :gold_standards => ["#{@gold_standard.settings[:name]}"],
@@ -256,7 +256,7 @@ describe CF::Badge do
                               })
                             end
                             badge = CF::Badge.new({
-                              :name           => "Tomb Digitizer",
+                              :name           => "Tomb Digitizer#{Time.now}",
                               :description    => "This badge qualifies you to work on tomb digitization tasks.",
                               :max_badges     => 100,
                               :gold_standards => ["#{@gold_standard.settings[:name]}"],

data/spec/gold_standard_spec.rb

@@ -85,6 +85,49 @@ describe CF::GoldStandard do
         line.gold_standards.first.settings["input"].should eql({"Website"=>"aaple.com"})
         line.gold_standards.first.settings["expected_output"].present?.should eql(true)
       end
+
+      it "should add gold standard to a line from a csv with predefined code template in Block DSL way" do
+        WebMock.allow_net_connect!
+        title = "line_title#{Time.new.strftime('%Y%b%d-%H%M%S')}".downcase
+        sleep 1
+        line = CF::Line.create(title,"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
+        end
+        gold_standard = CF::GoldStandard.new({:line => line,:file =>"./spec/gold_standards.csv",
+        :template=>[{"first_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, {"last_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}]})
+        gold_standard.settings[:template].should eql([{"first_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, {"last_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}])
+        line.gold_standards.should include(gold_standard)
+      end
+
+      it "should add gold standard to a line from a csv with predefined code template in plain ruby way" do
+        WebMock.allow_net_connect!
+        title = "line_title#{Time.new.strftime('%Y%b%d-%H%M%S')}".downcase
+        sleep 1
+        line = CF::Line.create(title,"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"})
+        end
+        station = CF::Station.new({:type => "work"})
+        line.stations station
+        gold_standard = CF::GoldStandard.new({:file =>"./spec/gold_standards.csv",
+        :template=>[{"first_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, {"last_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}]})
+        line.gold_standards gold_standard
+        line.gold_standards.first.settings["expected_output"].should eql({"first_name"=>{"value"=>"<% John.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, "last_name"=>{"value"=>"<% Lennon.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, "company"=>{"value"=>"Sprout"}})
+        line.gold_standards.first.settings["name"].should eql("gold_standard_1")
+        line.gold_standards.first.settings["input"].should eql({"Website"=>"aaple.com"})
+        line.gold_standards.first.settings["expected_output"].present?.should eql(true)
+      end
+
+
     end
 
     context "should add goldstandard to a station" do
@@ -175,5 +218,49 @@ describe CF::GoldStandard do
               line.stations.first.gold_standards.first.settings["input"].should eql({"Website"=>"aaple.com"})
               line.stations.first.gold_standards.first.settings["expected_output"].present?.should eql(true)
             end
+
+            it "should add gold standard to the station from  csv with predefined code template  in block DSL way" do
+              WebMock.allow_net_connect!
+              title = "line_title#{Time.new.strftime('%Y%b%d-%H%M%S')}".downcase
+              sleep 1
+              line = CF::Line.create(title,"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"})
+              end
+              station = CF::Station.create({:line => line, :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
+                @gold_standard = CF::GoldStandard.create({ :line => line,
+                  :station => s,
+                  :file =>"./spec/gold_standards.csv",
+                  :template=>[{"first_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, {"last_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}]
+                  })
+                end
+                 @gold_standard.settings[:template].should eql([{"first_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, {"last_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}])
+                line.stations.first.gold_standards.should include(@gold_standard)
+              end
+
+              it "should add gold standard to a station from  csv with predefined code template  in plain ruby way" do
+                WebMock.allow_net_connect!
+                title = "line_title#{Time.new.strftime('%Y%b%d-%H%M%S')}".downcase
+                sleep 1
+                line = CF::Line.create(title,"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"})
+                end
+                station = CF::Station.new({:type => "work"})
+                line.stations station
+                gold_standard = CF::GoldStandard.new({:file =>"./spec/gold_standards.csv",:template=>[{"first_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, {"last_name"=>"<% {{variable}}.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}] })
+                line.stations.first.gold_standards gold_standard
+                line.stations.first.gold_standards.first.settings["expected_output"].should eql({"first_name"=>{"value"=>"<% John.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, "last_name"=>{"value"=>"<% Lennon.sort.eql?first_name.each{|a| a.downcase!}.sort %>"}, "company"=>{"value"=>"Sprout"}})
+                line.stations.first.gold_standards.first.settings["name"].should eql("gold_standard_1")
+                line.stations.first.gold_standards.first.settings["input"].should eql({"Website"=>"aaple.com"})
+                line.stations.first.gold_standards.first.settings["expected_output"].present?.should eql(true)
+              end
+
           end
         end

data/spec/gold_standards.csv

@@ -1,2 +1,2 @@
-Website,image_url,first_name,last_name,company
-aaple.com,http://onwired.com/images/portfolio/linda-stanley-business-card.jpg,John,Lennon,Sprout
+Website,first_name,last_name,company
+aaple.com,John,Lennon,Sprout

metadata

@@ -2,7 +2,7 @@
 name: cloudfactory
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.5
+  version: 0.4.5.1
 platform: ruby
 authors: 
 - CloudFactory.com
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-02-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n