customerio 0.7.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGI2YjQwMzVhYWJlNGE2ZWRiNDA4ZmY2MjQ3ZGJiMzEwNDlhNGU2ZA==
+    MWFhMDk1ZmMzOTBjZTZhMzYxNGYyZTJmZDFlMTdiZWI1NjdhMTY4YQ==
   data.tar.gz: !binary |-
-    OWFlNzY0YzcwZDczMGU4NzRiNDQxMDIzY2FhYzEyMTlhNjU4N2ZjMw==
+    YmMyODY3OTIxMjhkN2MxYzVlNzdlOWRiOTgxNzc2OWUyYWJjNDc0Ng==
 SHA512:
   metadata.gz: !binary |-
-    NjIxNDhlYzU0OGRmMWI3Y2I5YmViYWExZDNlYTEyNjUyYTRmYjgwZDM1NTM2
-    ZjE4YzdkNzBmYmRkZWY2MDM5YmYxOTI0YjE1YmVlYjdiZjJlZGYyYTQ3ZWRm
-    Y2IwOGMzYzQ3OWE4YWUxMzM1OWRjODIwZDQzODU2N2ExMjM4NTY=
+    NjA5OWUwZDU4ZmJmYjA3YmQ4ZTY0ZDhlNWQzMjU2MDViNzk3NjkxNzI2Zjcw
+    YjFjNDg4N2Q5YzQwMWIxZGJkZWFmNzNlYTEzYjVkNWZlY2Q4MjgyNjM3MWNm
+    M2ZjMzU5MGUyMzljOTg0NTA0OWM5NDZkMDU4MTVlMzViNDEzYWU=
   data.tar.gz: !binary |-
-    YzI0Nzk1NGNkOTFkMWQxZDcyZjkwNzQ3OTlhZGExYjQ5NjhhNWU4ZDUxZTdl
-    OWZlZWFjNzk5MDkzZDU0OGVkZGU0MzI2ZmU0N2U4NDI2OWRjOTIxODc4YzUy
-    YTU1NDAyNGJlNzgxMDc1NWU4YjYxNWNiNDdiMjgxNGVmMzU5MDg=
+    YTMxNjA2NzJjNzU2ZDExNzBjZDYxODBhMDRiMTg1MWE3ZDIzMmI5YzcxYzE5
+    MGNhNTc5YTJmYjRmNjBlYTljODU3YzhiMGZiZGNkM2UyOTZhYzkyMWE0ZTBl
+    MGY2Mzg1YzMyMGYxNzg2NGY1YjY4YmFhZjkwYzVjN2IxYjNkYTE=

data/.travis.yml

@@ -12,5 +12,3 @@ rvm:
   - jruby-head
   - ree
   - ruby-head
-  - rbx-18mode
-  - rbx-19mode

data/CHANGELOG.markdown

