leadtune 0.0.1 → 0.0.2

data/Gemfile

@@ -25,7 +25,6 @@ gem "rspec-mocks"
 gem "json"
 gem "activemodel"
 gem "curb"
-gem "rack"
 gem "tcpsocket-wait"
 gem "webmock", :git => "http://github.com/phiggins/webmock.git"
 gem "tcpsocket-wait"

data/Gemfile.lock

@@ -32,7 +32,6 @@ GEM
     json (1.4.6)
     json_pure (1.4.6)
     linecache (0.43)
-    rack (1.2.1)
     rake (0.8.7)
     rdoc (2.5.11)
     rspec (2.0.0.beta.19)
@@ -60,7 +59,6 @@ DEPENDENCIES
   cucumber
   curb
   json
-  rack
   rake
   rdoc
   rspec (= 2.0.0.beta.19)

data/README.rdoc

@@ -2,6 +2,8 @@
 
 http://github.com/leadtune/leadtune-ruby
 
+https://rubygems.org/gems/leadtune
+
 Copyright 2010 LeadTune, LLC
 
 Eric Wollesen (mailto:devs@leadtune.com)
@@ -37,19 +39,30 @@ Your LeadTune username, password, and organization can be specified in the
 environment variables. <em>These values take precedence over values read
 from the configuration file.</em>
 
+=== Rack Initializer
+
+ # config/initializers/leadtune.rb
+ Leadtune::Config.username = "me@mycorp.com"
+ Leadtune::Config.password = "my_secret"
+ Leadtune::Config.organization = "MYC"
+
+<em>These values take precedence over values read from environment variables
+or configuration file.</em>
+
 === Factors Hash
 
 When initializing your Leadtune::Prospect, you can include your username,
 password, and organization along with any factors you wish to
-submit. <em>These values take precedence over values read from environment
-variables, or the configuration file.</em>
+submit. <em>These values take precedence over values read from rack
+initializers, environment variables, or the configuration file.</em>
 
 === Instance Methods
 
 You can also set your username, password, and organization by calling the
 Leadtune::Prospect object's #username=, #password=, and #organization=
-methods. <em>These values take precedence over values read from
-environment variables, a configuration file, or the factors hash.</em>
+methods. <em>These values take precedence over values read from the factors
+hash, rack initializers, environment variables, or the configuration
+file.</em>
 
 == Example Usage
 

data/leadtune.gemspec

@@ -20,7 +20,19 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "bundler", ">= 1.0.0" 
+  s.add_development_dependency "ruby-debug"
+  s.add_development_dependency "rspec", "= 2.0.0.beta.19"
+  s.add_development_dependency "rspec-core", "= 2.0.0.beta.19"
+  s.add_development_dependency "rspec-expectations", "= 2.0.0.beta.19"
+  s.add_development_dependency "rspec-mocks", "= 2.0.0.beta.19"
+  s.add_development_dependency "webmock"#, "http://github.com/phiggins/webmock.git"
+
+  s.add_dependency("rake")
+  s.add_dependency("curb")
+  s.add_dependency("json")
+  s.add_dependency("tcpsocket-wait")
+  s.add_dependency("activemodel")
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/lib/leadtune.rb

@@ -17,7 +17,18 @@ module Leadtune #:nodoc:all
 end
 
 # Raised when non-2XX responses are received.
-class Leadtune::LeadtuneError < RuntimeError ; end 
+class Leadtune::LeadtuneError < RuntimeError 
+  attr_reader :code, :message
+
+  def initialize(code, message)
+    @code, @message = code, message
+  end
+
+  def to_s
+    "#{@code} #{message}"
+  end
+end 
+
 
 
 require "leadtune/prospect"

data/lib/leadtune/config.rb

@@ -10,26 +10,53 @@ module Leadtune
 
     attr_accessor :environment, :leadtune_host, :username, :password, :timeout
 
+    @@leadtune_host = nil
+    @@username = nil
+    @@password = nil
+    @@organization = nil
+    @@timeout = nil
+
     def initialize(config_file=nil)
       load_config_file_values(config_file)
     end
 
