crowdflower 0.3.0 → 0.4.1

data/CONTRIBUTORS

@@ -0,0 +1,4 @@
+* Chris Van Pelt    (vanpelt)
+* Brian P O'Rourke  (bpo)
+* Mark Sands        (marksands)
+* Mark Erdmann      (markerdmann)

data/HISTORY.md

@@ -1,3 +1,10 @@
+## 0.4.0 (2010-03-25)
+* Allow key configuration from YAML
+* ruby-crowdflower is now just 'crowdflower'
+* Unit#create now creates non-gold units by default
+* Cleaned and removed the httparty monkey patches
+* Job#create now creates an empty job with a title
+
 ## 0.2.2 (2010-02-03)
 * Simple Job#update addition
 

data/README.md

@@ -0,0 +1,41 @@
+# ruby-crowdflower
+
+A toolkit for interacting with CrowdFlower via the REST API.
+
+This is alpha software. Have fun!
+
+Example Usage
+-------------
+
+Specifiy either your api key or a yaml file containing the key:
+	
+	CrowdFlower.connect!( 'CrowdFlower.yml' )
+	
+Upload a CSV file for a job:
+
+	CrowdFlower::Job.upload( File.dirname(__FILE__) + "/data.csv", "text/csv" )
+
+Copy an existing job into a new one:
+	
+	new_job = job.copy( :all_units => true )
+	
+Check the status of a job:
+
+	job.status["tainted_judgments"]
+
+
+
+Contributing
+------------
+
+1. Fork ruby-crowdflower
+2. Create a topic branch - `git checkout -b my_branch`
+3. Make your feature addition or bug fix and add tests for it.
+4. Commit, but do not mess with the rakefile, version, or history.
+5. Push to your branch - `git push origin my_branch`
+6. Create an Issue with a link to your branch
+
+Copyright
+---------
+
+Copyright © 2010 [Dolores Labs](http://www.doloreslabs.com/). See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.1

data/crowdflower.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crowdflower}
-  s.version = "0.3.0"
+  s.version = "0.4.1"
 
   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{2010-03-17}
+  s.date = %q{2010-10-18}
   s.description = %q{A toolkit for interacting with CrowdFlower via the REST API.
 
 This is alpha software. Have fun!
@@ -18,19 +18,19 @@ This is alpha software. Have fun!
   s.email = %q{brian@doloreslabs.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.md"
   ]
   s.files = [
     ".document",
      ".gitignore",
+     "CONTRIBUTORS",
      "HISTORY.md",
      "LICENSE",
-     "README.rdoc",
+     "README.md",
      "Rakefile",
      "VERSION",
      "bindev/cl_skel.rb",
      "bindev/crowdflower.rb",
-     "crowdflower-0.2.3.gem",
      "crowdflower.gemspec",
      "lib/crowdflower.rb",
      "lib/crowdflower/base.rb",
@@ -44,7 +44,7 @@ This is alpha software. Have fun!
   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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{a toolkit for the CrowdFlower API}
   s.test_files = [
     "test/integration_tests.rb"
@@ -54,7 +54,7 @@ This is alpha software. Have fun!
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0.4.3"])
     else
       s.add_dependency(%q<httparty>, [">= 0.4.3"])

data/lib/crowdflower/base.rb

@@ -35,6 +35,12 @@ module CrowdFlower
   def self.connect!(key, development = false)
     @@domain = development ? "http://api.localhost.com:4000/v1" : "https://api.crowdflower.com/v1"
     @@key = key
+    begin # pass yaml file
+      key = YAML.load_file(key)
+      @@key = key[:key] || key["key"]
+    rescue # pass key
+      @@key = key
+    end
   end
 
   def self.key

data/lib/crowdflower/job.rb

@@ -34,9 +34,9 @@ module CrowdFlower
     end
 
     # Creates a new empty Job in CrowdFlower.
-    def self.create
+    def self.create(title)
       connect
-      res = post("#{resource_uri}/upload", :query => {:job => {:without_data => "true" } } )
+      res = post("#{resource_uri}.json", :query => {:job => {:title => title } }, :headers => { "Content-Length" => "0" } )
       if res["error"]
         raise CrowdFlower::APIError.new(res["error"])
       end
@@ -114,6 +114,10 @@ module CrowdFlower
         raise CrowdFlower::APIError.new(res["error"])
       end
     end
+    
+    def delete
+      Job.delete("#{resource_uri}/#{@id}.json")
+    end
 
     private
     def self.custom_content_type(content_type)

data/lib/crowdflower/unit.rb

@@ -24,7 +24,7 @@ module CrowdFlower
       Unit.get("#{resource_uri}/#{id}/judgments")
     end
     
-    def create(data, gold = nil)
+    def create(data, gold = false)
       Unit.post(resource_uri, {:query => {:unit => {:data => data.to_json, :golden => gold}}})
     end
     

data/lib/crowdflower.rb

@@ -1,6 +1,5 @@
 require 'httparty'
-require 'crowdflower/base'
-require 'crowdflower/job'
-require 'crowdflower/unit'
-require 'crowdflower/judgment'
-require 'crowdflower/order'
+
+%w{base job unit judgment order}.each do |file|
+  require File.dirname(__FILE__) +"/crowdflower/" + file
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crowdflower
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 0
-  version: 0.3.0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Brian P O'Rourke
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -07:00
+date: 2010-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 4
@@ -44,18 +47,18 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.md
 files: 
 - .document
 - .gitignore
+- CONTRIBUTORS
 - HISTORY.md
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bindev/cl_skel.rb
 - bindev/crowdflower.rb
-- crowdflower-0.2.3.gem
 - crowdflower.gemspec
 - lib/crowdflower.rb
 - lib/crowdflower/base.rb
@@ -75,23 +78,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: a toolkit for the CrowdFlower API

data/README.rdoc

@@ -1,20 +0,0 @@
-= ruby-crowdflower
-
-A toolkit for interacting with CrowdFlower via the REST API.
-
-This is alpha software. Have fun!
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2009 Dolores Labs. See LICENSE for details.