sift 1.1.2 → 1.1.3

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+script: "bundle exec rake spec"
+rvm:
+  - 1.9.3
+  - 2.0.0
+env:
+  # None for now
+gemfile:
+  - Gemfile
+services:
+  # None for now
+notifications:
+  # None for now

data/lib/sift/client.rb

@@ -97,8 +97,8 @@ module Sift
 
       path ||= @path
       options = {
-        :body => MultiJson.dump(properties.merge({"$type" => event,
-                                                  "$api_key" => @api_key})),
+        :body => MultiJson.dump(delete_nils(properties).merge({"$type" => event,
+                                                               "$api_key" => @api_key}))
       }
       options.merge!(:timeout => timeout) unless timeout.nil?
       begin
@@ -155,7 +155,22 @@ module Sift
       raise(RuntimeError, "user_id must be a string") if user_id.nil? || user_id.to_s.empty?
 
       path = Sift.current_users_label_api_path(user_id)
-      track("$label", properties, timeout, path)
+      track("$label", delete_nils(properties), timeout, path)
+    end
+
+    private
+    def delete_nils(properties)
+      properties.delete_if do |k, v|
+        case v
+        when nil
+          true
+        when Hash
+          delete_nils(v)
+          false
+        else
+          false
+        end
+      end
     end
   end
 end

data/lib/sift/version.rb

@@ -1,3 +1,3 @@
 module Sift
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/sift.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   # Gems that must be intalled for sift to compile and build
   s.add_development_dependency "rspec", "~> 2.14.1"
-  s.add_development_dependency "fakeweb", "~> 1.3.0"
+  s.add_development_dependency "webmock", "~> 1.16.0"
 
   # Gems that must be intalled for sift to work
   s.add_dependency "httparty", ">= 0.11.0"

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 
 require "bundler/setup"
 require "sift"
-require "fakeweb"
+require "webmock/rspec"
 
 # Setup Fakeweb
-FakeWeb.allow_net_connect = false
+WebMock.disable_net_connect!
 
 RSpec.configure do |config|
 end

data/spec/unit/client_label_spec.rb

@@ -19,10 +19,9 @@ describe Sift::Client do
     response_json = { :status => 0, :error_message => "OK" }
     user_id = "frodo_baggins"
 
-    FakeWeb.register_uri(:post, fully_qualified_users_labels_endpoint(user_id),
-                         :body => MultiJson.dump(response_json),
-                         :status => [Net::HTTPOK, "OK"],
-                         :content_type => "text/json")
+    stub_request(:post, "https://api.siftscience.com/v203/users/frodo_baggins/labels").
+      with(:body => '{"$reasons":["$fake"],"$is_bad":true,"$description":"Listed a fake item","$type":"$label","$api_key":"foobar"}').
+      to_return(:body => MultiJson.dump(response_json), :status => 200, :content_type => "text/json")
 
     api_key = "foobar"
     properties = valid_label_properties

data/spec/unit/client_spec.rb

@@ -18,7 +18,7 @@ describe Sift::Client do
       :$billing_region => "CA",
       :$billing_country => "US",
       :$billing_zip => "94131",
-      :$buyer_email => "mike@example.com"
+      :$user_email => "mike@example.com"
     }
   end
 
@@ -54,13 +54,13 @@ describe Sift::Client do
 
   it "Doesn't raise an exception on Net/HTTP errors" do
 
-    FakeWeb.register_uri(:post, fully_qualified_api_endpoint,
-                         :body => nil, :exception => Net::HTTPError)
 
     api_key = "foobar"
     event = "$transaction"
     properties = valid_transaction_properties
 
+    stub_request(:any, /.*/).to_return(:status => 401)
+
     # This method should just return false -- the track call failed because
     # of an HTTP error
     Sift::Client.new(api_key).track(event, properties).should eq(nil)
@@ -70,10 +70,11 @@ describe Sift::Client do
 
     response_json = { :status => 0, :error_message => "OK" }
 
-    FakeWeb.register_uri(:post, fully_qualified_api_endpoint,
-                         :body => MultiJson.dump(response_json),
-                         :status => [Net::HTTPOK, "OK"],
-                         :content_type => "text/json")
+    stub_request(:post, "https://api.siftscience.com/v203/events").
+      with { |request|
+        parsed_body = JSON.parse(request.body)
+        parsed_body.should include("$buyer_user_id" => "123456")
+      }.to_return(:status => 200, :body => MultiJson.dump(response_json), :headers => {})
 
     api_key = "foobar"
     event = "$transaction"
@@ -85,6 +86,32 @@ describe Sift::Client do
     response.api_error_message.should eq("OK")
   end
 
+  it "Successfuly scrubs nils" do
+
+    response_json = { :status => 0, :error_message => "OK" }
+
+    stub_request(:post, "https://api.siftscience.com/v203/events").
+      with { |request|
+        parsed_body = JSON.parse(request.body)
+        parsed_body.should_not include("fake_property")
+        parsed_body.should include("sub_object" => {"one" => "two"})
+      }.to_return(:status => 200, :body => MultiJson.dump(response_json), :headers => {})
+
+    api_key = "foobar"
+    event = "$transaction"
+    properties = valid_transaction_properties.merge(
+      "fake_property" => nil,
+      "sub_object" => {
+        "one" => "two",
+        "three" => nil
+      }
+    )
+    response = Sift::Client.new(api_key).track(event, properties)
+    response.ok?.should eq(true)
+    response.api_status.should eq(0)
+    response.api_error_message.should eq("OK")
+  end
+
   it "Successfully fetches a score" do
 
     api_key = "foobar"
@@ -104,10 +131,8 @@ describe Sift::Client do
       :error_message => "OK"
     }
 
-    FakeWeb.register_uri(:get, Sift::Client::API_ENDPOINT + '/v203/score/'+user_id+'/?api_key=foobar',
-                         :body => MultiJson.dump(response_json),
-                         :status => [Net::HTTPOK, "OK"],
-                         :content_type => "text/json")
+    stub_request(:get, "https://api.siftscience.com/v203/score/247019/?api_key=foobar").
+      to_return(:status => 200, :body => MultiJson.dump(response_json), :headers => {})
 
     response = Sift::Client.new(api_key).score(user_id)
     response.ok?.should eq(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sift
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - HISTORY
 - README.rdoc