killbill-client 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48cdaec43be15b9b60a9f514d96410c2e1e680e0
-  data.tar.gz: 77718ed5919682cbbd05215f23977132ff659a98
+  metadata.gz: 387b8be2ba133da76bc8ec821c2daac5698472da
+  data.tar.gz: 059c9a722277434e4fe97e367c6e3c61cff6e014
 SHA512:
-  metadata.gz: 5e6ac6d1723ae4845e4e56af7c13c783d06665fe8a16c19082b2f39142b38edd9bdd8a2c6e7ceb05e049d5286aa1abc727027f860d57566f0a773b237895b1c9
-  data.tar.gz: ec0d266d12ca09c07de46fe96788b17e62deec948eb6e42e35bb5404c44d033a7f3435ef1c05522048b072bfd6553001346da33f19c385f140fbc69ee140a759
+  metadata.gz: 2f6a28af56caa4cd8cd67079d8d5e7af482ba45d25de207914a3e78992973bb4fee062e454aafbdcf30b97735cc7bbe0997034009c2039039cf7a7a2244cc352
+  data.tar.gz: 7f9bdaab2f87fc4c8773b2123b0ccbcb40aea7d5e1f130a246252f62c59bae4f768c4b8a42b60950db332bff80c744f1cd645934e61c54734d5b37a57071705b

data/README.md

@@ -11,7 +11,7 @@ Examples
 
 The following script will tag a list of accounts with OVERDUE_ENFORCEMENT_OFF and AUTO_PAY_OFF:
 
-```
+```ruby
 require 'killbill_client'
 
 KillBillClient.url = 'http://127.0.0.1:8080'
@@ -34,7 +34,7 @@ Tests
 
 To run the integration tests:
 
