crowdflower 0.5.5 → 0.5.6

data/crowdflower.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crowdflower}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   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-18}
+  s.date = %q{2011-02-23}
   s.description = %q{A toolkit for interacting with CrowdFlower via the REST API.
 
 This is alpha software. Have fun!

data/lib/crowdflower/base.rb

@@ -14,8 +14,8 @@ module CrowdFlower
   end
   
   # a convenience method for backward compatibility
-  def self.connect!(key, development = false, version = 1)
-    Base.connect!(key, development, version)
+  def self.connect!(key, domain_base = "https://api.crowdflower.com", version = 1)
+    Base.connect!(key, domain_base, version)
   end
 
   def self.connect_domain!(key, domain_base, version = 1)
@@ -126,8 +126,7 @@ module CrowdFlower
       attr_accessor :default_connection
     end
 
-    def self.connect!(key, development = false, version = 1)
-      domain_base = development ? "https://api.localdev.crowdflower.com:8443" : "https://api.crowdflower.com"
+    def self.connect!(key, domain_base = "https://api.crowdflower.com", version = 1)
       connect_domain!(key, domain_base, version)
     end
     

data/test/integration_tests.rb

@@ -5,8 +5,9 @@ require 'crowdflower'
 require 'json'
 
 API_KEY   = ENV["API_KEY"]
+DOMAIN_BASE = ENV["DOMAIN_BASE"] || "https://api.localdev.crowdflower.com:8443"
 
-unless API_KEY && API_KEY.size > 5
+unless API_KEY && API_KEY.size > 3
   puts <<EOF
 
   These integration tests interact with api.crowdflower.com.
@@ -53,7 +54,7 @@ def assert_exception_raised expected_exception_class
   rescue expected_exception_class
     return
   end
-  raise "exception #{expected_ex} has not been raised"
+  raise "exception #{expected_exception_class} has not been raised"
 end
 
 
@@ -63,8 +64,8 @@ end
 
 
 say "defining multiple api keys"
-(job_subclass_with_valid_custom_key = Class.new(CrowdFlower::Job)).connect! API_KEY, true
-(job_subclass_with_invalid_custom_key = Class.new(CrowdFlower::Job)).connect! 'invalid api key', true
+(job_subclass_with_valid_custom_key = Class.new(CrowdFlower::Job)).connect! API_KEY, DOMAIN_BASE
+(job_subclass_with_invalid_custom_key = Class.new(CrowdFlower::Job)).connect! 'invalid api key', DOMAIN_BASE
 job_subclass_with_no_custom_key = Class.new(CrowdFlower::Job)
 
 say "no default api key"
@@ -74,14 +75,14 @@ assert_exception_raised(CrowdFlower::APIError) {job_subclass_with_invalid_custom
 assert job_subclass_with_valid_custom_key.create("should be ok").units.ping['count']
 
 say "invalid default api key"
-CrowdFlower.connect! "invalid default api key", true
+CrowdFlower.connect! "invalid default api key", DOMAIN_BASE
 assert_exception_raised(CrowdFlower::APIError) {CrowdFlower::Job.create("job creation should fail")}
 assert_exception_raised(CrowdFlower::APIError) {job_subclass_with_no_custom_key.create("job creation should fail")}
 assert_exception_raised(CrowdFlower::APIError) {job_subclass_with_invalid_custom_key.create("job creation should fail")}
 assert job_subclass_with_valid_custom_key.create("should be ok").units.ping['count']
 
 say "Connecting to the API"
-CrowdFlower.connect! API_KEY, true
+CrowdFlower.connect! API_KEY, DOMAIN_BASE
 
 assert CrowdFlower::Job.create("should be ok").units.ping['count']
 assert job_subclass_with_no_custom_key.create("should be ok").units.ping['count']

metadata

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