killbill-client 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a994063768b26d9a7b03c3f13cababeaf7fb4514
-  data.tar.gz: c1fd0c432a3e6308aa84af6c13f84df53893f54f
+  metadata.gz: 0bd357f949dbce5ad4dd1324014a786f49542582
+  data.tar.gz: 6e42622b6f4cf94f8e5fcb6db1ad27ec5d1146b8
 SHA512:
-  metadata.gz: 697e6139c8ed803cdbba9c06bbeeabbdf5f2a6e412cbd72ff15a628b4a7eef1f60bfed0efbfb970238b4d25fba2a33fdaeedd886f0bcb1c43a7490545bd8c05f
-  data.tar.gz: 6e8adeba7717eb345fb380eb265313f87902b445a84f8cc37cd467497ffe97a741288bb988f4c34fe8c743d0f1cf59dd60e03af749d4cfea4eedad67f5fb6fc9
+  metadata.gz: 527d3f8621051a3ee35e0c464490bf2042ac0aecf8edcb882e45f9b8648eb0a59f11ea94dd09edcb3aa7f600b8dba90a322c409aad67f9260acb3b5261811879
+  data.tar.gz: a4346e0938adac5c102387423f3d3a6f8e78ffb15182ed0c63198a6efb9d871b34c395b5c4b6e2adc34ee822fbef28c7b8f987a971b013ca6bf76de2adba4244

data/lib/killbill_client/models/catalog.rb