@@ -1,3 +1,11 @@
+## Customerio 1.0.0 - Mar 15, 2016 ##
+
+There is a slight breaking change in this release. If you are depending on the HTTP response object included in the InvalidResponse exception (introduced in 0.6.1), note that it is now a `Net::HTTPBadRequest`.
+
+* Remove HTTParty dependency, use Net::HTTP instead. [#42](https://github.com/customerio/customerio-ruby/pull/42)
+
+* Update test suite to use webmock, to increase confidence that we're not changing our HTTP requests [#41](https://github.com/customerio/customerio-ruby/pull/41)
+
 ## Customerio 0.7.0 - Mar 2, 2016 ##
 
 * Add new method for tracking anonymous events: `anonymous_track`. See README for more details. Many thanks to @sdawson for this contribution! [#36](https://github.com/customerio/customerio-ruby/pull/36)

data/customerio.gemspec

@@ -15,10 +15,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Customerio::VERSION
 
-  gem.add_dependency('httparty', ["< 0.12", ">= 0.5"])
   gem.add_dependency('multi_json', "~> 1.0")
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')
-  gem.add_development_dependency('fakeweb')
+  gem.add_development_dependency('webmock')
+  gem.add_development_dependency('addressable', '~> 2.3.6')
+  gem.add_development_dependency('json')
 end

data/lib/customerio.rb

@@ -2,4 +2,5 @@ require "customerio/version"
 
 module Customerio
   require "customerio/client"
+  require "customerio/param_encoder"
 end

data/lib/customerio/client.rb

@@ -1,13 +1,13 @@
-require 'httparty'
+require 'net/http'
 require 'multi_json'
 
 module Customerio
-  class Client
-    include HTTParty
-    base_uri 'https://track.customer.io'
-    default_timeout 10
+  DEFAULT_BASE_URI = 'https://track.customer.io'
+  DEFAULT_TIMEOUT  = 10
 
+  class Client
     class MissingIdAttributeError < RuntimeError; end
+    class InvalidRequest < RuntimeError; end
     class InvalidResponse < RuntimeError
       attr_reader :response
 
@@ -18,8 +18,11 @@ module Customerio
     end
 
     def initialize(site_id, secret_key, options = {})
-      @auth = { :username => site_id, :password => secret_key }
+      @username = site_id
+      @password = secret_key
       @json = options.has_key?(:json) ? options[:json] : true
+      @base_uri = options[:base_uri] || DEFAULT_BASE_URI
+      @timeout = options[:timeout] || DEFAULT_TIMEOUT
     end
 
     def identify(attributes)
@@ -27,7 +30,7 @@ module Customerio
     end
 
     def delete(customer_id)
-      verify_response(self.class.delete(customer_path(customer_id), options))
+      verify_response(request(:delete, customer_path(customer_id)))
     end
 
     def track(*args)
@@ -59,11 +62,7 @@ module Customerio
 
       url = customer_path(attributes[:id])
 
-      if @json
-        verify_response(self.class.put(url, options.merge(:body => MultiJson.dump(attributes), :headers => {'Content-Type' => 'application/json'})))
-      else
-        verify_response(self.class.put(url, options.merge(:body => attributes)))
-      end
+      verify_response(request(:put, url, attributes))
     end
 
     def create_customer_event(customer_id, event_name, attributes = {})
@@ -77,11 +76,7 @@ module Customerio
     def create_event(url, event_name, attributes = {})
       body = { :name => event_name, :data => attributes }
       body[:timestamp] = attributes[:timestamp] if valid_timestamp?(attributes[:timestamp])
-      if @json
-        verify_response(self.class.post(url, options.merge(:body => MultiJson.dump(body), :headers => {'Content-Type' => 'application/json'})))
-      else
-        verify_response(self.class.post(url, options.merge(:body => body)))
-      end
+      verify_response(request(:post, url, body))
     end
 
     def customer_path(id)
@@ -94,7 +89,7 @@ module Customerio
 
 
     def verify_response(response)
-      if response.code >= 200 && response.code < 300
+      if response.code.to_i >= 200 && response.code.to_i < 300
         response
       else
         raise InvalidResponse.new("Customer.io API returned an invalid response: #{response.code}", response)
@@ -106,8 +101,46 @@ module Customerio
       hash.inject({}){ |hash, (k,v)| hash[k.to_sym] = v; hash }
     end
 
-    def options
-      { :basic_auth => @auth }
+    def request(method, path, body = nil, headers = {})
+      uri = URI.join(@base_uri, path)
+
+      session = Net::HTTP.new(uri.host, uri.port)
+      session.use_ssl = (uri.scheme == 'https')
+      session.open_timeout = @timeout
+      session.read_timeout = @timeout
+
+      req = request_class(method).new(uri.path)
+      req.initialize_http_header(headers)
+      req.basic_auth @username, @password
+
+      add_request_body(req, body) unless body.nil?
+
+      session.start do |http|
+        http.request(req)
+      end
+    end
+
+    def request_class(method)
+      case method
+      when :post
+        Net::HTTP::Post
+      when :put
+        Net::HTTP::Put
+      when :delete
+        Net::HTTP::Delete
+      else
+        raise InvalidRequest.new("Invalid request method #{method.inspect}")
+      end
+    end
+
+    def add_request_body(req, body)
+      if @json
+        req.add_field('Content-Type', 'application/json')
+        req.body = MultiJson.dump(body)
+      else
+        req.add_field('Content-Type', 'application/x-www-form-urlencoded')
+        req.body = ParamEncoder.to_params(body)
+      end
     end
   end
 end

data/lib/customerio/param_encoder.rb

@@ -0,0 +1,68 @@
+# Based on HTTParty's HashConversions:
+#
+# https://github.com/jnunemaker/httparty/blob/master/lib/httparty/hash_conversions.rb
+#
+# License: MIT https://github.com/jnunemaker/httparty/blob/master/MIT-LICENSE
+
+require 'erb'
+require 'uri'
+
+module Customerio
+  class ParamEncoder
+    # @return <String> This hash as a query string
+    #
+    # @example
+    #   { name: "Bob",
+    #     address: {
+    #       street: '111 Ruby Ave.',
+    #       city: 'Ruby Central',
+    #       phones: ['111-111-1111', '222-222-2222']
+    #     }
+    #   }.to_params
+    #     #=> "name=Bob&address[city]=Ruby Central&address[phones][]=111-111-1111&address[phones][]=222-222-2222&address[street]=111 Ruby Ave."
+    def self.to_params(hash)
+      hash.to_hash.map { |k, v| normalize_param(k, v) }.join.chop
+    end
+
+    # @param key<Object> The key for the param.
+    # @param value<Object> The value for the param.
+    #
+    # @return <String> This key value pair as a param
+    #
+    # @example normalize_param(:name, "Bob Jones") #=> "name=Bob%20Jones&"
+    def self.normalize_param(key, value)
+      param = ''
+      stack = []
+
+      if value.respond_to?(:to_ary)
+        param << value.to_ary.map { |element| normalize_param("#{key}[]", element) }.join
+      elsif value.respond_to?(:to_hash)
+        stack << [key, value.to_hash]
+      else
+        param << "#{key}=#{escape_value(value)}&"
+      end
+
+      stack.each do |parent, hash|
+        hash.each do |k, v|
+          if v.respond_to?(:to_hash)
+            stack << ["#{parent}[#{k}]", v.to_hash]
+          else
+            param << normalize_param("#{parent}[#{k}]", v)
+          end
+        end
+      end
+
+      param
+    end
+
+    # Prefer ERB::Util.url_encode, fall baack to deprecation URI.encode for
+    # old Ruby support
+    def self.escape_value(value)
+      if ERB::Util.respond_to? :url_encode
+        ERB::Util.url_encode(value.to_s)
+      else
+        URI.encode(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      end
+    end
+  end
+end

data/lib/customerio/version.rb

@@ -1,3 +1,3 @@
 module Customerio
-  VERSION = "0.7.0"
+  VERSION = "1.0.0"
 end

data/spec/client_spec.rb

@@ -1,14 +1,17 @@
 require 'spec_helper'
 require 'multi_json'
 
+
 describe Customerio::Client do
   let(:client)   { Customerio::Client.new("SITE_ID", "API_KEY", :json => false) }
   let(:response) { double("Response", :code => 200) }
 
-  before do
-    # Dont call out to customer.io
-    Customerio::Client.stub(:post).and_return(response)
-    Customerio::Client.stub(:put).and_return(response)
+  def api_uri(path)
+    "https://SITE_ID:API_KEY@track.customer.io#{path}"
+  end
+
+  def json(data)
+    MultiJson.dump(data)
   end
 
   describe "json option" do
@@ -17,90 +20,85 @@ describe Customerio::Client do
     it "uses json by default" do
       client = Customerio::Client.new("SITE_ID", "API_KEY")
 
-      json = MultiJson.dump(body)
-      Customerio::Client.should_receive(:put).with(
-        "/api/v1/customers/5",
-        {
-          :basic_auth=>{:username=>"SITE_ID", :password=>"API_KEY"},
-          :body=>json,
-          :headers=>{"Content-Type"=>"application/json"}
-        }).and_return(response)
+      stub_request(:put, api_uri('/api/v1/customers/5')).
+        with(:body => json(body),
+             :headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "", :headers => {})
+
       client.identify(body)
     end
 
     it "allows disabling json" do
       client = Customerio::Client.new("SITE_ID", "API_KEY", :json => false)
 
-      Customerio::Client.should_receive(:put).with(
-        "/api/v1/customers/5",
-        {
-          :basic_auth=>{:username=>"SITE_ID", :password=>"API_KEY"},
-          :body=>body
-        }).and_return(response)
+      stub_request(:put, api_uri('/api/v1/customers/5')).
+        with(:body => { :id => "5", :name => "Bob" }).
+        to_return(:status => 200, :body => "", :headers => {})
+
       client.identify(body)
     end
   end
 
-  describe ".base_uri" do
-  	it "should be set to customer.io's api" do
-  		Customerio::Client.base_uri.should == "https://track.customer.io"
-  	end
-  end
-
   describe "#identify" do
     it "sends a PUT request to customer.io's customer API" do
-      Customerio::Client.should_receive(:put).with("/api/v1/customers/5", anything()).and_return(response)
+      stub_request(:put, api_uri('/api/v1/customers/5')).
+         with(:body => "id=5").
+         to_return(:status => 200, :body => "", :headers => {})
+
       client.identify(:id => 5)
     end
 
     it "sends a PUT request to customer.io's customer API using json headers" do
       client = Customerio::Client.new("SITE_ID", "API_KEY", :json => true)
       body = { :id => 5, :name => "Bob" }
-      json = MultiJson.dump(body)
-      Customerio::Client.should_receive(:put).with(
-        "/api/v1/customers/5",
-        {:basic_auth=>{:username=>"SITE_ID", :password=>"API_KEY"},
-          :body=>json,
-          :headers=>{"Content-Type"=>"application/json"}}).and_return(response)
+
+      stub_request(:put, api_uri('/api/v1/customers/5')).
+        with(:body => json(body),
+             :headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "", :headers => {})
+
       client.identify(body)
     end
 
     it "raises an error if PUT doesn't return a 2xx response code" do
-      Customerio::Client.should_receive(:put).and_return(double("Response", :code => 500))
+      stub_request(:put, api_uri('/api/v1/customers/5')).
+        with(:body => "id=5").
+        to_return(:status => 500, :body => "", :headers => {})
+
       lambda { client.identify(:id => 5) }.should raise_error(Customerio::Client::InvalidResponse)
     end
 
     it "includes the HTTP response with raised errors" do
-      response = double("Response", :code => 500, :body => "whatever")
-      Customerio::Client.should_receive(:put).and_return(response)
+      stub_request(:put, api_uri('/api/v1/customers/5')).
+        with(:body => "id=5").
+        to_return(:status => 500, :body => "whatever", :headers => {})
+
       lambda { client.identify(:id => 5) }.should raise_error {|error|
         error.should be_a Customerio::Client::InvalidResponse
-        error.response.should eq response
+        error.response.code.should eq "500"
+        error.response.body.should eq "whatever"
       }
     end
 
-    it "uses the site_id and api key for basic auth" do
-      Customerio::Client.should_receive(:put).with("/api/v1/customers/5", {
-        :basic_auth => { :username => "SITE_ID", :password => "API_KEY" },
-        :body => anything()
-      }).and_return(response)
-
-      client.identify(:id => 5)
-    end
-
     it "sends along all attributes" do
-      Customerio::Client.should_receive(:put).with("/api/v1/customers/5", {
-        :basic_auth => anything(),
+      time = Time.now.to_i
+
+      stub_request(:put, api_uri('/api/v1/customers/5')).with(
         :body => {
-          :id => 5,
+          :id => "5",
           :email => "customer@example.com",
-          :created_at => Time.now.to_i,
+          :created_at => time.to_s,
           :first_name => "Bob",
           :plan => "basic"
-        }
-      }).and_return(response)
-
-      client.identify(:id => 5, :email => "customer@example.com", :created_at => Time.now.to_i, :first_name => "Bob", :plan => "basic")
+        }).to_return(:status => 200, :body => "", :headers => {})
+
+      client.identify({
+        :id => 5,
+        :email => "customer@example.com",
+        :created_at => time,
+        :first_name => "Bob",
+        :plan => "basic"
+      })
     end
 
     it "requires an id attribute" do
@@ -108,6 +106,10 @@ describe Customerio::Client do
     end
 
     it 'should not raise errors when attribute keys are strings' do
+      stub_request(:put, api_uri('/api/v1/customers/5')).
+        with(:body => "id=5").
+        to_return(:status => 200, :body => "", :headers => {})
+
       attributes = { "id" => 5 }
 
       lambda { client.identify(attributes) }.should_not raise_error()
@@ -115,88 +117,111 @@ describe Customerio::Client do
   end
 
   describe "#delete" do
-  	it "sends a DELETE request to the customer.io's event API" do
-  		Customerio::Client.should_receive(:delete).with("/api/v1/customers/5", anything()).and_return(response)
+    it "sends a DELETE request to the customer.io's event API" do
+      stub_request(:delete, api_uri('/api/v1/customers/5')).
+        to_return(:status => 200, :body => "", :headers => {})
+
       client.delete(5)
-  	end
+    end
   end
 
   describe "#track" do
-  	it "sends a POST request to the customer.io's event API" do
-  		Customerio::Client.should_receive(:post).with("/api/v1/customers/5/events", anything()).and_return(response)
-      client.track(5, "purchase")
-  	end
-
     it "raises an error if POST doesn't return a 2xx response code" do
-      Customerio::Client.should_receive(:post).and_return(double("Response", :code => 500))
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+        with(:body => "name=purchase").
+        to_return(:status => 500, :body => "", :headers => {})
+
       lambda { client.track(5, "purchase") }.should raise_error(Customerio::Client::InvalidResponse)
     end
 
-  	it "uses the site_id and api key for basic auth" do
-  		Customerio::Client.should_receive(:post).with("/api/v1/customers/5/events", {
-  			:basic_auth => { :username => "SITE_ID", :password => "API_KEY" },
-  			:body => anything()
-  		})
+    it "uses the site_id and api key for basic auth and sends the event name" do
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+        with(:body => "name=purchase").
+        to_return(:status => 200, :body => "", :headers => {})
 
       client.track(5, "purchase")
-  	end
+    end
 
-  	it "sends the event name" do
-  		Customerio::Client.should_receive(:post).with("/api/v1/customers/5/events", {
-  			:basic_auth => anything(),
-  			:body => { :name => "purchase", :data => {} }
-  		}).and_return(response)
+    it "sends any optional event attributes" do
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+         with(:body => {
+          :name => "purchase",
+          :data => {
+            :type => "socks",
+            :price => "13.99"
+          }
+        }).
+        to_return(:status => 200, :body => "", :headers => {})
 
-      client.track(5, "purchase")
-  	end
+      client.track(5, "purchase", :type => "socks", :price => "13.99")
+    end
 
-  	it "sends any optional event attributes" do
-  		Customerio::Client.should_receive(:post).with("/api/v1/customers/5/events", {
-  			:basic_auth => anything(),
-  			:body => {
-  				:name => "purchase",
-  			  :data => { :type => "socks", :price => "13.99" }
-  			}
-  		}).and_return(response)
+    it "copes with arrays" do
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+         with(:body => {
+          :name => "event",
+          :data => {
+            :things => ["a", "b", "c"]
+          }
+        }).
+        to_return(:status => 200, :body => "", :headers => {})
 
-      client.track(5, "purchase", :type => "socks", :price => "13.99")
-  	end
+      client.track(5, "event", :things => ["a", "b", "c"])
+    end
+
+    it "copes with hashes" do
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+         with(:body => {
+          :name => "event",
+          :data => {
+            :stuff => { :a => "b" }
+          }
+        }).
+        to_return(:status => 200, :body => "", :headers => {})
+
+      client.track(5, "event", :stuff => { :a => "b" })
+    end
 
     it "sends a POST request as json using json headers" do
       client = Customerio::Client.new("SITE_ID", "API_KEY", :json => true)
-  		Customerio::Client.should_receive(:post).with(
-        "/api/v1/customers/5/events", {
-          :basic_auth => anything(),
-          :body => MultiJson.dump({
-            :name => "purchase",
-            :data => { :type => "socks", :price => "13.99" }
-          }),
-        :headers=>{"Content-Type"=>"application/json"}}).and_return(response)
-      client.track(5, "purchase", :type => "socks", :price => "13.99")
-    end
+      data = { :type => "socks", :price => "13.99" }
+      body = { :name => "purchase", :data => data }
 
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+        with(:body => json(body),
+             :headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "", :headers => {})
 
-  	it "allows sending of a timestamp" do
-  		Customerio::Client.should_receive(:post).with("/api/v1/customers/5/events", {
-  			:basic_auth => anything(),
-  			:body => {
-  				:name => "purchase",
-  			  :data => { :type => "socks", :price => "13.99", :timestamp => 1561231234 },
-          :timestamp => 1561231234
-  			}
-  		}).and_return(response)
+      client.track(5, "purchase", data)
+    end
+
+    it "allows sending of a timestamp" do
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+        with(:body => {
+          :name => "purchase",
+          :data => {
+            :type => "socks",
+            :price => "13.99",
+            :timestamp => "1561231234"
+          },
+          :timestamp => "1561231234"
+        }).
+        to_return(:status => 200, :body => "", :headers => {})
 
       client.track(5, "purchase", :type => "socks", :price => "13.99", :timestamp => 1561231234)
-  	end
+    end
 
     it "doesn't send timestamp if timestamp is in milliseconds" do
-  		Customerio::Client.should_receive(:post).with("/api/v1/customers/5/events", {
-  			:basic_auth => anything(),
-  			:body => {
-  				:name => "purchase",
-  			  :data => { :type => "socks", :price => "13.99", :timestamp => 1561231234000 }
-  			}
-  		}).and_return(response)
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+        with(:body => {
+          :name => "purchase",
+          :data => {
+            :type => "socks",
+            :price => "13.99",
+            :timestamp => "1561231234000"
+          }
+        }).
+        to_return(:status => 200, :body => "", :headers => {})
 
       client.track(5, "purchase", :type => "socks", :price => "13.99", :timestamp => 1561231234000)
     end
@@ -204,74 +229,71 @@ describe Customerio::Client do
     it "doesn't send timestamp if timestamp is a date" do
       date = Time.now
 
-  		Customerio::Client.should_receive(:post).with("/api/v1/customers/5/events", {
-  			:basic_auth => anything(),
-  			:body => {
-  				:name => "purchase",
-  			  :data => { :type => "socks", :price => "13.99", :timestamp => date }
-  			}
-  		}).and_return(response)
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+        with(:body => {
+          :name => "purchase",
+          :data => {
+            :type => "socks",
+            :price => "13.99",
+            :timestamp => Time.now.to_s
+          }
+        }).
+        to_return(:status => 200, :body => "", :headers => {})
 
       client.track(5, "purchase", :type => "socks", :price => "13.99", :timestamp => date)
     end
 
-    it "doesn't send timestamp if timestamp isn't a integer" do
-  		Customerio::Client.should_receive(:post).with("/api/v1/customers/5/events", {
-  			:basic_auth => anything(),
-  			:body => {
-  				:name => "purchase",
-  			  :data => { :type => "socks", :price => "13.99", :timestamp => "Hello world" }
-  			}
-  		}).and_return(response)
+    it "doesn't send timestamp if timestamp isn't an integer" do
+      stub_request(:post, api_uri('/api/v1/customers/5/events')).
+        with(:body => {
+          :name => "purchase",
+          :data => {
+            :type => "socks",
+            :price => "13.99",
+            :timestamp => "Hello world"
+          }
+        }).
+
+        to_return(:status => 200, :body => "", :headers => {})
 
       client.track(5, "purchase", :type => "socks", :price => "13.99", :timestamp => "Hello world")
     end
 
     context "tracking an anonymous event" do
       it "sends a POST request to the customer.io's anonymous event API" do
-        Customerio::Client.should_receive(:post).with("/api/v1/events", anything()).and_return(response)
-        client.track("purchase")
-      end
-
-      it "uses the site_id and api key for basic auth" do
-        Customerio::Client.should_receive(:post).with("/api/v1/events", {
-          :basic_auth => { :username => "SITE_ID", :password => "API_KEY" },
-          :body => anything()
-        }).and_return(response)
-
-        client.track("purchase")
-      end
-
-      it "sends the event name" do
-        Customerio::Client.should_receive(:post).with("/api/v1/events", {
-          :basic_auth => anything(),
-          :body => { :name => "purchase", :data => {} }
-        }).and_return(response)
+        stub_request(:post, api_uri('/api/v1/events')).
+          with(:body => "name=purchase").
+          to_return(:status => 200, :body => "", :headers => {})
 
         client.track("purchase")
       end
 
       it "sends any optional event attributes" do
-        Customerio::Client.should_receive(:post).with("/api/v1/events", {
-          :basic_auth => anything(),
-          :body => {
+        stub_request(:post, api_uri('/api/v1/events')).
+          with(:body => {
             :name => "purchase",
-            :data => { :type => "socks", :price => "13.99" }
-          }
-        }).and_return(response)
+            :data => {
+              :type => "socks",
+              :price => "13.99"
+            }
+          }).
+          to_return(:status => 200, :body => "", :headers => {})
 
         client.track("purchase", :type => "socks", :price => "13.99")
       end
 
       it "allows sending of a timestamp" do
-        Customerio::Client.should_receive(:post).with("/api/v1/events", {
-          :basic_auth => anything(),
-          :body => {
+        stub_request(:post, api_uri('/api/v1/events')).
+          with(:body => {
             :name => "purchase",
-  			    :data => { :type => "socks", :price => "13.99", :timestamp => 1561231234 },
-            :timestamp => 1561231234
-          }
-        }).and_return(response)
+            :data => {
+              :type => "socks",
+              :price => "13.99",
+              :timestamp => "1561231234"
+            },
+            :timestamp => "1561231234"
+          }).
+          to_return(:status => 200, :body => "", :headers => {})
 
         client.track("purchase", :type => "socks", :price => "13.99", :timestamp => 1561231234)
       end
@@ -279,55 +301,50 @@ describe Customerio::Client do
   end
 
   describe "#anonymous_track" do
-    it "sends a POST request to the customer.io event API" do
-      Customerio::Client.should_receive(:post).with("/api/v1/events", anything()).and_return(response)
-      client.anonymous_track("purchase")
-    end
-
     it "raises an error if POST doesn't return a 2xx response code" do
-      Customerio::Client.should_receive(:post).and_return(double("Response", :code => 500))
-      lambda { client.anonymous_track("purchase") }.should raise_error(Customerio::Client::InvalidResponse)
-    end
-
-    it "uses the site_id and api key for basic auth" do
-      Customerio::Client.should_receive(:post).with("/api/v1/events", {
-        :basic_auth => { :username => "SITE_ID", :password => "API_KEY" },
-        :body => anything()
-      })
+      stub_request(:post, api_uri('/api/v1/events')).
+        with(:body => "name=purchase").
+        to_return(:status => 500, :body => "", :headers => {})
 
-      client.anonymous_track("purchase")
+      lambda { client.anonymous_track("purchase") }.should raise_error(Customerio::Client::InvalidResponse)
     end
 
-    it "sends the event name" do
-      Customerio::Client.should_receive(:post).with("/api/v1/events", {
-        :basic_auth => anything(),
-        :body => { :name => "purchase", :data => {} }
-      }).and_return(response)
+    it "uses the site_id and api key for basic auth and sends the event name" do
+      stub_request(:post, api_uri('/api/v1/events')).
+        with(:body => "name=purchase").
+        to_return(:status => 200, :body => "", :headers => {})
 
       client.anonymous_track("purchase")
     end
 
     it "sends any optional event attributes" do
-      Customerio::Client.should_receive(:post).with("/api/v1/events", {
-        :basic_auth => anything(),
-        :body => {
-          :name => "purchase",
-          :data => { :type => "socks", :price => "27.99" }
-        }
-      }).and_return(response)
+      stub_request(:post, api_uri('/api/v1/events')).
+          with(:body => {
+            :name => "purchase",
+            :data => {
+              :type => "socks",
+              :price => "27.99"
+            },
+          }).
+
+        to_return(:status => 200, :body => "", :headers => {})
 
       client.anonymous_track("purchase", :type => "socks", :price => "27.99")
     end
 
     it "allows sending of a timestamp" do
-      Customerio::Client.should_receive(:post).with("/api/v1/events", {
-        :basic_auth => anything(),
-        :body => {
-          :name => "purchase",
-          :data => { :type => "socks", :price => "27.99", :timestamp => 1561235678 },
-          :timestamp => 1561235678
-        }
-      }).and_return(response)
+      stub_request(:post, api_uri('/api/v1/events')).
+          with(:body => {
+            :name => "purchase",
+            :data => {
+              :type => "socks",
+              :price => "27.99",
+              :timestamp => "1561235678"
+            },
+            :timestamp => "1561235678"
+          }).
+
+        to_return(:status => 200, :body => "", :headers => {})
 
       client.anonymous_track("purchase", :type => "socks", :price => "27.99", :timestamp => 1561235678)
     end

data/spec/spec_helper.rb

@@ -2,11 +2,13 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'customerio'
-require 'fakeweb'
+require 'webmock'
 
-FakeWeb.allow_net_connect = false
+WebMock.disable_net_connect!
 
 require 'rspec'
+require 'webmock/rspec'
+
 RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = :should }
   config.mock_with(:rspec) { |c| c.syntax = :should }

metadata

@@ -1,51 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: customerio
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - John Allison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -59,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -73,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.6
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -103,6 +111,7 @@ files:
 - customerio.gemspec
 - lib/customerio.rb
 - lib/customerio/client.rb
+- lib/customerio/param_encoder.rb
 - lib/customerio/version.rb
 - spec/client_spec.rb
 - spec/spec_helper.rb