gocardless 1.9.0 → 1.10.0

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'active_support/hash_with_indifferent_access'
 require 'gocardless'
 
 def stub_get(client, data)
-  response = mock
+  response = double
   response.stub(:parsed).and_return(data)
 
   token = client.instance_variable_get(:@access_token)
@@ -13,3 +13,16 @@ def unset_ivar(obj, var)
   obj.instance_variable_set "@#{var}", nil if obj.instance_variable_get "@#{var}"
 end
 
+shared_examples_for "it has a query method for" do |status|
+  describe "##{status}?" do
+    context "when #{status}" do
+      let(:object) { described_class.new(:status => status) }
+      specify { object.send("#{status}?").should be_true }
+    end
+
+    context "when not #{status}" do
+      let(:object) { described_class.new }
+      specify { object.send("#{status}?").should be_false }
+    end
+  end
+end

data/spec/subscription_spec.rb

@@ -1,57 +1,20 @@
 require 'spec_helper'
 
 describe GoCardless::Subscription do
-  before :each do
-    @app_id = 'abc'
-    @app_secret = 'xyz'
-    GoCardless.account_details = {:app_id => @app_id, :app_secret => @app_secret,
-                                  :token  => 'xxx', :merchant_id => '1'}
-    @client = GoCardless.client
+  before do
+    GoCardless.account_details = {:app_id => 'abc', :app_secret => 'xyz',
+                                  :token  => 'xxx', :merchant_id => '123'}
   end
+  let(:client) { GoCardless.client }
+  let(:subscription) { GoCardless::Subscription.new(:id => '009988') }
 
   it "should be cancellable" do
-    s = GoCardless::Subscription.new_with_client(@client, :id => '009988')
-    @client.should_receive(:api_put).with('/subscriptions/009988/cancel')
-    s.cancel!
+    client.should_receive(:api_put).with('/subscriptions/009988/cancel')
+    subscription.cancel!
   end
 
-  describe "inactive query method" do
-    it "and_return true when the subscription status is inactive" do
-      GoCardless::Subscription.new(:status => 'inactive').inactive?.should be_true
-    end
-
-    it "and_return false otherwise" do
-      GoCardless::Subscription.new.inactive?.should be_false
-    end
-  end
-
-  describe "active query method" do
-    it "and_return true when the subscription status is active" do
-      GoCardless::Subscription.new(:status => 'active').active?.should be_true
-    end
-
-    it "and_return false otherwise" do
-      GoCardless::Subscription.new.active?.should be_false
-    end
-  end
-
-  describe "cancelled query method" do
-    it "and_return true when the subscription status is cancelled" do
-      GoCardless::Subscription.new(:status => 'cancelled').cancelled?.should be_true
-    end
-
-    it "and_return false otherwise" do
-      GoCardless::Subscription.new.cancelled?.should be_false
-    end
-  end
-
-  describe "expired query method" do
-    it "and_return true when the subscription status is expired" do
-      GoCardless::Subscription.new(:status => 'expired').expired?.should be_true
-    end
-
-    it "and_return false otherwise" do
-      GoCardless::Subscription.new.expired?.should be_false
-    end
-  end
+  it_behaves_like "it has a query method for", "inactive"
+  it_behaves_like "it has a query method for", "active"
+  it_behaves_like "it has a query method for", "cancelled"
+  it_behaves_like "it has a query method for", "expired"
 end

data/spec/user_spec.rb

@@ -1,33 +1,31 @@
 require 'spec_helper'
 
 describe GoCardless::User do
-  let(:user) { GoCardless::User.new(:id => 123, :first_name => first, :last_name => last) }
+  let(:user) { GoCardless::User.new(:first_name => first, :last_name => last) }
 
   describe "#name" do
-    subject { user.name }
-
     context "with first and last name" do
       let(:first) { "First" }
       let(:last) { "Last" }
-      it { should == "First Last" }
+      specify { user.name.should == "First Last" }
     end
 
     context "with first name only" do
       let(:first) { "First" }
       let(:last) { nil }
-      it { should == "First" }
+      specify { user.name.should == "First" }
     end
 
     context "with last name only" do
       let(:first) { nil }
       let(:last) { "Last" }
-      it { should == "Last" }
+      specify { user.name.should == "Last" }
     end
 
     context "with no first or last name" do
       let(:first) { nil }
       let(:last) { nil }
-      it { should == "" }
+      specify { user.name.should == "" }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gocardless
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Harry Marr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -117,7 +117,8 @@ files:
 - lib/gocardless/client.rb
 - lib/gocardless/errors.rb
 - lib/gocardless/merchant.rb
-- lib/gocardless/payment.rb
+- lib/gocardless/page.rb
+- lib/gocardless/paginator.rb
 - lib/gocardless/payout.rb
 - lib/gocardless/pre_authorization.rb
 - lib/gocardless/resource.rb
@@ -128,6 +129,8 @@ files:
 - spec/bill_spec.rb
 - spec/client_spec.rb
 - spec/gocardless_spec.rb
+- spec/page_spec.rb
+- spec/paginator_spec.rb
 - spec/pre_authorization_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
@@ -162,6 +165,8 @@ test_files:
 - spec/bill_spec.rb
 - spec/client_spec.rb
 - spec/gocardless_spec.rb
+- spec/page_spec.rb
+- spec/paginator_spec.rb
 - spec/pre_authorization_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb

data/lib/gocardless/payment.rb

@@ -1,9 +0,0 @@
-module GoCardless
-  class Payment < Resource
-    self.endpoint = '/payments/:id'
-
-    attr_accessor :amount, :currency, :status
-    reference_accessor :merchant_id, :user_id
-    date_accessor :created_at
-  end
-end