zuora4r 1.0.9 → 1.1.0

data/Rakefile

@@ -5,13 +5,13 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "zuora4r"
-    gem.version = "1.0.9"
+    gem.version = "1.1.0"
     gem.summary = "Zuora4r"
     gem.description = "A client for Zuora API"
     gem.email = "gene@ning.com"
     gem.homepage = "http://github.com/cloocher/zuora4r"
     gem.authors = ["Cloocher"]
-    gem.files = FileList["CHANGES", "zuora4r.gemspec", "Rakefile", "README", "VERSION",
+    gem.files = FileList["CHANGES", "zuora4r.gemspec", "Rakefile", "README", "VERSION", "custom_fields.yml",
         "lib/**/*", "bin/**/*"]
     gem.add_dependency "soap4r", ">= 1.5.8"
     gem.add_dependency "json_pure", ">= 1.4.6"

data/custom_fields.yml

@@ -0,0 +1,5 @@
+# custom fields go here
+# ex:
+#Account:
+#  FullName
+#  Locale

data/lib/zuora/ZUORA.rb

@@ -558,8 +558,17 @@ class ProductRatePlanCharge < ZObject
   attr_accessor :productRatePlanId
   attr_accessor :type
   attr_accessor :uOM
+  attr_accessor :chargeModel
+  attr_accessor :revRecCode
+  attr_accessor :triggerEvent
+  attr_accessor :chargeType
+  attr_accessor :billingPeriod
+  attr_accessor :billCycleType
+  attr_accessor :billingPeriodAlignement
+  attr_accessor :revRecTriggerCondition
+  attr_accessor :productRatePlanChargeTierData
 
-  def initialize(fieldsToNull = [], id = nil, accountingCode = nil, defaultQuantity = nil, description = nil, maxQuantity = nil, minQuantity = nil, model = nil, name = nil, productRatePlanId = nil, type = nil, uOM = nil)
+  def initialize(fieldsToNull = [], id = nil, accountingCode = nil, defaultQuantity = nil, description = nil, maxQuantity = nil, minQuantity = nil, model = nil, name = nil, productRatePlanId = nil, type = nil, uOM = nil, chargeModel = nil, revRecCode=nil, triggerEvent=nil, chargeType=nil, billingPeriod=nil, billCycleType=nil, billingPeriodAlignement=nil, revRecTriggerCondition=nil, productRatePlanChargeTierData=nil)
     @fieldsToNull = fieldsToNull
     @id = id
     @accountingCode = accountingCode
@@ -572,9 +581,27 @@ class ProductRatePlanCharge < ZObject
     @productRatePlanId = productRatePlanId
     @type = type
     @uOM = uOM
+    @chargeModel = chargeModel
+    @revRecCode=revRecCode,
+    @triggerEvent=triggerEvent,
+    @chargeType=chargeType,
+    @billingPeriod=billingPeriod,
+    @billCycleType=billCycleType,
+    @billingPeriodAlignement=billingPeriodAlignement
+    @revRecTriggerCondition=revRecTriggerCondition
+    @productRatePlanChargeTierData=productRatePlanChargeTierData
   end
 end
 
+class ProductRatePlanChargeTierData < ZObject
+  attr_accessor :productRatePlanChargeTier
+
+  def initialize(productRatePlanChargeTier = nil)
+    @productRatePlanChargeTier = productRatePlanChargeTier
+  end
+end
+
+
 # {http://object.api.zuora.com/}ProductRatePlanChargeTier
 #   fieldsToNull - SOAP::SOAPString
 #   id - (any)
@@ -591,8 +618,10 @@ class ProductRatePlanChargeTier < ZObject
   attr_accessor :productRatePlanChargeId
   attr_accessor :startingUnit
   attr_accessor :tier
+  attr_accessor :active
+  attr_accessor :currency
 
-  def initialize(fieldsToNull = [], id = nil, endingUnit = nil, price = nil, productRatePlanChargeId = nil, startingUnit = nil, tier = nil)
+  def initialize(fieldsToNull = [], id = nil, endingUnit = nil, price = nil, productRatePlanChargeId = nil, startingUnit = nil, tier = nil, active=nil, currency=nil)
     @fieldsToNull = fieldsToNull
     @id = id
     @endingUnit = endingUnit
@@ -600,6 +629,8 @@ class ProductRatePlanChargeTier < ZObject
     @productRatePlanChargeId = productRatePlanChargeId
     @startingUnit = startingUnit
     @tier = tier
+    @active = active
+    @currency = currency
   end
 end
 

data/lib/zuora/ZUORAMappingRegistry.rb

@@ -265,7 +265,25 @@ module DefaultMappingRegistry
       ["model", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "Model")], [0, 1]],
       ["productRatePlanId", [nil, XSD::QName.new(NsObjectApiZuoraCom, "ProductRatePlanId")], [0, 1]],
       ["type", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "Type")], [0, 1]],
