crowdflower 0.5.8 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.9

data/crowdflower.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crowdflower}
-  s.version = "0.5.8"
+  s.version = "0.6.0"
 
   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{2011-02-22}
+  s.date = %q{2011-02-27}
   s.description = %q{A toolkit for interacting with CrowdFlower via the REST API.
 
 This is alpha software. Have fun!
@@ -43,14 +43,13 @@ This is alpha software. Have fun!
   ]
   s.homepage = %q{http://github.com/dolores/ruby-crowdflower}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{a toolkit for the CrowdFlower API}
   s.test_files = [
     "test/integration_tests.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/crowdflower/base.rb

@@ -37,10 +37,11 @@ module CrowdFlower
     def initialize(key, domain_base, version, ssl_port = 443, public_port = 80)
       @domain_base = domain_base
       @version = version
-      @domain = "#{@domain_base}/v#{version}"
       @key = key
       @ssl_port = ssl_port
       @public_port = public_port
+      port = @domain_base =~ /^https/ ? @ssl_port : @public_port
+      @domain = "#{@domain_base}:#{port}/v#{version}"
       begin # pass yaml file
         key = YAML.load_file(key)
         @key = key[:key] || key["key"]

data/lib/crowdflower/job.rb

@@ -21,7 +21,7 @@ module CrowdFlower
       get(resource_uri)
     end
     
-    def self.upload(file, content_type, job = nil)
+    def self.upload(file, content_type, job = nil, opts = {})
       connect
       
       job_uri = job ? "/#{job.kind_of?(Job) ? job.id : job}" : ""
@@ -29,7 +29,8 @@ module CrowdFlower
       upload_uri = "#{resource_uri}/#{job_uri}/upload".squeeze("/")
       res = conn.post(upload_uri, 
         :body => File.read(file), 
-        :headers => {"content-type" => content_type})
+        :headers => {"content-type" => content_type},
+        :query => opts)
 
       verify_response res
       job.kind_of?(Job) ? job : self.new(res["id"], conn)

data/lib/crowdflower/unit.rb

@@ -29,7 +29,7 @@ module CrowdFlower
     end
     
     def create(data, gold = false)
-      connection.post(resource_uri, {:query => {:unit => {:data => data.to_json, :golden => gold}}})
+      connection.post(resource_uri, {:body => {:unit => {:data => data.to_json, :golden => gold}}})
     end
     
     def copy(unit_id, job_id, data = {})

data/test/integration_tests.rb

@@ -125,13 +125,13 @@ wait_until { job2.get["units_count"] == 8 }
 say "Checking the status of the job."
 assert job.status["tainted_judgments"] == 0
 
-say "Registering a webhook."
-job.update :webhook_uri => "http://localhost:8080/crowdflower"
-
 say "Adding title, instructions, and problem to the job."
 job.update({:title => 'testtt',
             :instructions => 'testttt fdsf sfds fsdfs fesfsdf', 
             :cml => '<cml:text label="Text" class="unmodified" validates="required"/>'})
+
+say "Registering a webhook."
+job.update :webhook_uri => "http://localhost:8080/crowdflower"
             
 say "Checking channels"
 assert !job.channels['available_channels'].empty?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crowdflower
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 8
-  version: 0.5.8
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Brian P O'Rourke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-02-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency