bpo-ruby-crowdflower 0.0.0 → 0.0.2

data/Rakefile

@@ -37,6 +37,12 @@ end
 
 task :default => :spec
 
+task :refresh_builder => [:build] do
+  cp "pkg/ruby-crowdflower-#{File.read("VERSION").strip}.gem", "../builder/gems/cache/"
+  rm_rf "../builder/gems/gems/ruby-crowdflower-#{File.read("VERSION").strip}/"
+  `cd ../builder && bin/thor merb:gem:redeploy`
+end
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.2

data/lib/ruby-crowdflower.rb

@@ -1,3 +1,7 @@
 require 'httparty'
-require 'ruby-crowdflower/httparty'
-require 'ruby-crowdflower/crowdflower'
+require 'ruby-crowdflower/patches/httparty'
+require 'ruby-crowdflower/base'
+require 'ruby-crowdflower/job'
+require 'ruby-crowdflower/unit'
+require 'ruby-crowdflower/judgment'
+require 'ruby-crowdflower/order'

data/lib/ruby-crowdflower/base.rb

@@ -0,0 +1,27 @@
+module CrowdFlower
+  @@key = nil
+  @@domain = nil
+  
+  module Defaults
+    def self.included(base)
+      base.send :include, HTTParty
+      base.send :headers, "accept" => "application/json"
+      base.send :format, :json
+    end
+  end
+  
+  def self.connect!(key, development = false)
+    @@domain = development ? "http://api.localhost:4000/v1" : "https://api.crowdflower.com/v1"
+    @@key = key
+  end
+  
+  def self.with_domain(path)
+    raise "Please establish a connection using 'CrowdFlower.connect!'" unless @@domain
+    @@domain + path
+  end
+  
+  def self.key
+    raise "Please establish a connection using 'CrowdFlower.connect!'" unless @@key
+    {:key => @@key}
+  end
+end

data/lib/ruby-crowdflower/job.rb

@@ -0,0 +1,81 @@
+module CrowdFlower
+  class Job
+    include Defaults
+    attr_reader :id
+    
+    def initialize(job_id)
+      @id = job_id
+      Job.base_uri CrowdFlower.with_domain("/jobs")
+      Job.default_params CrowdFlower.key
+    end
+    
+    def self.all
+      Job.get("/")
+    end
+    
+    def get(id = nil)
+      Job.get("/#{@id || id}")
+    end
+    
+    #Copies a job and optionally gold or all units.
+    #Parameters
+    #  opts: Hash
+    #    gold: when set to true copies gold units
+    #    all_units: when set to true copies all units
+    def copy(opts = {})
+      Job.get("/#{@id}/copy", {:query => opts})
+    end
+    
+    def status
+      Job.get("/#{@id}/ping")
+    end
+    
+    def upload(file, content_type)
+      Job.upload(file, content_type, @id)
+    end
+    
+    def legend
+      Job.get("/#{@id}/legend")
+    end
+    
+    def self.upload(file, content_type, job_id = nil)
+      job_id = "/#{job_id}" unless job_id.nil?
+      Job.post("#{job_id}/upload", 
+        :body => File.read(file), 
+        :headers => custom_content_type(content_type))
+    end
+    
+    def download_csv(full = true, filename = nil)
+      filename ||= "#{full ? "f" : "a"}#{@id}.csv"
+      res = Job.get("/#{@id}.csv", {:format => :csv, :query => {:full => full}})
+      puts "Status... #{res.code.inspect}"
+      if res.code == 202
+        puts "CSV Generating... Trying again in 10 seconds."
+        Kernel.sleep 10
+        download_csv
+      else
+        puts "CSV written to: #{File.expand_path(filename)}"
+        File.open(filename, "w") {|f| f.puts res.body }
+      end
+    end
+    
+    def pause
+      Job.get("/#{@id}/pause")
+    end
+    
+    def resume
+      Job.get("/#{@id}/resume")
+    end
+    
+    def cancel
+      Job.get("/#{@id}/cancel")
+    end
+    
+    private
+    
+    def self.custom_content_type(content_type)
+      #To preserve the accept header we are forced to merge the defaults back in...
+      Job.default_options[:headers].merge({"content-type" => content_type})
+    end
+  end
+end

data/lib/ruby-crowdflower/judgment.rb