-      ["uOM", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "UOM")], [0, 1]]
+      ["uOM", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "UOM")], [0, 1]],
+      ["name", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "Name")], [0, 1]],
+      ["chargeModel", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "ChargeModel")], [0, 1]],
+      ["revRecCode", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "RevRecCode")], [0, 1]],
+      ["triggerEvent", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "TriggerEvent")], [0, 1]],
+      ["chargeType", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "ChargeType")], [0, 1]],
+      ["billingPeriod", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "BillingPeriod")], [0, 1]],
+      ["billCycleType", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "BillCycleType")], [0, 1]],
+      ["billingPeriodAlignement", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "BillingPeriodAlignement")], [0, 1]],
+      ["revRecTriggerCondition", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "RevRecTriggerCondition")], [0, 1]],
+      ["productRatePlanChargeTierData", ["ZUORA::ProductRatePlanChargeTierData", XSD::QName.new(NsObjectApiZuoraCom, "ProductRatePlanChargeTierData")], [0, 1]]
+    ]
+  )
+
+  EncodedRegistry.register(
+    :class => ZUORA::ProductRatePlanChargeTierData,
+    :schema_type => XSD::QName.new(NsApiZuoraCom, "ProductRatePlanChargeTierData"),
+    :schema_element => [
+      ["productRatePlanChargeTier", ["ZUORA::ProductRatePlanChargeTier[]", XSD::QName.new(NsApiZuoraCom, "ProductRatePlanChargeTier")], [0, nil]]
     ]
   )
 
@@ -280,7 +298,9 @@ module DefaultMappingRegistry
       ["price", ["SOAP::SOAPDouble", XSD::QName.new(NsObjectApiZuoraCom, "Price")], [0, 1]],
       ["productRatePlanChargeId", [nil, XSD::QName.new(NsObjectApiZuoraCom, "ProductRatePlanChargeId")], [0, 1]],
       ["startingUnit", ["SOAP::SOAPDouble", XSD::QName.new(NsObjectApiZuoraCom, "StartingUnit")], [0, 1]],
-      ["tier", ["SOAP::SOAPInt", XSD::QName.new(NsObjectApiZuoraCom, "Tier")], [0, 1]]
+      ["tier", ["SOAP::SOAPInt", XSD::QName.new(NsObjectApiZuoraCom, "Tier")], [0, 1]],
+      ["active", ["SOAP::SOAPBoolean", XSD::QName.new(NsObjectApiZuoraCom, "Active")], [0, 1]],
+      ["currency", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "Currency")], [0, 1]]
     ]
   )
 
@@ -852,7 +872,25 @@ module DefaultMappingRegistry
       ["model", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "Model")], [0, 1]],
       ["productRatePlanId", [nil, XSD::QName.new(NsObjectApiZuoraCom, "ProductRatePlanId")], [0, 1]],
       ["type", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "Type")], [0, 1]],
-      ["uOM", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "UOM")], [0, 1]]
+      ["uOM", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "UOM")], [0, 1]],
+      ["name", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "Name")], [0, 1]],
+      ["chargeModel", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "ChargeModel")], [0, 1]],
+      ["revRecCode", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "RevRecCode")], [0, 1]],
+      ["triggerEvent", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "TriggerEvent")], [0, 1]],
+      ["chargeType", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "ChargeType")], [0, 1]],
+      ["billingPeriod", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "BillingPeriod")], [0, 1]],
+      ["billCycleType", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "BillCycleType")], [0, 1]],
+      ["billingPeriodAlignement", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "BillingPeriodAlignement")], [0, 1]],
+      ["revRecTriggerCondition", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "RevRecTriggerCondition")], [0, 1]],
+      ["productRatePlanChargeTierData", ["ZUORA::ProductRatePlanChargeTierData", XSD::QName.new(NsObjectApiZuoraCom, "ProductRatePlanChargeTierData")], [0, 1]]
+    ]
+  )
+
+  LiteralRegistry.register(
+    :class => ZUORA::ProductRatePlanChargeTierData,
+    :schema_type => XSD::QName.new(NsApiZuoraCom, "ProductRatePlanChargeTierData"),
+    :schema_element => [
+      ["productRatePlanChargeTier", ["ZUORA::ProductRatePlanChargeTier[]", XSD::QName.new(NsApiZuoraCom, "ProductRatePlanChargeTier")], [0, nil]]
     ]
   )
 
