sixpack-client 0.0.2 → 0.1.0

data/lib/sixpack.rb

@@ -1,51 +1,47 @@
+require "addressable/uri"
 require "net/http"
 require "json"
-
 require "uuid"
+require "uri"
 
 require "sixpack/version"
 
 module Sixpack
-  @@host = "localhost"
-  def self.host
-    @@host
-  end
-  def self.host=(host)
-    @@host = host
-  end
+  extend self
 
-  @@port = 5000
-  def self.port
-    @@port
-  end
-  def self.port=(port)
-    @@port = port
-  end
+  attr_accessor :base_url
 
-  def self.simple_participate(experiment_name, alternatives, client_id=nil, force=nil)
+  @base_url = "http://localhost:5000"
+
+  def simple_participate(experiment_name, alternatives, client_id=nil, force=nil)
     session = Session.new(client_id)
     res = session.participate(experiment_name, alternatives, force)
-    res["alternative"]
+    res["alternative"]["name"]
   end
 
-  def self.simple_convert(experiment_name, client_id)
+  def simple_convert(experiment_name, client_id)
     session = Session.new(client_id)
     session.convert(experiment_name)["status"]
   end
 
-  def self.generate_client_id
+  def generate_client_id
     uuid = UUID.new
     uuid.generate
   end
 
   class Session
-    attr_accessor :host, :port, :client_id
+    attr_accessor :base_url, :client_id, :ip_address, :user_agent
 
-    def initialize(client_id=nil, options={})
-      default_options = {:host => Sixpack.host, :port => Sixpack.port}
+    def initialize(client_id=nil, options={}, params={})
+      default_options = {:base_url => Sixpack.base_url}
       options = default_options.merge(options)
-      @host = options[:host]
-      @port = options[:port]
+      @base_url = options[:base_url]
+
+      default_params = {:ip_address => nil, :user_agent => :nil}
+      params = default_params.merge(params)
+
+      @ip_address = params[:ip_address]
+      @user_agent = params[:user_agent]
 
       if client_id.nil?
         @client_id = Sixpack::generate_client_id()
@@ -78,7 +74,12 @@ module Sixpack
         params[:force] = force
       end
 
-      self.get_response("/participate", params)
+      res = self.get_response("/participate", params)
+      # On server failure use control
+      if res["status"] == "failed"
+        res["alternative"] = {:name => alternatives[0]}
+      end
+      res
     end
 
     def convert(experiment_name)
@@ -89,10 +90,36 @@ module Sixpack
       self.get_response("/convert", params)
     end
 
+    def build_params(params)
+      unless @ip_address.nil?
+        params[:ip_address] = @ip_address
+      end
+      unless @user_agent.nil?
+        params[:user_agent] = @user_agent
+      end
+      params
+    end
+
     def get_response(endpoint, params)
-      uri = URI("http://#{@host}:#{@port}" + endpoint)
-      uri.query = URI.encode_www_form(params)
-      res = Net::HTTP.get_response(uri)
+      uri = URI.parse(@base_url)
+      http = Net::HTTP.new(uri.host, uri.port)
+
+      if uri.scheme == "https"
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      http.open_timeout = 0.25
+      http.read_timeout = 0.25
+      query = Addressable::URI.form_encode(self.build_params(params))
+
+      begin
+        res = http.start do |http|
+          http.get(uri.path + endpoint + "?" + query)
+        end
+      rescue
+        return {"status" => "failed", "error" => "http error"}
+      end
       if res.code == "500"
         {"status" => "failed", "response" => res.body}
       else

data/lib/sixpack/version.rb

@@ -1,3 +1,3 @@
 module Sixpack
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/sixpack.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'redis'
 
   gem.add_runtime_dependency 'uuid'
+  gem.add_runtime_dependency 'addressable'
 end

data/spec/lib/sixpack_spec.rb

@@ -15,6 +15,14 @@ describe Sixpack do
     ['trolled', 'not-trolled'].should include(alternative)
   end
 
+  it "should allow ip and user agent to be passed to a session" do
+    params = {:ip_address => '8.8.8.8', :user_agent => 'FirChromari'}
+    session = Sixpack::Session.new('client_id', {}, params)
+    session.ip_address.should == '8.8.8.8'
+    session.user_agent.should == 'FirChromari'
+
+  end
+
   it "should auto generate a client_id" do
     alternative = Sixpack.simple_participate('show-bieber', ['trolled', 'not-trolled'], nil)
     ['trolled', 'not-trolled'].should include(alternative)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sixpack-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby library for interacting with SeatGeek's sixpack.
 email:
 - hi@seatgeek.com