killbill-client 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33483de38f929a119b1f8fe0397187cd2a1c68a2
-  data.tar.gz: b1191889e0ce3bdc4e8ac4e725e46460399f66e4
+  metadata.gz: 96687e10cab322b867c1387c71d4f30c81ec0328
+  data.tar.gz: 5cb7fa0eece1a870191f7bf21ae67e3ce7f8d486
 SHA512:
-  metadata.gz: dc46633af7cda5602fce3ff92914112f3724b5c7ef9531903747e4683983b04e1cc2c80da03e01529b22d06482e00a89051e7c245be15571966ba5a179787643
-  data.tar.gz: 625605bd4e11bf53fdb149965737527d5e0c808a88723405852cc020781c89d140c20a783567741514b94a53b418bf29d43347f240fc1eebfe52620b1dff6f04
+  metadata.gz: b0db60114e796354ecc0eb01762e2285bb677706be18735e69a7f82f28d1dcd2206d9116b982719eeefc3810de5d114fd907ef3ca4d1117157c95f42b19c844a
+  data.tar.gz: a1c2bc7aa82982dc2b7076675f38e963fb0177f52bdc3e5486530cfdee37ac37d430eb2f56e2227eade58dc23b51186135c4306ea8376729d5ce2acbd09a32b1

data/lib/killbill_client/models/bundle.rb

@@ -1,10 +1,33 @@
 module KillBillClient
   module Model
     class Bundle < BundleAttributes
+
+      KILLBILL_API_BUNDLES_PREFIX = "#{KILLBILL_API_PREFIX}/bundles"
+
       has_many :subscriptions, KillBillClient::Model::Subscription
       has_many :audit_logs, KillBillClient::Model::AuditLog
+
+      class << self
+        def find_by_id(bundle_id, options = {})
+          get "#{KILLBILL_API_BUNDLES_PREFIX}/#{bundle_id}",
+              {},
+              options
+        end
+
+        # Return the active one
+        def find_by_external_key(external_key, options = {})
+          get "#{KILLBILL_API_BUNDLES_PREFIX}?externalKey=#{external_key}",
+              {},
+              options
+        end
+
+        # Return active and inactive ones
+        def find_all_by_account_id_and_external_key(account_id, external_key, options = {})
+          get "#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/bundles?externalKey=#{external_key}",
+              {},
+              options
+        end
+      end
     end
   end
 end
-
-

data/lib/killbill_client/models/resource.rb

@@ -204,6 +204,15 @@ module KillBillClient
            self
          end
        end
+
+       def ==(o)
+         o.class == self.class && o.to_hash == to_hash
+       end
+       alias_method :eql?, :==
+
+       def hash
+         to_hash.hash
+       end
      end
    end
  end

data/lib/killbill_client/models/subscription.rb

@@ -6,11 +6,7 @@ module KillBillClient
 
       KILLBILL_API_ENTITLEMENT_PREFIX = "#{KILLBILL_API_PREFIX}/subscriptions"
 
-      KILLBILL_API_BUNDLE_PREFIX = "#{KILLBILL_API_PREFIX}/bundles"
-
       class << self
-
-
         def find_by_id(subscription_id,  options = {})
           get "#{KILLBILL_API_ENTITLEMENT_PREFIX}/#{subscription_id}",
               {},
@@ -18,7 +14,7 @@ module KillBillClient
         end
 
         def find_by_bundle_id(bundle_id, options = {})
-          get "#{KILLBILL_API_BUNDLE_PREFIX}/#{bundle_id}/subscriptions",
+          get "#{Bundle::KILLBILL_API_BUNDLE_PREFIX}/#{bundle_id}/subscriptions",
               {},
               options
         end

data/lib/killbill_client/version.rb

@@ -2,7 +2,7 @@ module KillBillClient
   module Version
     MAJOR = 0
     MINOR = 4
-    PATCH = 5
+    PATCH = 6
     PRE = nil
 
     VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze

data/spec/killbill_client/remote/model_spec.rb

@@ -173,6 +173,18 @@ describe KillBillClient::Model do
     account.bundles.size.should == 1
     account.bundles[0].subscriptions.size.should == 1
     account.bundles[0].subscriptions[0].subscription_id.should == sub.subscription_id
+    bundle = account.bundles[0]
+
+    # Verify we can retrieve it by id
+    KillBillClient::Model::Bundle.find_by_id(bundle.bundle_id).should == bundle
+
+    # Verify we can retrieve it by external key
+    KillBillClient::Model::Bundle.find_by_external_key(bundle.external_key).should == bundle
+
+    # Verify we can retrieve it by account id and external key
+    bundles = KillBillClient::Model::Bundle.find_all_by_account_id_and_external_key(account.account_id, bundle.external_key)
+    bundles.size.should == 1
+    bundles[0].should == bundle
   end
 
   it 'should manipulate tag definitions' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json