chargify2 0.2.4 → 0.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6920a74f0ebd8aa7b4fd70ed631e84bffcb8a90f
+  data.tar.gz: c038127114e6c5175c39e09713a49af4371dcf21
+SHA512:
+  metadata.gz: 07f2e1f040ff64ae1c4537e5a7cf00cd32d5561b513f1493cd9b40805787e8c84a9563424f59f513050ac0ab5be6da991ab8ab0a833a9052e59903e349571cbe
+  data.tar.gz: 0da07436757d5d32df2d153b5c16e677d5a6360acf43ac1d0235d4b63fc16a53749179940ddf4a4475ab2fcbb565a208f9da8db4ce06e56aa7fb6ee38cc4ec73

data/.travis.yml

@@ -1,7 +1,9 @@
+language: ruby
+before_install:
+  - gem update --system
+  - gem install bundler
+  - bundle --version
 rvm:
   - 1.8.7
-  - 1.9.2
+  - 1.9.3
   - ree
-branches:
-  only:
-    - master

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chargify2 (0.2.4)
+    chargify2 (0.2.5)
       hashery (~> 2.1.0)
       hashie
       httparty
@@ -22,17 +22,17 @@ GEM
       ffi (~> 1.0, >= 1.0.6)
     columnize (0.3.6)
     crack (0.3.1)
-    debugger (1.2.0)
+    debugger (1.3.1)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
+      debugger-ruby_core_source (~> 1.1.8)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
+    debugger-ruby_core_source (1.1.8)
     diff-lcs (1.1.3)
     ffi (1.1.5)
     hashery (2.1.0)
-    hashie (1.2.0)
+    hashie (2.0.3)
     httparty (0.10.2)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
@@ -40,7 +40,7 @@ GEM
       addressable
     mime-types (1.19)
     multi_json (1.3.6)
-    multi_xml (0.5.2)
+    multi_xml (0.5.3)
     nokogiri (1.5.5)
     rack (1.4.1)
     rack-test (0.6.1)

data/README.md