+    def self.username=(username)
+      @@username = username
+    end
+
+    def self.password=(password)
+      @@password = password
+    end
+
+    def self.organization=(organization)
+      @@organization = organization
+    end
+
+    def self.leadtune_host=(leadtune_host)
+      @@leadtune_host = leadtune_host
+    end
+
+    def self.timeout=(timeout)
+      @@timeout = timeout.to_i
+    end
+
     def username
-      @username ||= ENV["LEADTUNE_USERNAME"] || @config_file_values["username"]
+      @username ||= @@username || ENV["LEADTUNE_USERNAME"] || @config_file_values["username"]
     end
 
     def password
-      @password ||= ENV["LEADTUNE_PASSWORD"] || @config_file_values["password"]
+      @password ||= @@password || ENV["LEADTUNE_PASSWORD"] || @config_file_values["password"]
     end
 
     def timeout
-      @timeout ||= (ENV["LEADTUNE_TIMEOUT"] || 
+      @timeout ||= (@@timeout ||
+                    ENV["LEADTUNE_TIMEOUT"] || 
                     @config_file_values["timeout"] || 
                     DEFAULT_TIMEOUT).to_i
     end
 
     def organization
-      ENV["LEADTUNE_ORGANIZATION"] || @config_file_values["organization"]
+      @@organization || ENV["LEADTUNE_ORGANIZATION"] || @config_file_values["organization"]
     end
 
     def leadtune_host

data/lib/leadtune/prospect.rb

@@ -140,7 +140,7 @@ module Leadtune
     end
 
     def organization #:nodoc:
-      @factors["organization"] ||= @config.organization
+      @factors["organization"] || @config.organization
     end
     
     def prospect_id #:nodoc:
@@ -167,23 +167,33 @@ module Leadtune
       @config.password = password
     end
 
+    def response
+      @rest.response
+    end
+
+    def payload
+      post_data.reject {|k,v| CURL_OPTIONS.include?(k)}
+    end
+
 
     private 
 
+    CURL_OPTIONS = ["username", "password", "timeout", "leadtune_host",]
+
     def post_data #:nodoc:
-      @factors.merge("decision" => decision)
+      @factors.merge("decision" => @decision, 
+                     "organization" => @config.organization)
     end
 
     def load_options_and_factors(options) #:nodoc:
-      load_options(options)
+      load_curl_options(options)
       load_factors(options)
     end
 
-    def load_options(options) #:nodoc:
-      @rest.username = options.delete("username") if options["username"]
-      @rest.password = options.delete("password") if options["password"]
-      @config.timeout = options.delete("timeout") if options["timeout"]
-      @config.leadtune_host = options.delete("timeout") if options["leadtune_host"]
+    def load_curl_options(options) #:nodoc:
+      CURL_OPTIONS.each do |option|
+        @config.send("#{option}=", options.delete(option)) if options[option]
+      end
     end
 
     def load_factors(factors) #:nodoc:
@@ -193,6 +203,7 @@ module Leadtune
     end
 
     def parse_response(response) #:nodoc:
+      response = response.dup
       load_decision(response)
       load_factors(response)
     end

data/lib/leadtune/rest.rb

@@ -9,30 +9,33 @@ require "json"
 module Leadtune
   class Rest #:nodoc:all
 
+    attr_reader :response
+
     def initialize(config)
       @config = config
       @post_data = nil
+      @response = {}
     end
 
     def get(post_data)
       @post_data = post_data
       curl = build_curl_easy_object_get
       curl.http("GET")
-      curl.body_str ? JSON::parse(curl.body_str) : {}
+      parse_response(curl.body_str)
     end
 
     def post(post_data)
       @post_data = post_data
       curl = build_curl_easy_object_post
       curl.http("POST")
-      curl.body_str ? JSON::parse(curl.body_str) : {}
+      parse_response(curl.body_str)
     end
 
     def put(post_data)
       @post_data = post_data
       curl = build_curl_easy_object_put
       curl.http("PUT")
-      curl.body_str ? JSON::parse(curl.body_str) : {}
+      parse_response(curl.body_str)
     end
 
 
@@ -46,9 +49,9 @@ module Leadtune
         curl.timeout = @config.timeout
         curl.headers = default_headers
         curl.on_failure do |curl, code|
-          raise LeadtuneError.new("#{curl.response_code} #{curl.body_str}")
+          raise LeadtuneError.new(curl.response_code, curl.body_str)
         end
-        #curl.verbose = true
+        # curl.verbose = true
         yield curl
       end
     end
@@ -62,14 +65,15 @@ module Leadtune
       build_curl_easy_object do |curl|
         curl.url = URI.join(@config.leadtune_host, "/prospects").to_s
         curl.post_body = @post_data.to_json
+        $stderr.puts curl.post_body if curl.verbose?
       end
     end
 
     def build_curl_easy_object_put #:nodoc:
       build_curl_easy_object do |curl|
         curl.url = build_put_url
-        #curl.verbose = true
         curl.put_data = @post_data.to_json
+        $stderr.puts curl.post_body if curl.verbose?
       end
     end
 
@@ -94,5 +98,9 @@ module Leadtune
       URI.join(@config.leadtune_host, path).to_s
     end
 
+    def parse_response(body)
+      @response = body ? JSON::parse(body) : {}
+    end
+
   end
 end

data/lib/leadtune/version.rb

@@ -5,5 +5,5 @@
 # Copyright 2010 LeadTune LLC
 
 module Leadtune
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/leadtune/config_spec.rb

@@ -0,0 +1,47 @@
+# LeadTune API Ruby Gem
+#
+# http://github.com/leadtune/leadtune-ruby
+# Eric Wollesen (mailto:devs@leadtune.com)
+# Copyright 2010 LeadTune LLC
+
+require "spec_helper"
+
+class Leadtune::Config
+  def self.reset_class_vars
+    @@timeout = nil
+    @@organization = nil
+    @@username = nil
+    @@password = nil
+  end
+end
+
+describe Leadtune::Config do
+  before(:each) {Leadtune::Config.reset_class_vars}
+  after(:each) {Leadtune::Config.reset_class_vars}
+
+  context("can set") do
+    it "password" do
+      Leadtune::Config.password = "secret"
+
+      Leadtune::Config.new.password.should == "secret"
+    end
+
+    it "username" do
+      Leadtune::Config.username = "bob"
+
+      Leadtune::Config.new.username.should == "bob"
+    end
+
+    it "timeout" do
+      Leadtune::Config.timeout = 5
+
+      Leadtune::Config.new.timeout.should == 5
+    end
+
+    it "organization" do
+      Leadtune::Config.organization = "ORG"
+
+      Leadtune::Config.new.organization.should == "ORG"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leadtune
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Eric Wollesen
@@ -34,6 +34,176 @@ dependencies:
   type: :development
   name: bundler
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  type: :development
+  name: ruby-debug
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 62196421
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 19
+        version: 2.0.0.beta.19
+  requirement: *id003
+  type: :development
+  name: rspec
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 62196421
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 19
+        version: 2.0.0.beta.19
+  requirement: *id004
+  type: :development
+  name: rspec-core
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 62196421
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 19
+        version: 2.0.0.beta.19
+  requirement: *id005
+  type: :development
+  name: rspec-expectations
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 62196421
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 19
+        version: 2.0.0.beta.19
+  requirement: *id006
+  type: :development
+  name: rspec-mocks
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+  type: :development
+  name: webmock
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
+  type: :runtime
+  name: rake
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
+  type: :runtime
+  name: curb
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
+  type: :runtime
+  name: json
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id011
+  type: :runtime
+  name: tcpsocket-wait
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id012
+  type: :runtime
+  name: activemodel
+  prerelease: false
 description: LeadTune Ruby API Gem
 email: 
 - devs@leadtune.com
@@ -62,6 +232,7 @@ files:
 - spec/echo_server.rb
 - spec/get.rb
 - spec/leadtune/appraisals_spec.rb
+- spec/leadtune/config_spec.rb
 - spec/leadtune/prospect_spec.rb
 - spec/leadtune/rest_spec.rb
 - spec/post.rb