hci 0.0.1 → 0.0.2

data/lib/hci/frameworks/rails.rb

@@ -1,4 +1,13 @@
-Hci::Client.load_path = Rails.root + Hci::Client.load_path
-Rails.configuration.after_initialize do
-  Hci::Client.load!
+if defined?(ActionController::Metal)
+  class Railtie < Rails::Railtie
+    initializer :load_hci do |app|
+      Hci::Client.load_path = Rails.root + Hci::Client.load_path
+      Hci::Client.load!
+    end
+  end
+else
+  Rails.configuration.after_initialize do
+    Hci::Client.load_path = Rails.root + Hci::Client.load_path
+    Hci::Client.load!
+  end
 end

data/lib/hci/hit.rb

@@ -19,8 +19,12 @@ module Hci
         self.hits[name] = hit
       end
     
-      def request(name, resource_id)
-        @hits[name].request(resource_id)
+      def request(name, options)
+        @hits[name].request(options)
+      end
+      
+      def cancel(name, options)
+        @hits[name].cancel(options)
       end
     
       def find(name)
@@ -47,7 +51,12 @@ module Hci
   
     def request(options)
       hit_request = HitRequest.new(self, options)
-      hit_request.invoke
+      hit_request.create
+    end
+    
+    def cancel(options)
+      hit_request = HitRequest.new(self, options)
+      hit_request.cancel
     end
   
     def to_hash

data/lib/hci/hit_request.rb

@@ -9,9 +9,19 @@ module Hci
       @http_end_point = Client.http_end_point
     end
   
-    def invoke
-      RestClient.post("#{@http_end_point}/hits", {:hit=>@hit.to_hash.merge(@params).merge(:callback_url=>Client.callback_url), :api_key=>Client.api_key}.to_json, :content_type => :json, :accept => :json)
+    def create
+      RestClient.post("#{@http_end_point}/hits", *request_params)
     end
-  
+    
+    def cancel
+      RestClient.post("#{@http_end_point}/hits/cancel", *request_params)
+    end
+    
+    private
+    
+    def request_params
+      [{:hit=>@hit.to_hash.merge(@params).merge(:callback_url=>Client.callback_url), :api_key=>Client.api_key}.to_json, {:content_type => :json, :accept => :json}]
+    end
+    
   end
 end

data/lib/hci/version.rb

@@ -1,4 +1,4 @@
 module Hci
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
 end

data/spec/hci_hit_request_spec.rb

@@ -26,7 +26,7 @@ describe "HitRequest" do
     hit_request = Hci::HitRequest.new(hit, :callback_params=>{:resource_id=>'1234'})
     
     stub_request(:post, "hci.heroku.com/hits")
-    hit_request.invoke
+    hit_request.create
     a_request(:post, "http://hci.heroku.com/hits").with(:body=>{'hit'=>
       {
         'name'=>"Approve photo",
@@ -42,6 +42,47 @@ describe "HitRequest" do
     
   end
   
+  
+  it "should invoke a hit cancellation" do
+    
+    hit = Hci::Hit.define "Approve photo" do |h|
+
+      h.directions = "Please classify this photo by choosing the appropriate tickboxes."
+      h.image_url = "http://www.google.com/logo.png"
+      h.answer_type = "tags"
+      h.answer_options = ['Obscenity', 'Nudity', 'Blurry', 'Upside down or sideways', 'Contains more than one person in the foreground', 'Has people in the background', 'Contains children']
+      h.responses_required = 3
+      h.replace = false
+      
+      h.on_completion do |result|
+        puts "Complete"
+      end
+
+      h.on_failure do |result|
+        puts "Failed"
+      end
+
+    end
+    
+    hit_request = Hci::HitRequest.new(hit, :callback_params=>{:resource_id=>'1234'})
+    
+    stub_request(:post, "hci.heroku.com/hits/cancel")
+    hit_request.cancel
+    a_request(:post, "http://hci.heroku.com/hits/cancel").with(:body=>{'hit'=>
+      {
+        'name'=>"Approve photo",
+        'directions'=>"Please classify this photo by choosing the appropriate tickboxes.",
+        'image_url'=>"http://www.google.com/logo.png",
+        'answer_options'=> ['Obscenity', 'Nudity', 'Blurry', 'Upside down or sideways', 'Contains more than one person in the foreground', 'Has people in the background', 'Contains children'],
+        'responses_required'=>3,
+        'answer_type'=>'tags',
+        'callback_url'=>"#{Hci::Client.callback_host}/hci_hit_result",
+        'callback_params'=>{'resource_id'=>'1234'},
+        'replace'=>false
+      }, :api_key=>'test-api-key'}).should have_been_made.once
+    
+  end
+  
   it "should allow options to be overridden when making the request" do
     
     hit = Hci::Hit.define "Approve photo" do |h|
@@ -65,7 +106,7 @@ describe "HitRequest" do
     hit_request = Hci::HitRequest.new(hit, {:callback_params=>{:resource_id=>'1234'}, :image_url=>"http://www.example.com/image.jpg"})
     
     stub_request(:post, "hci.heroku.com/hits")
-    hit_request.invoke
+    hit_request.create
     a_request(:post, "http://hci.heroku.com/hits").with(:body=>{'hit'=>
       {
         'name'=>"Approve photo",

data/spec/hci_hit_spec.rb

@@ -66,11 +66,18 @@ describe "Hit" do
   end
   
   it "should request a hit" do
-    
+    hit = Hci::Hit.define("Approve photo") { }
+    hit.should_receive(:request).with(:request_id=>'123')
+    Hci::Hit.request("Approve photo", :request_id=>'123')
+  end
+  
+  it "should cancel a hit" do
     hit = Hci::Hit.define("Approve photo") { }
     hit.should_receive(:request).with(:request_id=>'123')
     Hci::Hit.request("Approve photo", :request_id=>'123')
     
+    hit.should_receive(:cancel).with(:request_id=>'123')
+    Hci::Hit.cancel("Approve photo", :request_id=>'123')
   end
   
   it "should find a hit" do

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: hci
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Sam Oliver
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 +00:00
+date: 2011-03-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +25,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -32,6 +38,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -43,6 +51,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
   type: :development
   version_requirements: *id003
@@ -54,6 +66,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -104,17 +118,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hci
-rubygems_version: 1.5.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: HCI client