-```
+```bash
 rake test:remote:spec
 ```
 

data/lib/killbill_client/models/account.rb

@@ -110,7 +110,7 @@ module KillBillClient
       end
 
       def auto_pay_off?(options = {})
-        control_tag_off?(AUTO_PAY_OFF_ID, options)
+        control_tag?(AUTO_PAY_OFF_ID, options)
       end
 
       def set_auto_pay_off(user = nil, reason = nil, comment = nil, options = {})
@@ -118,11 +118,11 @@ module KillBillClient
       end
 
       def remove_auto_pay_off(user = nil, reason = nil, comment = nil, options = {})
-        remove_tag_from_definition_id(AUTO_PAY_OFF_ID.id, user, reason, comment, options)
+        remove_tag_from_definition_id(AUTO_PAY_OFF_ID, user, reason, comment, options)
       end
 
       def auto_invoicing_off?(options = {})
-        control_tag_off?(AUTO_INVOICING_OFF_ID, options)
+        control_tag?(AUTO_INVOICING_OFF_ID, options)
       end
 
       def set_auto_invoicing_off(user = nil, reason = nil, comment = nil, options = {})
@@ -134,7 +134,7 @@ module KillBillClient
       end
 
       def overdue_enforcement_off?(options = {})
-        control_tag_off?(OVERDUE_ENFORCEMENT_OFF_ID, options)
+        control_tag?(OVERDUE_ENFORCEMENT_OFF_ID, options)
       end
 
       def set_overdue_enforcement_off(user = nil, reason = nil, comment = nil, options = {})
@@ -146,7 +146,7 @@ module KillBillClient
       end
 
       def written_off?(options = {})
-        control_tag_off?(WRITTEN_OFF_ID, options)
+        control_tag?(WRITTEN_OFF_ID, options)
       end
 
       def set_written_off(user = nil, reason = nil, comment = nil, options = {})
@@ -158,7 +158,7 @@ module KillBillClient
       end
 
       def manual_pay?(options = {})
-        control_tag_off?(MANUAL_PAY_ID, options)
+        control_tag?(MANUAL_PAY_ID, options)
       end
 
       def set_manual_pay(user = nil, reason = nil, comment = nil, options = {})
@@ -170,7 +170,7 @@ module KillBillClient
       end
 
       def test?(options = {})
-        control_tag_off?(TEST_ID, options)
+        control_tag?(TEST_ID, options)
       end
 
       def set_test(user = nil, reason = nil, comment = nil, options = {})

data/lib/killbill_client/models/helpers/tag_helper.rb

@@ -31,20 +31,11 @@ module KillBillClient
       def set_tags(tag_definition_ids, user = nil, reason = nil, comment = nil, options = {})
         current_tag_definition_ids = tags(false, 'NONE', options).map { |tag| tag.tag_definition_id }
 
-        # Find tags to remove
-        tags_to_remove             = Set.new
-        current_tag_definition_ids.each do |current_tag_definition_id|
-          tags_to_remove << current_tag_definition_id unless tag_definition_ids.include?(current_tag_definition_id)
-        end
-
-        # Find tags to add
-        tags_to_add = Set.new
-        tag_definition_ids.each do |new_tag_definition_id|
-          tags_to_add << new_tag_definition_id unless current_tag_definition_ids.include?(new_tag_definition_id)
-        end
+        tags_to_remove = current_tag_definition_ids - tag_definition_ids
+        tags_to_add = tag_definition_ids - current_tag_definition_ids
 
-        remove_tags_from_definition_ids(tags_to_remove.to_a, user, reason, comment, options) unless tags_to_remove.empty?
-        add_tags_from_definition_ids(tags_to_add.to_a, user, reason, comment, options) unless tags_to_add.empty?
+        remove_tags_from_definition_ids(tags_to_remove.uniq, user, reason, comment, options) unless tags_to_remove.empty?
+        add_tags_from_definition_ids(tags_to_add.uniq, user, reason, comment, options) unless tags_to_add.empty?
       end
 
       def add_tag_from_definition_id(tag_definition_id, user = nil, reason = nil, comment = nil, options = {})
@@ -55,11 +46,10 @@ module KillBillClient
         remove_tags_from_definition_ids([tag_definition_id], user, reason, comment, options)
       end
 
-      def control_tag_off?(control_tag_definition_id, options)
-        res = tags('NONE', options)
-        !((res || []).select do |t|
+      def control_tag?(control_tag_definition_id, options)
+        tags(false, 'NONE', options).any? do |t|
           t.tag_definition_id == control_tag_definition_id
-        end.first.nil?)
+        end
       end
 
       module ClassMethods

data/lib/killbill_client/models/payment_method.rb

@@ -2,6 +2,7 @@ module KillBillClient
   module Model
     class PaymentMethod < PaymentMethodAttributes
       KILLBILL_API_PAYMENT_METHODS_PREFIX = "#{KILLBILL_API_PREFIX}/paymentMethods"
+      EXTERNAL_PAYMENT = '__EXTERNAL_PAYMENT__'.freeze
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
 

data/lib/killbill_client/version.rb

@@ -1,7 +1,7 @@
 module KillBillClient
   module Version
     MAJOR = 0
-    MINOR = 14
+    MINOR = 15
     PATCH = 0
     PRE = nil
 

data/spec/killbill_client/remote/model_spec.rb

@@ -94,7 +94,7 @@ describe KillBillClient::Model do
     pm = KillBillClient::Model::PaymentMethod.new
     pm.account_id = account.account_id
     pm.is_default = true
-    pm.plugin_name = '__EXTERNAL_PAYMENT__'
+    pm.plugin_name = KillBillClient::Model::PaymentMethod::EXTERNAL_PAYMENT
     pm.plugin_info = {}
     pm.payment_method_id.should be_nil
 

metadata

@@ -1,65 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Killbill core team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-  prerelease: false
-  type: :development
 description: An API client library for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -167,26 +167,32 @@ homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.6
+signing_key: 
 specification_version: 4
 summary: Kill Bill client library.
-test_files: []
+test_files:
+- spec/killbill_client/model_relation_spec.rb
+- spec/killbill_client/remote/api_spec.rb
+- spec/killbill_client/remote/model_spec.rb
+- spec/killbill_client/resource_spec.rb
+- spec/killbill_client/resources_spec.rb
+- spec/spec_helper.rb