gocardless 1.3.1 → 1.3.2

data/.travis.yml

@@ -7,7 +7,6 @@ rvm:
   - jruby-19mode
   - rbx-18mode
   - ruby-head
-  - jruby-head
   - ree
 notifications:
   email:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.2 - October 01, 2012
+
+- Fix filtering on sub resource methods, e.g. `merchant.bills(source_id: 'x')`
+
 ## 1.3.1 - September 26, 2012
 
 - Remove explicit rubygems requires

data/lib/gocardless/merchant.rb

@@ -11,40 +11,5 @@ module GoCardless
                   :pending_balance,
                   :next_payout_amount
     date_accessor :created_at, :next_payout_date
-
-    def subscriptions(params = {})
-      path = "/merchants/#{self.id}/subscriptions"
-      @client.api_get(path, params).map do |attrs|
-        GoCardless::Subscription.new_with_client(@client, attrs)
-      end
-    end
-
-    def pre_authorizations(params = {})
-      path = "/merchants/#{self.id}/pre_authorizations"
-      @client.api_get(path, params).map do |attrs|
-        GoCardless::PreAuthorization.new_with_client(@client, attrs)
-      end
-    end
-
-    def users(params = {})
-      path = "/merchants/#{self.id}/users"
-      @client.api_get(path, params).map do |attrs|
-        GoCardless::User.new_with_client(@client, attrs)
-      end
-    end
-
-    def bills(params = {})
-      path = "/merchants/#{self.id}/bills"
-      @client.api_get(path, params).map do |attrs|
-        GoCardless::Bill.new_with_client(@client, attrs)
-      end
-    end
-
-    def payments(params = {})
-      path = "/merchants/#{self.id}/payments"
-      @client.api_get(path, params).map do |attrs|
-        GoCardless::Payment.new_with_client(@client, attrs)
-      end
-    end
   end
 end

data/lib/gocardless/resource.rb

@@ -3,36 +3,31 @@ require 'date'
 module GoCardless
   class Resource
     def initialize(hash = {})
-      # Handle sub resources
-      sub_resource_uris = hash.delete('sub_resource_uris')
-      unless sub_resource_uris.nil?
-        # Need to define a method for each sub resource
-        sub_resource_uris.each do |name,uri|
-          uri = URI.parse(uri)
-
-          # Convert the query string to a hash
-          default_query = if uri.query.nil? || uri.query == ''
-            nil
-          else
-            Hash[CGI.parse(uri.query).map { |k,v| [k,v.first] }]
-          end
-
-          # Strip api prefix from path
-          path = uri.path.sub(%r{^/api/v\d+}, '')
+      # Define an object singleton method for each sub resource
+      hash.delete('sub_resource_uris') { [] }.each do |name, uri|
+        uri = URI.parse(uri)
+
+        # Convert the query string to a params hash
+        default_query = if uri.query.nil? || uri.query.empty?
+          {}
+        else
+          Hash[CGI.parse(uri.query).map { |k,v| [k,v.first] }]
+        end
 
-          # Modify the instance's metaclass to add the method
-          metaclass = class << self; self; end
-          metaclass.send(:define_method, name) do |*args|
-            # 'name' will be something like 'bills', convert it to Bill and
-            # look up the resource class with that name
-            class_name = Utils.camelize(Utils.singularize(name.to_s))
-            klass = GoCardless.const_get(class_name)
+        # Strip api prefix from path
+        path = uri.path.sub(%r{^/api/v\d+}, '')
+
+        # Modify the instance's metaclass to add the method
+        metaclass = class << self; self; end
+        metaclass.send(:define_method, name) do |*args|
+          # 'name' will be something like 'bills', convert it to Bill and
+          # look up the resource class with that name
+          class_name = Utils.camelize(Utils.singularize(name.to_s))
+          klass = GoCardless.const_get(class_name)
+          query = default_query.merge(args.first || {})
+          client.api_get(path, query).map do |attrs|
             # Convert the results to instances of the looked-up class
-            params = args.first || {}
-            query = default_query.nil? ? nil : default_query.merge(params)
-            client.api_get(path, query).map do |attrs|
-              klass.new(attrs).tap { |m| m.client = client }
-            end
+            klass.new_with_client(client, attrs)
           end
         end
       end

data/lib/gocardless/version.rb

@@ -1,3 +1,3 @@
 module GoCardless
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.3.2'.freeze
 end

data/spec/resource_spec.rb

@@ -376,7 +376,7 @@ describe GoCardless::Resource do
       r.bills
     end
 
-    it "adds provided params to query string params" do
+    it "adds provided params to existing query string params" do
       client = mock()
       params = { 'merchant_id' => '1', :amount => '10.00' }
       client.expects(:api_get).with(anything, params).returns([])
@@ -384,6 +384,18 @@ describe GoCardless::Resource do
       r.bills(:amount => '10.00')
     end
 
+    it "adds provided params when there are no existing query string params" do
+      client = mock()
+      params = { :source_id => 'xxx' }
+      client.expects(:api_get).with(anything, params).returns([])
+      r = @test_resource.new_with_client(client, {
+        'sub_resource_uris' => {
+          'bills' => 'https://test.com/merchants/1/bills'
+        }
+      })
+      r.bills(:source_id => 'xxx')
+    end
+
     it "return instances of the correct resource class" do
       client = stub(:api_get => [{:id => 1}])
       r = @test_resource.new_with_client(client, @attrs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gocardless
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -140,7 +140,6 @@ files:
 - spec/bill_spec.rb
 - spec/client_spec.rb
 - spec/gocardless_spec.rb
-- spec/merchant_spec.rb
 - spec/pre_authorization_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
@@ -174,7 +173,6 @@ test_files:
 - spec/bill_spec.rb
 - spec/client_spec.rb
 - spec/gocardless_spec.rb
-- spec/merchant_spec.rb
 - spec/pre_authorization_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb

data/spec/merchant_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe GoCardless::Merchant do
-  before :each do
-    @app_id = 'abc'
-    @app_secret = 'xyz'
-    @client = GoCardless::Client.new(:app_id => @app_id, :app_secret => @app_secret)
-    @client.access_token = 'TOKEN123 manage_merchant:123'
-    @redirect_uri = 'http://test.com/cb'
-  end
-
-  index_methods = [:subscriptions, :pre_authorizations, :users, :payments, :bills]
-
-  index_methods.each do |method|
-    it "##{method} works correctly" do
-      merchant = GoCardless::Merchant.new_with_client(@client)
-
-      data = [{:id => 1}, {:id => 2}]
-      stub_get(@client, data)
-
-      merchant.send(method).should be_a Array
-      merchant.send(method).length.should == 2
-      merchant.send(method).zip(data).each do |obj,attrs|
-        class_name = GoCardless::Utils.camelize(method.to_s).sub(/s$/, '')
-        obj.class.to_s.should == "GoCardless::#{class_name}"
-        attrs.each { |k,v| obj.send(k).should == v }
-      end
-    end
-  end
-end
-