@@ -867,7 +905,9 @@ module DefaultMappingRegistry
       ["price", ["SOAP::SOAPDouble", XSD::QName.new(NsObjectApiZuoraCom, "Price")], [0, 1]],
       ["productRatePlanChargeId", [nil, XSD::QName.new(NsObjectApiZuoraCom, "ProductRatePlanChargeId")], [0, 1]],
       ["startingUnit", ["SOAP::SOAPDouble", XSD::QName.new(NsObjectApiZuoraCom, "StartingUnit")], [0, 1]],
-      ["tier", ["SOAP::SOAPInt", XSD::QName.new(NsObjectApiZuoraCom, "Tier")], [0, 1]]
+      ["tier", ["SOAP::SOAPInt", XSD::QName.new(NsObjectApiZuoraCom, "Tier")], [0, 1]],
+      ["active", ["SOAP::SOAPBoolean", XSD::QName.new(NsObjectApiZuoraCom, "Active")], [0, 1]],
+      ["currency", ["SOAP::SOAPString", XSD::QName.new(NsObjectApiZuoraCom, "Currency")], [0, 1]]
     ]
   )
 

data/lib/zuora_client.rb

@@ -29,6 +29,7 @@
 
 require 'zuora_interface'
 require 'zuora/api'
+require 'yaml'
 
 class SOAP::Header::HandlerSet
   def reset
@@ -41,10 +42,9 @@ class SOAP::Header::HandlerSet
   end
 end
 
-
 class ZuoraClient
-  PROD_URL = 'https://www.zuora.com/apps/services/a/28.0'
-  SANDBOX_URL = 'https://apisandbox.zuora.com/apps/services/a/28.0'
+  PROD_URL = 'https://www.zuora.com/apps/services/a/27.0'
+  SANDBOX_URL = 'https://apisandbox.zuora.com/apps/services/a/27.0'
 
   def initialize(username, password, url=PROD_URL)
     $ZUORA_USER = username
@@ -52,6 +52,20 @@ class ZuoraClient
     $ZUORA_ENDPOINT = url
 
     @client = ZuoraInterface.new
+
+    # add custom fields, if any
+    custom_fields = YAML.load_file(File.dirname(__FILE__) + '/../custom_fields.yml')
+    if custom_fields
+      custom_fields.each do |key, value|
+        fields = value.strip.split(/\s+/).map { |e| "#{e}__c" }
+        type_class = Object.const_get('ZUORA').const_get(key)
+        fields.each do |field|
+          custom_field = field.gsub(/^\w/) { |i| i.downcase }
+          type_class.send :attr_accessor, custom_field
+        end
+      end
+    end
+
     @client.session_start
   end
 

data/zuora4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zuora4r}
-  s.version = "1.0.9"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cloocher"]
-  s.date = %q{2011-02-16}
+  s.date = %q{2011-04-21}
   s.description = %q{A client for Zuora API}
   s.email = %q{gene@ning.com}
   s.executables = ["zuora-query", "zuora-create", "zuora-update", "zuora-bill-run", "zuora-payment-run", "zuora-delete", "zq"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "bin/zuora-payment-run",
     "bin/zuora-query",
     "bin/zuora-update",
+    "custom_fields.yml",
     "lib/zuora/ZUORA.rb",
     "lib/zuora/ZUORADriver.rb",
     "lib/zuora/ZUORAMappingRegistry.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zuora4r
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 9
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors: 
 - Cloocher
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -08:00
-default_executable: 
+date: 2011-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: soap4r
@@ -74,6 +73,7 @@ files:
 - bin/zuora-payment-run
 - bin/zuora-query
 - bin/zuora-update
+- custom_fields.yml
 - lib/zuora/ZUORA.rb
 - lib/zuora/ZUORADriver.rb
 - lib/zuora/ZUORAMappingRegistry.rb
@@ -86,7 +86,6 @@ files:
 - README.rdoc
 - test/helper.rb
 - test/test_zuora_client.rb
-has_rdoc: true
 homepage: http://github.com/cloocher/zuora4r
 licenses: []
 
@@ -116,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Zuora4r