@@ -30,9 +30,8 @@ module KillBillClient
         end
 
         def get_tenant_catalog(options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Retrieving a catalog is only supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Retrieving a catalog is only supported in multi-tenant mode")
 
           get KILLBILL_API_CATALOG_PREFIX,
               {},
@@ -42,9 +41,8 @@ module KillBillClient
         end
 
         def upload_tenant_catalog(catalog_xml, user = nil, reason = nil, comment = nil, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Uploading a catalog is only supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Uploading a catalog is only supported in multi-tenant mode")
 
           post KILLBILL_API_CATALOG_PREFIX,
                catalog_xml,

data/lib/killbill_client/models/invoice.rb

@@ -193,9 +193,9 @@ module KillBillClient
 
 
         def get_invoice_template(is_manual_pay, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Retrieving an invoice template supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Retrieving an invoice template supported in multi-tenant mode")
+
 
           get "#{KILLBILL_API_INVOICES_PREFIX}/#{is_manual_pay ? "manualPayTemplate" : "template"}",
               {},
@@ -205,9 +205,9 @@ module KillBillClient
         end
 
         def upload_invoice_template(invoice_template, is_manual_pay, delete_if_exists, user = nil, reason = nil, comment = nil, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Uploading a invoice template is only supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Uploading a invoice template is only supported in multi-tenant mode")
+
 
           params                  = {}
           params[:deleteIfExists] = delete_if_exists if delete_if_exists
@@ -226,9 +226,9 @@ module KillBillClient
         end
 
         def get_invoice_translation(locale, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Retrieving an invoice template supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Retrieving an invoice translation supported in multi-tenant mode")
+
 
           get "#{KILLBILL_API_INVOICES_PREFIX}/translation/#{locale}",
               {},
@@ -238,9 +238,9 @@ module KillBillClient
         end
 
         def upload_invoice_translation(invoice_translation, locale, delete_if_exists, user = nil, reason = nil, comment = nil, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Uploading a invoice template is only supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Uploading a invoice translation is only supported in multi-tenant mode")
+
 
           params                  = {}
           params[:deleteIfExists] = delete_if_exists if delete_if_exists
@@ -260,9 +260,8 @@ module KillBillClient
 
 
         def get_catalog_translation(locale, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Retrieving a catalog translation is only supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Retrieving a catalog translation is only supported in multi-tenant mode")
 
           get "#{KILLBILL_API_INVOICES_PREFIX}/catalogTranslation/#{locale}",
               {},
@@ -272,9 +271,8 @@ module KillBillClient
         end
 
         def upload_catalog_translation(catalog_translation, locale, delete_if_exists, user = nil, reason = nil, comment = nil, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Uploading a catalog translation is only supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Uploading a catalog translation is only supported in multi-tenant mode")
 
           params                  = {}
           params[:deleteIfExists] = delete_if_exists if delete_if_exists

data/lib/killbill_client/models/overdue.rb

@@ -6,6 +6,9 @@ module KillBillClient
 
       class << self
         def get_tenant_overdue_config(options = {})
+
+          require_multi_tenant_options!(options, "Retrieving an overdue config is only supported in multi-tenant mode")
+
           get KILLBILL_API_OVERDUE_PREFIX,
               {},
               {
@@ -14,6 +17,9 @@ module KillBillClient
         end
 
         def upload_tenant_overdue_config(overdue_config_xml, user = nil, reason = nil, comment = nil, options = {})
+
+          require_multi_tenant_options!(options, "Uploading an overdue config is only supported in multi-tenant mode")
+
           post KILLBILL_API_OVERDUE_PREFIX,
                overdue_config_xml,
                {

data/lib/killbill_client/models/resource.rb

@@ -17,7 +17,7 @@ module KillBillClient
       def initialize(hash = nil)
         # Make sure we support ActiveSupport::HashWithIndifferentAccess for Kaui
         if hash.respond_to?(:each)
-          hash.each do |key,value|
+          hash.each do |key, value|
             send("#{Utils.underscore key.to_s}=", value)
           end
         end
@@ -62,7 +62,7 @@ module KillBillClient
             when %r{application/pdf}
               response.body
             when %r{text/html}
-               response.body
+              response.body
             when %r{text/plain}
               response.body
             when %r{application/xml}
@@ -168,96 +168,105 @@ module KillBillClient
           attributes = self.instance_variable_get('@json_attributes')
 
           (
-           class << self;
-             self
-           end).send(:define_method, :json_attributes) do
-             attributes
-           end
-         end
-
-         def has_many(attr_name, type = nil)
-           send("attr_accessor", attr_name.to_sym)
-
-           #add it to attribute_names
-           @@attribute_names[self.name] = {} unless @@attribute_names[self.name]
-           @@attribute_names[self.name][attr_name.to_sym] = {:type => type,  :cardinality => :many }
-         end
-
-         def has_one(attr_name, type = nil)
-           send("attr_accessor", attr_name.to_sym)
-
-           #add it to attribute_names
-           @@attribute_names[self.name] = {} unless @@attribute_names[self.name]
-           @@attribute_names[self.name][attr_name.to_sym] = { :type => type, :cardinality => :one }
-         end
-
-         #hack to cater the api return attributes and javax attributes without editing gen scripts
-         #call only after its declared as a instance_method using attr_accessor
-         def create_alias(new_name, old_name)
-           alias_method new_name.to_sym, old_name.to_sym #getter
-           alias_method "#{new_name}=".to_sym, "#{old_name}=".to_sym #setter
-         end
-
-         # Extract the session id from a response
-         def extract_session_id(response)
-           # The Set-Cookie header looks like
-           # "set-cookie"=>["JSESSIONID=16; Path=/; HttpOnly", "rememberMe=deleteMe; Path=/; Max-Age=0; Expires=Sat, 17-Aug-2013 23:39:37 GMT"],
-           session_cookie = response['set-cookie']
-           unless session_cookie.nil?
-             session_cookie.split(';').each do |chunk|
-               chunk.strip!
-               key, value = chunk.split('=')
-               return value if key == 'JSESSIONID'
-             end
-           end
-           nil
-         end
-       end #end self methods
-
-       # Set on create call
-       attr_accessor :uri
-
-       def to_hash
-         json_hash = {}
-         self.class.json_attributes.each do |name|
-           value = self.send(name)
-           unless value.nil?
-             json_hash[Utils.camelize name, :lower] = _to_hash(value)
-           end
-         end
-         json_hash
-       end
-
-       def _to_hash(value)
-         if value.is_a?(Resource)
-           value.to_hash
-         elsif value.is_a?(Array)
-           value.map { |v| _to_hash(v) }
-         else
-           value
-         end
-       end
-
-       def to_json(*args)
-         to_hash.to_json(*args)
-       end
-
-       def refresh(options = {}, clazz=self.class)
-         if @uri
-           self.class.get @uri, {}, options, clazz
-         else
-           self
-         end
-       end
-
-       def ==(o)
-         o.class == self.class && o.hash == hash
-       end
-       alias_method :eql?, :==
-
-       def hash
-         to_hash.hash
-       end
+          class << self;
+            self
+          end).send(:define_method, :json_attributes) do
+            attributes
+          end
+        end
+
+        def has_many(attr_name, type = nil)
+          send("attr_accessor", attr_name.to_sym)
+
+          #add it to attribute_names
+          @@attribute_names[self.name] = {} unless @@attribute_names[self.name]
+          @@attribute_names[self.name][attr_name.to_sym] = {:type => type, :cardinality => :many}
+        end
+
+        def has_one(attr_name, type = nil)
+          send("attr_accessor", attr_name.to_sym)
+
+          #add it to attribute_names
+          @@attribute_names[self.name] = {} unless @@attribute_names[self.name]
+          @@attribute_names[self.name][attr_name.to_sym] = {:type => type, :cardinality => :one}
+        end
+
+        #hack to cater the api return attributes and javax attributes without editing gen scripts
+        #call only after its declared as a instance_method using attr_accessor
+        def create_alias(new_name, old_name)
+          alias_method new_name.to_sym, old_name.to_sym #getter
+          alias_method "#{new_name}=".to_sym, "#{old_name}=".to_sym #setter
+        end
+
+        # Extract the session id from a response
+        def extract_session_id(response)
+          # The Set-Cookie header looks like
+          # "set-cookie"=>["JSESSIONID=16; Path=/; HttpOnly", "rememberMe=deleteMe; Path=/; Max-Age=0; Expires=Sat, 17-Aug-2013 23:39:37 GMT"],
+          session_cookie = response['set-cookie']
+          unless session_cookie.nil?
+            session_cookie.split(';').each do |chunk|
+              chunk.strip!
+              key, value = chunk.split('=')
+              return value if key == 'JSESSIONID'
+            end
+          end
+          nil
+        end
+      end #end self methods
+
+      # Set on create call
+      attr_accessor :uri
+
+      def to_hash
+        json_hash = {}
+        self.class.json_attributes.each do |name|
+          value = self.send(name)
+          unless value.nil?
+            json_hash[Utils.camelize name, :lower] = _to_hash(value)
+          end
+        end
+        json_hash
+      end
+
+      def _to_hash(value)
+        if value.is_a?(Resource)
+          value.to_hash
+        elsif value.is_a?(Array)
+          value.map { |v| _to_hash(v) }
+        else
+          value
+        end
+      end
+
+      def to_json(*args)
+        to_hash.to_json(*args)
+      end
+
+      def refresh(options = {}, clazz=self.class)
+        if @uri
+          self.class.get @uri, {}, options, clazz
+        else
+          self
+        end
+      end
+
+
+      def require_multi_tenant_options!(options, msg)
+        if options[:api_key].nil? || options[:api_secret].nil?
+          raise ArgumentError, msg
+        end
+      end
+
+
+      def ==(o)
+        o.class == self.class && o.hash == hash
+      end
+
+      alias_method :eql?, :==
+
+      def hash
+        to_hash.hash
+      end
     end
-   end
- end
+  end
+end

data/lib/killbill_client/models/tenant.rb

@@ -19,9 +19,8 @@ module KillBillClient
         end
 
         def get_tenant_plugin_config(plugin_name, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Retrieving a plugin config is only supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Retrieving a plugin config is only supported in multi-tenant mode")
 
           uri =  KILLBILL_API_TENANTS_PREFIX + "/uploadPluginConfig/" + plugin_name
           get uri,
@@ -32,9 +31,8 @@ module KillBillClient
         end
 
         def upload_tenant_plugin_config(plugin_name, plugin_config, user = nil, reason = nil, comment = nil, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Uploading a plugin config is only supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Uploading a plugin config is only supported in multi-tenant mode")
 
           uri =  KILLBILL_API_TENANTS_PREFIX + "/uploadPluginConfig/" + plugin_name
           post uri,
@@ -51,9 +49,8 @@ module KillBillClient
         end
 
         def delete_tenant_plugin_config(plugin_name, user = nil, reason = nil, comment = nil, options = {})
-          if options[:api_key].nil? || options[:api_secret].nil?
-            raise ArgumentError, "Uploading a plugin config is only supported in multi-tenant mode"
-          end
+
+          require_multi_tenant_options!(options, "Uploading a plugin config is only supported in multi-tenant mode")
 
           uri =  KILLBILL_API_TENANTS_PREFIX + "/uploadPluginConfig/" + plugin_name
           delete uri,
@@ -68,6 +65,7 @@ module KillBillClient
                }.merge(options)
 
         end
+
       end
 
 

data/lib/killbill_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Killbill core team