@@ -0,0 +1,21 @@
+module CrowdFlower
+  class Judgment
+    include Defaults
+    attr_reader :job
+    
+    def initialize(job)
+      @job = job
+      Judgment.base_uri CrowdFlower.with_domain("/jobs/#{@job.id}/judgments")
+      Judgment.default_params CrowdFlower.key
+    end
+    
+    #Pull every judgment
+    def all(page = 1, limit = 1000)#full = true
+      Judgment.get("", {:query => {:limit => limit, :page => page}})
+    end
+    
+    def get(id)
+      Judgment.get("/#{id}")
+    end
+  end
+end

data/lib/ruby-crowdflower/order.rb

@@ -0,0 +1,16 @@
+module CrowdFlower
+  class Order
+    include Defaults
+    attr_reader :job
+    
+    def initialize(job)
+      @job = job
+      Order.base_uri CrowdFlower.with_domain("/jobs/#{@job.id}/orders")
+      Order.default_params CrowdFlower.key
+    end
+    
+    def debit(percentage = 100)
+      Order.post("", {:query => {:percentage => percentage}})
+    end
+  end
+end

data/lib/ruby-crowdflower/{httparty.rb → patches/httparty.rb}

@@ -5,26 +5,20 @@ module HTTParty
         when Net::HTTPRedirection
           options[:limit] -= 1
         
+          self.http_method = Net::HTTP::Get
           self.path = response['location']
-          @redirect = true
+          
+          #Remove post data
+          options[:body] = ""
+          options[:headers].delete('content-type')
           @message = parse_response(response.body.to_s) rescue nil
           perform
         else
           parsed_response = parse_response(response.body.to_s)
           Response.new(parsed_response, response.body.to_s, response.code, @message || response.message, response.to_hash)
         end
-    end
-    
-    def uri
-      # Don't use relative path on redirect
-      new_uri = path.relative? && !@redirect ? URI.parse("#{options[:base_uri]}#{path}") : path
-      
-      # avoid double query string on redirects [#12]
-      unless @redirect
-        new_uri.query = query_string(new_uri)
-      end
-      
-      new_uri
+    rescue
+      puts response.body.to_s
     end
   end
 end

data/lib/ruby-crowdflower/unit.rb

@@ -0,0 +1,32 @@
+module CrowdFlower
+  class Unit
+    include Defaults
+    attr_reader :job
+    
+    def initialize(job)
+      @job = job
+      Unit.base_uri CrowdFlower.with_domain("/jobs/#{@job.id}/units")
+      Unit.default_params CrowdFlower.key
+    end
+    
+    def all(page = 1, limit = 1000)
+      Unit.get("", {:query => {:limit => limit, :page => page}})
+    end
+    
+    def get(id)
+      Unit.get("/#{id}")
+    end
+    
+    def create(data, gold = nil)
+      Unit.post("", {:query => {:unit => {:data => data.to_json, :golden => gold}}})
+    end
+    
+    def copy(unit_id, job_id, data = {})
+      Unit.get("/#{unit_id}/copy", {:query => {:unit => {:job_id => job_id, :data => data}}})
+    end
+    
+    def split(on, with = " ")
+      Unit.get("/split", {:query => {:on => on, :with => with}})
+    end
+  end
+end

