beeleads 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 70d75aa6337b2acdd3b033376719c0d0a26ba945
+  data.tar.gz: 04c73f75dae7a50ee9392a9e88c541c68f402231
+SHA512:
+  metadata.gz: e0f6aeefcc5bc627b80df3efd4198d1667138beef8d7249905df16a8590487b00d26c0b9c65a1e59af876efc32ec27b968e38728127d3dd7e4c0369d6a24443f
+  data.tar.gz: d3b49639412f29d7ba2217ca355df3cb38eb1dd0c13184873a1d45401bb685d1f7cefa31525a047d858d0625abef5fa44f2fb1914768939a212e67c5a49c4312

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.0.0

data/README.md

@@ -1,5 +1,7 @@
 # Beeleads
 
+[![Build Status](https://travis-ci.org/decioferreira/beeleads.png?branch=master)](https://travis-ci.org/decioferreira/beeleads)
+
 A Ruby interface to the Beeleads API.
 
 ## Installation
@@ -20,18 +22,52 @@ Or install it yourself as:
 
 In order to use Beeleads' Lead Integration API (version 1.0) make sure you have the following information:
 
- * Affiliate ID
- * API Secret
- * Offer ID
+* Affiliate ID
+* API Secret
+* Offer ID
 
 If you are missing any of this info, please contact suporte@beeleads.com.br.
 
 ```ruby
 require 'beeleads'
 client = Beeleads::Client.new({:api_affiliate_id => ENV['API_AFFILIATE_ID'], :api_secret => ENV['API_SECRET'], :api_offer_id => ENV['API_OFFER_ID']})
-client.lead({'email' => 'sample@example.net', 'firstname' => 'Tiago'})
+response = client.lead({'email' => 'sample@example.net', 'firstname' => 'Tiago'})
 ```
 
+The result has the following structure:
+
+```ruby
+{
+  "request" => {
+    "time" => "2013-03-29 10:10:00",
+    "data" => {
+      "token" => "0d91dc50fc537bf975d91468efd381a1d8c250e1",
+      "affiliate_id" => "1234",
+      "offer_id" => "0",
+      "field" => {
+        "email" => "sample@example.net",
+        "firstname" => "Tiago"
+      }
+    }
+  },
+  "response" => {
+    "status" => 200,
+    "message" => "OK"
+    "data" => {
+      "lead_id" => "573a872f9f68149b867dde997f5160f00f79cff3",
+      "status"=>"PENDING_APPROVAL"
+    }
+  }
+}
+```
+
+The response status codes can be:
+
+* 200 - OK
+* 400 - Invalid Request Data
+* 401 - Invalid Token
+* 500 - Internal Error
+
 ## Contributing
 
 1. Fork it

data/beeleads.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake"
 
-  spec.add_development_dependency 'rspec', '~> 2.13.0'
+  spec.add_development_dependency 'rspec', '~> 3.1.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
 end

data/lib/beeleads.rb

@@ -32,7 +32,12 @@ module Beeleads
     end
 
     def self.token_query(data)
-      encoded_form_data = URI.encode_www_form(data)
+      URI.encode_www_form(sanitized_data(data))
+    end
+
+    def self.sanitized_data(data)
+      data_without_nil = Hash[data.map{ |k, v| [k, v || ''] }]
+      Hash[data_without_nil.sort_by(&:first)]
     end
   end
 end

data/lib/beeleads/version.rb

@@ -1,3 +1,3 @@
 module Beeleads
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/beeleads_spec.rb

@@ -5,7 +5,7 @@ describe Beeleads::Client do
   describe 'api_url' do
     it 'has a default value' do
       client = Beeleads::Client.new()
-      client.instance_variable_get(:@api_url).should eq('https://hive.bldstools.com/api.php/v1/lead/')
+      expect(client.instance_variable_get(:@api_url)).to eq('https://hive.bldstools.com/api.php/v1/lead/')
     end
   end
 
@@ -13,13 +13,13 @@ describe Beeleads::Client do
     %w(api_url api_affiliate_id api_secret api_offer_id).each do |k|
       it 'should set the #{k} option' do
         client = Beeleads::Client.new({k.to_sym => k})
-        client.instance_variable_get(:"@#{k}").should eq(k)
+        expect(client.instance_variable_get(:"@#{k}")).to eq(k)
       end
     end
 
     it 'should not set the any_other option' do
       client = Beeleads::Client.new({:any_other => 'something'})
-      client.instance_variable_get(:@any_other).should be_nil
+      expect(client.instance_variable_get(:@any_other)).to be_nil
     end
   end
 
@@ -28,33 +28,55 @@ describe Beeleads::Client do
     let(:lead) { { :email => 'sample@example.net', :firstname => 'Tiago' } }
 
     before :each do
-      Beeleads::Client.stub(:token).with('secret', lead) { 'token' }
+      allow(Beeleads::Client).to receive(:token).with('secret', lead) { 'token' }
       stub_request(:get, 'https://hive.bldstools.com/api.php/v1/lead/').with(:query => {'token' => 'token', 'affiliate_id' => 123, 'offer_id' => 7, :field => lead}).to_return(:body => {'result' => 'test'}.to_json)
       @response = subject.lead(lead)
     end
 
     it 'should make a get request' do
-      a_request(:get, 'https://hive.bldstools.com/api.php/v1/lead/').with(:query => {'token' => 'token', 'affiliate_id' => 123, 'offer_id' => 7, 'field' => lead}).should have_been_made.once
+      expect(a_request(:get, 'https://hive.bldstools.com/api.php/v1/lead/').with(:query => {'token' => 'token', 'affiliate_id' => 123, 'offer_id' => 7, 'field' => lead})).to have_been_made.once
     end
 
-    it 'should make the request without peer verification' do
-      pending
-    end
+    xit 'should make the request without peer verification'
 
     it 'should return JSON parsed body' do
-      @response.should eq({'result' => 'test'})
+      expect(@response).to eq({'result' => 'test'})
     end
   end
 
   describe '.token' do
+    def beeleads_token(params)
+      Beeleads::Client.class_eval { token('yoursecret', params) }
+    end
+
     it 'should return the correct token' do
-      Beeleads::Client.class_eval { token('yoursecret', { :email => 'sample@example.net', :firstname => 'Tiago' }) }.should eq('534da26a597e62b65b25711eb200197fc59ceb14')
+      expect(beeleads_token({ :email => 'sample@example.net', :firstname => 'Tiago' })).to eq('534da26a597e62b65b25711eb200197fc59ceb14')
+    end
+
+    it 'should return the same token when the params order are different' do
+      expect(beeleads_token({ :email => 'sample@example.net', :firstname => 'Tiago' })).
+        to eq(beeleads_token({ :firstname => 'Tiago', :email => 'sample@example.net' }))
     end
   end
 
   describe '.token_query' do
+    def token_query(params)
+      Beeleads::Client.class_eval { token_query(params) }
+    end
+
     it 'should return the correct encoded form data' do
-      Beeleads::Client.class_eval { token_query({ :email => 'sample@example.net', :firstname => 'Tiago' }) }.should eq('email=sample%40example.net&firstname=Tiago')
+      expect(token_query({ :email => 'sample@example.net', :firstname => 'Tiago' })).
+        to eq('email=sample%40example.net&firstname=Tiago')
+    end
+
+    it 'should convert nil to "" (empty string)' do
+      expect(token_query({ :email => 'sample@example.net', :firstname => nil})).
+        to eq('email=sample%40example.net&firstname=')
+    end
+
+    it 'has keys in alphabetical order' do
+      expect(token_query({ :firstname => 'Tiago', :email => 'sample@example.net' })).
+        to eq('email=sample%40example.net&firstname=Tiago')
     end
   end
 end

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ require 'webmock/rspec'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: beeleads
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Décio Ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby interface to the Beeleads API.
@@ -114,8 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -128,33 +116,26 @@ files:
 homepage: https://github.com/decioferreira/beeleads
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 218675633
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 218675633
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby interface to the Beeleads API.
 test_files:
 - spec/beeleads_spec.rb