houdini 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    houdini (0.2.1)
+    houdini (0.2.2)
       rails (~> 3.0.0)
 
 GEM

data/lib/houdini/base.rb

@@ -1,10 +1,8 @@
 module Houdini
-  Undefined = Class.new(NameError)
   RequestError = Class.new(NameError)
-  AuthenticationError = Class.new(NameError)
   HostError = Class.new(NameError)
 
-  HOST = 'houdini2-staging.heroku.com'
+  HOST = 'v0.houdiniapi.com'
 
   class Base
     def self.request(params)
@@ -12,7 +10,7 @@ module Houdini
       puts "sending #{params.to_json} to houdini"
       validate_config
 
-      url = File.join("https://", HOST, "tasks")
+      url = File.join("https://", HOST, "tasks.json")
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
@@ -28,7 +26,7 @@ module Houdini
     private
 
     def self.validate_config
-      raise HostError, "Houdini.app_host should not include http://" if Houdini.app_host.match(/http/)
+      raise HostError, "Houdini.app_host should specify http:// or https://" unless Houdini.app_host.match(/^https?\:\/\//)
     end
   end
 

data/lib/houdini/model.rb

@@ -30,7 +30,11 @@ module Houdini
         :api_key => Houdini.api_key,
         :task_design => houdini_task.short_name,
         :task_design_version => houdini_task.version,
-        :postback_url => houdini_postbacks_url(self.class.name, self.id, houdini_task.short_name, :host => Houdini.app_host)
+        :postback_url => houdini_postbacks_url(self.class.name, self.id, houdini_task.short_name, {
+          :protocol => Houdini.app_uri.scheme,
+          :host => Houdini.app_uri.host,
+          :port => Houdini.app_uri.port
+        })
       }
 
       params[:task_info] = houdini_task.task_info.inject({}) do |hash, (info_name, model_attribute)|

data/lib/houdini/version.rb

@@ -1,3 +1,3 @@
 module Houdini
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/houdini.rb

@@ -9,7 +9,7 @@ require 'houdini/engine'
 
 
 module Houdini
-  mattr_accessor :environment, :api_key, :app_host
+  mattr_accessor :environment, :api_key, :app_url, :app_uri
   # Convenience methods
   def self.perform!(task_name, object)
     object.send_to_houdini(task_name)
@@ -18,6 +18,7 @@ module Houdini
   def self.setup(environment, options)
     self.environment = environment.to_s
     self.api_key = options[:api_key]
-    self.app_host = options[:app_host]
+    self.app_url = options[:app_host] || options[:app_url]
+    self.app_uri = URI.parse(self.app_url)
   end
 end

data/spec/dummy/config/application.rb

@@ -44,7 +44,7 @@ module Dummy
 
     Houdini.setup(:sandbox,
       :api_key => "wOVK7OFeRJVfmjqBk603",
-      :app_host => 'example.com'
+      :app_host => 'http://example.com'
     )
 
   end

data/spec/requests/integration_spec.rb

@@ -13,7 +13,7 @@ describe "Text Classification" do
     params = {
       "api_key" => Houdini.api_key,
       "environment" => Houdini.environment,
-      "postback_url" => "http://#{Houdini.app_host}/houdini/Article/1/edit_for_grammar/postbacks",
+      "postback_url" => "http://example.com:80/houdini/Article/1/edit_for_grammar/postbacks",
       "task_design" => "edit_for_grammar",
       "task_design_version" => 1,
       "task_info" => {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: houdini
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Chris Conley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -04:00
+date: 2011-03-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency