active_zuora 1.3.0 → 1.4.0

data/lib/zuora_client.rb

@@ -44,12 +44,17 @@ end
 
 module Zuora
   class Client
-    PROD_URL = 'https://www.zuora.com/apps/services/a/36.0'
-    SANDBOX_URL = 'https://apisandbox.zuora.com/apps/services/a/36.0'
+    API_VERSION = "37.0"
+    PROD_URL = "https://www.zuora.com/apps/services/a/#{API_VERSION}"
+    SANDBOX_URL = "https://apisandbox.zuora.com/apps/services/a/#{API_VERSION}"
+
+    def self.app_url
+      SANDBOX_URL
+    end
 
     def self.config
       return @config_hash if @config_hash
-      @config_hash = YAML.load_file(Zuora::CONFIG_FILE) if File.exist?(Zuora::CONFIG_FILE)
+      @config_hash = Zuora::CONFIG if defined?(Zuora::CONFIG)
       @config_hash ||= {}
     end
 
@@ -71,10 +76,10 @@ module Zuora
       @custom_fields = YAML.load_file(File.dirname(__FILE__) + '/../custom_fields.yml')
     end
 
-    def initialize(url=SANDBOX_URL)
+    def initialize(url=nil)
       $ZUORA_USER = self.class.config["username"]
       $ZUORA_PASSWORD = self.class.config["password"]
-      $ZUORA_ENDPOINT = url
+      $ZUORA_ENDPOINT = url || self.class.app_url
 
       @client = ZuoraInterface.new
 
@@ -84,34 +89,29 @@ module Zuora
     end
 
     def query(query_string)
+      # This will keep calling queryMore until all the results are retreived.
 
       query_string =~ /select\s+(.+)\s+from/i
       fields = ($1.split /,\s+/).map do |f|
         f.gsub!(/\b\w/) { $&.downcase }
       end
 
+      responses = []
       begin
-        response = @client.query(query_string)
-      rescue Exception => e
-        puts e.message
-      end
-
-      result = []
-      if response && response.result && response.result.size > 0
-        response.result.records.each do |record|
-          row = {}
-          fields.each do |f|
-            row[f] = record.send(f)
-          end
-          result << row
+        responses << @client.api_call(:query, query_string)
+        until responses.last.result.done
+          responses << @client.api_call(:query_more, responses.last.result.queryLocator)
         end
+      rescue Exception => e
+        $stderr.puts e.message
       end
-      result
+      # Capture all the records into one single array.
+      responses.map{ |response| response.result.size > 0 ? response.result.records : [] }.flatten
     end
 
     def subscribe(obj)
       begin
-        response = @client.subscribe(obj)
+        response = @client.api_call(:subscribe, obj)
         return response
       rescue Exception => e
         puts e.message
@@ -120,7 +120,7 @@ module Zuora
 
     def create(obj)
       begin
-        response = @client.create(obj)
+        response = @client.api_call(:create,obj)
         result = save_results_to_hash(response)
       rescue Exception => e
         puts e.message
@@ -130,7 +130,7 @@ module Zuora
 
     def generate(obj)
       begin
-        response = @client.generate(obj)
+        response = @client.api_call(:generate,obj)
         result = save_results_to_hash(response)
       rescue Exception => e
         puts e.message
@@ -140,7 +140,7 @@ module Zuora
 
     def update(obj)
       begin
-        response = @client.update(obj)
+        response = @client.api_call(:update, obj)
         result = save_results_to_hash(response)
       rescue Exception => e
         puts e.message
@@ -150,7 +150,7 @@ module Zuora
 
     def delete(type, ids)
       begin
-        response = @client.delete(type, ids)
+        response = @client.api_call(:delete, type, ids)
         result = save_results_to_hash(response)
       rescue Exception => e
         puts e.message
@@ -158,6 +158,10 @@ module Zuora
       result || []
     end
 
+    def amend(obj)
+      @client.api_call(:amend, obj)
+    end
+
     private
 
     def save_results_to_hash(save_results)

data/lib/zuora_interface.rb

@@ -1,6 +1,13 @@
 require 'zuora/api'
 
 class ZuoraInterface
+  begin
+    require 'system_timer'
+    SysTimer = SystemTimer
+  rescue LoadError
+    require 'timeout'
+    SysTimer = Timeout
+  end
 
   def make_account(accountName)
     acc = ZUORA::Account.new
@@ -93,11 +100,16 @@ class ZuoraInterface
     return val
   end
 
-  def query(query)
-    q = ZUORA::Query.new
-    q.queryString = query
-    results = @z.query(q)
-    return results
+  def api_call(call, *args)
+    SysTimer.timeout(120) { self.send(call, *args) }
+  end
+
+  def query(query_string)
+    @z.query(ZUORA::Query.new(query_string))
+  end
+
+  def query_more(query_locator)    
+    @z.queryMore(ZUORA::QueryMore.new(query_locator))
   end
 
   def create(objs)
@@ -123,6 +135,10 @@ class ZuoraInterface
     return @z.subscribe(sub)
   end
 
+  def amend(amend)
+    return @z.amend(amend)
+  end
+
   def get_object(query)
     object = lookup(query)
     unless object.result.size == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_zuora
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,75 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: soap4r
-  requirement: &70106566724560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: soap4r
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +85,15 @@ dependencies:
         version: 1.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *70106566724560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.8
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70106566720320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +101,12 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70106566720320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 description: A client for Zuora API
 email: anfleene@gmail.com
 executables: []