data/ruby-crowdflower.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-crowdflower}
-  s.version = "0.0.0"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian P O'Rourke", "Chris Van Pelt"]
-  s.date = %q{2009-07-31}
+  s.date = %q{2009-08-07}
   s.description = %q{A toolkit for interacting with CrowdFlower via the REST API.
 
 This is alpha software in its most nascent stages, and is not 
@@ -26,8 +26,12 @@ yet ready for use with the current version of CrowdFlower.
      "Rakefile",
      "VERSION",
      "lib/ruby-crowdflower.rb",
-     "lib/ruby-crowdflower/crowdflower.rb",
-     "lib/ruby-crowdflower/httparty.rb",
+     "lib/ruby-crowdflower/base.rb",
+     "lib/ruby-crowdflower/job.rb",
+     "lib/ruby-crowdflower/judgment.rb",
+     "lib/ruby-crowdflower/order.rb",
+     "lib/ruby-crowdflower/patches/httparty.rb",
+     "lib/ruby-crowdflower/unit.rb",
      "ruby-crowdflower.gemspec",
      "spec/ruby-crowdflower_spec.rb",
      "spec/spec_helper.rb"
@@ -35,7 +39,7 @@ yet ready for use with the current version of CrowdFlower.
   s.homepage = %q{http://github.com/dolores/ruby-crowdflower}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{a toolkit for the CrowdFlower API}
   s.test_files = [
     "spec/ruby-crowdflower_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bpo-ruby-crowdflower
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.2
 platform: ruby
 authors: 
 - Brian P O'Rourke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-31 00:00:00 -07:00
+date: 2009-08-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,14 +40,17 @@ files:
 - Rakefile
 - VERSION
 - lib/ruby-crowdflower.rb
-- lib/ruby-crowdflower/crowdflower.rb
-- lib/ruby-crowdflower/httparty.rb
+- lib/ruby-crowdflower/base.rb
+- lib/ruby-crowdflower/job.rb
+- lib/ruby-crowdflower/judgment.rb
+- lib/ruby-crowdflower/order.rb
+- lib/ruby-crowdflower/patches/httparty.rb
+- lib/ruby-crowdflower/unit.rb
 - ruby-crowdflower.gemspec
 - spec/ruby-crowdflower_spec.rb
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/dolores/ruby-crowdflower
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -68,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: a toolkit for the CrowdFlower API

data/lib/ruby-crowdflower/crowdflower.rb

@@ -1,132 +0,0 @@
-module CrowdFlower
-  def self.connect!(key)
-    @@conn = Base.new(key)
-  end
-  
-  def self.conn
-    raise "Please establish a connection using 'CrowdFlower.connect!'" unless @@conn
-    @@conn.class
-  end
-  
-  class Base
-    include HTTParty
-
-    def initialize(key)
-      Base.default_params(:key => key)
-    end
-  end
-  
-  module Defaults
-    def self.included(base)
-      base.send :include, HTTParty
-      base.send :headers, "HTTP_ACCEPT" => "application/json"
-      base.send :format, :json
-    end
-  end
-  
-  class Job
-    include Defaults
-    attr_reader :job_id
-    
-    def initialize(job_id)
-      @job_id = job_id
-      Job.base_uri "https://api.crowdflower.com/v1/jobs"
-      Job.default_params(CrowdFlower.conn.default_params)
-    end
-    
-    def self.all
-      Job.get("/")
-    end
-    
-    def get(id = nil)
-      Job.get("/#{@job_id || id}")
-    end
-    
-    #Copies a job and optionally gold or all units.
-    #Parameters
-    #  opts: Hash
-    #    gold: when set to true copies gold units
-    #    all_units: when set to true copies all units
-    def copy(opts = {})
-      Job.get("/#{@job_id}/copy", {:query => opts})
-    end
-    
-    def status
-      Job.get("/#{@job_id}/ping")
-    end
-    
-    def download_csv(full = true, filename = nil)
-      filename ||= "#{full ? "f" : "a"}#{@job_id}.csv"
-      res = Job.get("/#{@job_id}.csv", {:format => :csv, :query => {:full => full}})
-      puts "Status... #{res.code.inspect}"
-      if res.code == 202
-        puts "CSV Generating... Trying again in 10 seconds."
-        Kernel.sleep 10
-        download_csv
-      else
-        puts "CSV written to: #{File.expand_path(filename)}"
-        File.open(filename, "w") {|f| f.puts res.body }
-      end
-    end
-    
-    def pause
-      Job.get("/#{@job_id}/pause")
-    end
-    
-    def resume
-      Job.get("/#{@job_id}/resume")
-    end
-    
-    def cancel
-      Job.get("/#{@job_id}/cancel")
-    end
-  end
-  
-  class Unit
-    include Defaults
-    
-    def initialize(job)
-      @job = job
-      Unit.base_uri "https://api.crowdflower.com/v1/jobs/#{@job.job_id}/units"
-      Unit.default_params(CrowdFlower.conn.default_params)
-    end
-    
-    def all(page = 1, limit = 1000)
-      Unit.get("", {:query => {:limit => limit, :page => page}})
-    end
-    
-    def get(id)
-      Unit.get("/#{id}")
-    end
-    
-    def create(data, gold = nil)
-      Unit.post("", {:query => {:unit => {:data => data.to_json, :golden => gold}}})
-    end
-    
-    def copy(unit_id, job_id, data = {})
-      Unit.get("/#{unit_id}/copy", {:query => {:unit => {:job_id => job_id, :data => data}}})
-    end
-    
-    def split(on, with = " ")
-      Unit.get("/split", {:query => {:on => on, :with => with}})
-    end
-  end
-  
-  class Judgment
-    include Defaults
-    
-    def initialize(job)
-      Judgment.base_uri "https://api.crowdflower.com/v1/jobs/#{@job.job_id}/judgments"
-      Judgment.default_params(CrowdFlower.conn.default_params)
-    end
-    
-    #Pull every judgment
-    def all(page = 1, limit = 1000)#full = true
-      Judgment.get("", {:query => {:limit => limit, :page => page}})
-    end
-    
-    def get(id)
-      Judgment.get("/#{id}")
-    end
-  end
-end