@@ -1,4 +1,4 @@
-Chargify API V2 Ruby Wrapper [![build status](https://secure.travis-ci.org/chargify/chargify2.png)](http://travis-ci.org/chargify/chargify2)
+Chargify API V2 Ruby Wrapper [![build status](https://travis-ci.org/chargify/chargify2.png?branch=master)](http://travis-ci.org/chargify/chargify2)
 ============================
 
 This gem is meant to be used with the [Chargify Direct API](http://docs.chargify.com/chargify-direct-introduction).

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/chargify2.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.6.2'
 
   s.name    = 'chargify2'
-  s.version = '0.2.4'
+  s.version = '0.2.5'
   s.date    = '2011-10-28'
   s.summary = %q{Chargify API V2 Ruby Wrapper}
   s.description = ''

data/lib/chargify2/client.rb

@@ -16,22 +16,22 @@ module Chargify2
     attr_reader :api_password
     attr_reader :api_secret
     attr_reader :base_uri
-    
+
     def initialize(args = {})
       options = args.symbolize_keys
-      
+
       @api_id       = options[:api_id]
       @api_password = options[:api_password]
       @api_secret   = options[:api_secret]
       @base_uri     = options[:base_uri] || BASE_URI
     end
-    
+
     def direct
       Chargify2::Direct.new(self)
     end
-    
+
     def calls
       Chargify2::CallResource.new(self)
     end
   end
-end
+end

data/lib/chargify2/resource.rb

@@ -12,22 +12,12 @@ module Chargify2
     base_uri Chargify2::Client::BASE_URI
     headers 'Content-Type' => 'application/json', 'Accept' => 'application/json'
     format :json
-    
-    def self.path(resource_path)
+
+    def self.path(resource_path = nil)
+      return @path unless resource_path
       @path = resource_path
     end
 
-    def self.uri
-      if @path.nil? || @path.to_s.size == 0
-        raise ResourceError, "No path configured.  Please use a defined Resource."
-      end
-      "#{base_uri}/#{@path}"
-    end
-    
-    def uri
-      self.class.uri
-    end
-    
     # Define the representation class for this resource
     def self.representation(klass = nil)
       unless klass.nil?
@@ -35,26 +25,38 @@ module Chargify2
       end
       @@representation ||= nil
     end
-    
+
     def initialize(client)
       @client = client
-      @username = client.api_id
-      @password = client.api_password
-      
-      self.class.base_uri(client.base_uri)
-      self.class.basic_auth(@username, @password)
+      @base_uri = client.base_uri
+      @auth = {:username => client.api_id, :password => client.api_password}
     end
-    
-    def self.read(id, query = {})
-      response = get("#{uri}/#{id}", :query => query.empty? ? nil : query)
+
+    def self.read(id, query = {}, options = {})
+      options.merge!(:query => query.empty? ? nil : query)
+      response = get("/#{path}/#{id}", options)
+
       response_hash = response[representation.to_s.downcase.split('::').last] || {}
       representation.new(response_hash.symbolize_keys)
     end
-    
-    def read(id, query = {})
-      self.class.read(id, query)
+
+    def read(id, query = {}, options = {})
+      self.class.read(id, query, merge_options(options))
+    end
+
+    private
+    def merge_options(options)
+      if @base_uri
+        options.merge!(:base_uri => @base_uri)
+      end
+
+      if @auth
+        options.merge!(:basic_auth => @auth)
+      end
+
+      options
     end
   end
-  
+
   class ResourceError < StandardError; end
-end
+end

data/spec/call_resource_spec.rb

@@ -2,55 +2,74 @@ require 'spec_helper'
 
 module Chargify2
   describe CallResource do
-    it "should have a URI of 'https://api.chargify.com/api/v2/calls'" do
-      CallResource.uri.should == 'https://api.chargify.com/api/v2/calls'
+    it "should have a path of 'calls'" do
+      CallResource.path.should == 'calls'
     end
 
     it "represents with the Call class" do
       CallResource.representation.should == Call
     end
-    
-    describe "#read" do
-      it "performs a GET request to 'https://api.chargify.com/api/v2/calls/123' (without authentication) when called with '123'" do
-        # What is this 'a_request' method?
-        pending 'Rewrite this test.'
-        WebMock.stub_request(:get, 'https://api.chargify.com/api/v2/calls/123')
-        CallResource.read('123')
-        a_request(:get, 'https://api.chargify.com/api/v2/calls/123').should have_been_made.once
-      end
-      
-      it "returns a Call representation" do
-        WebMock.stub_request(:get, 'https://api.chargify.com/api/v2/calls/123')
-        CallResource.read('123').should be_a(Call)
-      end
-    end
-    
-    context "instance configured with a client and a non-standard base URI" do
-      it "has a URI of 'http://www.example.com/calls'" do
-        base_uri = 'http://www.example.com'
-        client = Client.new(valid_client_credentials.merge(:base_uri => base_uri))
-        CallResource.new(client).uri.should == 'http://www.example.com/calls'
+
+    context 'without an instance configured with a client' do
+      describe '.read' do
+        it "performs a GET request to 'https://api.chargify.com/api/v2/calls/123' (without authentication) when called with '123'" do
+          WebMock.stub_request(:get, 'https://api.chargify.com/api/v2/calls/123')
+          CallResource.read('123')
+          a_request(:get, 'https://api.chargify.com/api/v2/calls/123').should have_been_made.once
+        end
+
+        it "returns a Call representation" do
+          WebMock.stub_request(:get, 'https://api.chargify.com/api/v2/calls/123')
+          CallResource.read('123').should be_a(Call)
+        end
       end
     end
-    
-    context "instance configured with a valid client" do
-      before(:each) do
-        @client = Client.new(valid_client_credentials)
-        @call_resource = CallResource.new(@client)
+
+    context 'with an instance configured with a client' do
+      let(:client) { Client.new(valid_client_credentials) }
+      let!(:call_resource) { CallResource.new(client) }
+
+      describe '.read' do
+        it 'ignores the instance configuration and uses class defaults' do
+          WebMock.stub_request(:get, 'https://api.chargify.com/api/v2/calls/123')
+          CallResource.read('123')
+          a_request(:get, 'https://api.chargify.com/api/v2/calls/123').should have_been_made.once
+        end
       end
-      
-      it "performs a GET request to 'https://<api_login>:<api_password>@api.chargify.com/api/v2/calls/123' (with authentication) when called with '123'" do
-        # What is this 'a_request' method?
-        pending 'Rewrite this test.'
-        WebMock.stub_request(:get, "https://#{@client.api_id}:#{@client.api_password}@api.chargify.com/api/v2/calls/123")
-        CallResource.read('123')
-        a_request(:get, "https://#{@client.api_id}:#{@client.api_password}@api.chargify.com/api/v2/calls/123").should have_been_made.once
+
+      describe '#read' do
+        it "performs a GET request to 'https://<api_login>:<api_password>@api.chargify.com/api/v2/calls/123' (with authentication) when called with '123'" do
+          WebMock.stub_request(:get, client_authenticated_uri(client, '/calls/123'))
+          call_resource.read('123')
+          a_request(:get, client_authenticated_uri(client, '/calls/123')).should have_been_made.once
+        end
+
+        it "returns a Call representation" do
+          WebMock.stub_request(:get, client_authenticated_uri(client, '/calls/123'))
+          call_resource.read('123').should be_a(Call)
+        end
       end
-      
-      it "returns a Call representation" do
-        WebMock.stub_request(:get, "https://#{@client.api_id}:#{@client.api_password}@api.chargify.com/api/v2/calls/123")
-        CallResource.read('123').should be_a(Call)
+
+      context 'with a non-standard base URI' do
+        let(:base_uri) { 'http://www.example.com' }
+        let(:client) { Client.new(valid_client_credentials.merge(:base_uri => base_uri)) }
+
+        describe '#read' do
+          it "has a URI of 'http://www.example.com/calls'" do
+            WebMock.stub_request(:get, client_authenticated_uri(client, '/calls/123'))
+            call_resource.read('123')
+            a_request(:get, client_authenticated_uri(client, '/calls/123')).should have_been_made.once
+          end
+        end
       end
     end
+
+    def client_authenticated_uri(client, path)
+      uri = URI(client.base_uri)
+      uri.user = client.api_id
+      uri.password = client.api_password
+
+      uri.to_s + path
+    end
   end
 end

data/spec/direct_secure_parameters_spec.rb

@@ -100,17 +100,20 @@ module Chargify2
     describe "#encoded_data" do
       it "turns the data hash in to query string format" do
         sp = Direct::SecureParameters.new({'data' => {'one' => 'two', 'three' => 'four'}}, client)
-        sp.encoded_data.should == "one=two&three=four"
+        sp.encoded_data.should include 'one=two'
+        sp.encoded_data.should include 'three=four'
       end
 
       it "turns a nested data hash in to nested query string format" do
         sp = Direct::SecureParameters.new({'data' => {'one' => {'two' => {'three' => 'four'}}, 'foo' => 'bar'}}, client)
-        sp.encoded_data.should == "one[two][three]=four&foo=bar"
+        sp.encoded_data.should include 'one[two][three]=four'
+        sp.encoded_data.should include 'foo=bar'
       end
 
       it "performs percent encoding on unsafe characters" do
         sp = Direct::SecureParameters.new({'data' => {'redirect_uri' => 'http://www.example.com', 'sentence' => 'Michael was here!'}}, client)
-        sp.encoded_data.should == "redirect_uri=http%3A%2F%2Fwww.example.com&sentence=Michael+was+here%21"
+        sp.encoded_data.should include 'redirect_uri=http%3A%2F%2Fwww.example.com'
+        sp.encoded_data.should include 'sentence=Michael+was+here%21'
       end
     end
 
@@ -184,6 +187,10 @@ module Chargify2
         data = {'one' => 'two', 'three' => {'four' => "http://www.example.com"}}
         sp = Direct::SecureParameters.new({'timestamp' => timestamp, 'nonce' => nonce, 'data' => data}, client)
 
+        # Rack::Utils.build_nested_query puts the string elements in a different order in different rubies
+        # Stub here to test the signature method.  We test the encoded_data method above.
+        sp.stub(:encoded_data).and_return("one=two&three[four]=http%3A%2F%2Fwww.example.com")
+
         # Used the generator here: http://hash.online-convert.com/sha1-generator
         # ... with message: "1c016050-498a-012e-91b1-005056a216ab12345678one=two&three[four]=http%3A%2F%2Fwww.example.com"
         # ... and secret: "p5lxQ804MYtwZecFWNOT"

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'bundler'
 Bundler.require(:default, :development)
+require 'webmock/rspec'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chargify2
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Michael Klett
@@ -13,161 +12,141 @@ cert_chain: []
 date: 2011-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   name: rack
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: hashery
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
   name: hashie
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  type: :development
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2.2
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
   name: capybara
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: vcr
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   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
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
-  name: yard
+  type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -206,28 +185,24 @@ files:
 homepage: http://github.com/chargify/chargify2
 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
-      segments:
-      - 0
-      hash: 4516507312252909387
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 3
 summary: Chargify API V2 Ruby Wrapper