@@ -46,21 +120,39 @@ files:
 - active_zuora.gemspec
 - custom_fields.yml
 - lib/active_zuora.rb
+- lib/active_zuora/account.rb
+- lib/active_zuora/amendment.rb
+- lib/active_zuora/bill_run.rb
+- lib/active_zuora/contact.rb
+- lib/active_zuora/invoice.rb
+- lib/active_zuora/invoice_item.rb
+- lib/active_zuora/invoice_item_adjustment.rb
+- lib/active_zuora/invoice_payment.rb
+- lib/active_zuora/payment.rb
+- lib/active_zuora/payment_method.rb
+- lib/active_zuora/product.rb
+- lib/active_zuora/product_rate_plan.rb
+- lib/active_zuora/product_rate_plan_charge.rb
+- lib/active_zuora/product_rate_plan_charge_tier.rb
+- lib/active_zuora/product_rate_plan_charge_tier_data.rb
+- lib/active_zuora/rate_plan.rb
+- lib/active_zuora/rate_plan_charge.rb
+- lib/active_zuora/rate_plan_charge_data.rb
+- lib/active_zuora/rate_plan_charge_tier.rb
+- lib/active_zuora/rate_plan_data.rb
+- lib/active_zuora/refund.rb
+- lib/active_zuora/subscribe_options.rb
+- lib/active_zuora/subscribe_request.rb
+- lib/active_zuora/subscribe_with_existing_account_request.rb
+- lib/active_zuora/subscription.rb
+- lib/active_zuora/subscription_data.rb
+- lib/active_zuora/usage.rb
+- lib/active_zuora/zobject.rb
 - lib/zuora/ZUORA.rb
 - lib/zuora/ZUORADriver.rb
 - lib/zuora/ZUORAMappingRegistry.rb
 - lib/zuora/ZuoraServiceClient.rb
-- lib/zuora/account.rb
 - lib/zuora/api.rb
-- lib/zuora/contact.rb
-- lib/zuora/rate_plan.rb
-- lib/zuora/rate_plan_data.rb
-- lib/zuora/subscribe_options.rb
-- lib/zuora/subscribe_request.rb
-- lib/zuora/subscribe_with_existing_account_request.rb
-- lib/zuora/subscription.rb
-- lib/zuora/subscription_data.rb
-- lib/zuora/zobject.rb
 - lib/zuora_client.rb
 - lib/zuora_interface.rb
 - LICENSE
@@ -77,6 +169,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4160532751421098619
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Active Zuora

data/lib/zuora/account.rb

@@ -1,4 +0,0 @@
-module Zuora
-  class Account < ZObject
-  end
-end

data/lib/zuora/contact.rb

@@ -1,4 +0,0 @@
-module Zuora
-  class Contact < ZObject
-  end
-end

data/lib/zuora/rate_plan.rb

@@ -1,4 +0,0 @@
-module Zuora
-  class RatePlan < ZObject
-  end
-end

data/lib/zuora/subscribe_request.rb

@@ -1,4 +0,0 @@
-module Zuora
-  class SubscribeRequest < ZObject
-  end
-end

data/lib/zuora/subscription.rb

@@ -1,4 +0,0 @@
-module Zuora
-  class Subscription < ZObject
-  end
-end

data/lib/zuora/zobject.rb

@@ -1,52 +0,0 @@
-module Zuora
-  class ZObject < SimpleDelegator
-    def initialize(attributes={})
-      super(self.class.zobject_class.new).tap do |zobject|
-        attributes.each do |attr, value|
-          zobject.send("#{attr}=", value)
-        end
-      end
-    end
-
-    def to_zobject
-      __getobj__
-    end
-
-    def self.zobject_class
-      return @zobject_class if @zobject_class
-      klass_name = name.match(/(\w+)::(\w+)/)
-      @zobject_class = "#{klass_name[1].upcase}::#{klass_name[2]}".constantize
-    end
-
-    #TODO: This sucks attributes need to be clearly defined
-    def self.attribute_names
-      @attribute_names ||= zobject_class.instance_variable_get("@attributes").reject{|name| name == :fieldsToNull }
-    end
-
-    def self.where(conditions={})
-      zobjects = self.client.query("select #{self.attribute_names.join(", ")} from #{self.name.gsub(/Zuora::/,"")} where #{build_filter_statments(conditions)}")
-      zobjects.map{|zobject| self.new zobject }
-    end
-
-    def self.build_filter_statments(filter_statments)
-      filter_statments.map{|key, value|
-        value = "'#{value}'" if value.kind_of?(String)
-        "#{key} = #{value}"
-      }.join(" and ")
-    end
-
-    def self.find(id)
-      zobject = client.query("select #{attribute_names.join(", ")} from #{self.name.gsub(/Zuora::/,"")} where Id = '#{id}'").first
-      self.new zobject if zobject
-    end
-
-    def self.all
-      zobjects = client.query("select #{attribute_names.join(", ")} from #{self.name.gsub(/Zuora::/,"")}")
-      zobjects.map{|zobject| self.new zobject }
-    end
-
-    def self.client
-      @client ||= Zuora::Client.new
-    end
-  end
-end