zuora-ruby 0.1.0 → 0.2.0

data/lib/zuora/models/rate_plan.rb

@@ -3,19 +3,15 @@
 module Zuora
   module Models
     class RatePlan
-      include ActiveModel::Model
+      include DirtyValidAttr
 
-      ATTRIBUTES = :product_rate_plan_id,
-                   :charge_overrides
+      dirty_valid_attr :product_rate_plan_id,
+        type: String,
+        required?: true
 
-      attr_accessor(*ATTRIBUTES)
+      dirty_valid_attr :charge_overrides
 
-      def attributes
-        ATTRIBUTES
-      end
-
-      validates :product_rate_plan_id,
-                presence: true
+      alias_method :initialize, :initialize_attributes!
     end
   end
 end

data/lib/zuora/models/rate_plan_charge.rb

@@ -3,55 +3,117 @@
 module Zuora
   module Models
     class RatePlanCharge
-      include ActiveModel::Model
-
-      ATTRIBUTES = :product_rate_plan_charge_id,
-                   :number,
-                   :description,
-                   :price,
-                   :tiers,
-                   :included_units,
-                   :overage_price,
-                   :list_price_base,
-                   :quantity,
-                   :discounted_amount,
-                   :discount_percentage,
-                   :apply_discount_to,
-                   :discount_level,
-                   :trigger_event,
-                   :trigger_date,
-                   :end_date_condition,
-                   :up_to_periods_type,
-                   :up_to_periods,
-                   :specific_end_date,
-                   :billing_period,
-                   :specific_billing_period,
-                   :billing_period_alignment,
-                   :billing_timing,
-                   :rating_group,
-                   :bill_cycle_type,
-                   :bill_cycle_day,
-                   :number_of_periods,
-                   :overage_unused_units_credit_option,
-                   :unused_units_credit_rates,
-                   :price_change_option,
-                   :price_increase_percentage,
-                   :weekly_bill_cycle_day
-
-      attr_accessor(*ATTRIBUTES)
-
-      def attributes
-        ATTRIBUTES
-      end
-
-      validates :product_rate_plan_charge_id,
-                presence: true
-
-      validates :number,
-                length: { maximum: 50 }
-
-      validates :description,
-                length: { maximum: 500 }
+      include DirtyValidAttr
+
+      dirty_valid_attr :apply_discount_to,
+        type: String,
+        valid?: one_of(Zuora::DISCOUNT_TYPES)
+
+      dirty_valid_attr :billing_period,
+        type: String
+
+      dirty_valid_attr :billing_period_alignment,
+        type: String
+
+      dirty_valid_attr :billing_timing,
+        type: String
+
+      dirty_valid_attr :bill_cycle_type,
+        type: String
+
+      dirty_valid_attr :bill_cycle_day,
+        type: String
+
+      dirty_valid_attr :description,
+        type: String,
+        valid?: max_length(500)
+
+      dirty_valid_attr :discount_amount,
+        type: Numeric
+
+      dirty_valid_attr :discount_percentage,
+        type: Numeric
+
+      dirty_valid_attr :discount_level,
+        type: String,
+        valid?: one_of(Zuora::DISCOUNT_LEVELS)
+
+      dirty_valid_attr :end_date_condition,
+        type: String,
+        valid?: one_of(Zuora::END_DATE_CONDITIONS)
+
+      dirty_valid_attr :included_units,
+        type: Numeric
+
+      dirty_valid_attr :list_price_base,
+        type: String,
+        valid?: one_of(Zuora::LIST_PRICE_BASES)
+
+      dirty_valid_attr :number,
+        type: String,
+        valid?: max_length(50)
+
+      dirty_valid_attr :number_of_periods,
+        type: Numeric
+
+      dirty_valid_attr :price,
+        type: Numeric
+
+      dirty_valid_attr :product_rate_plan_charge_id,
+        type: String
+
+      dirty_valid_attr :overage_price,
+        type: Numeric
+
+      dirty_valid_attr :overage_unused_units_credit_option,
+        type: String
+
+      dirty_valid_attr :price_change_option,
+        type: String,
+        valid?: one_of(Zuora::PRICE_CHANGE_OPTIONS)
+
+      dirty_valid_attr :price_increase_percentage,
+        type: String
+
+      dirty_valid_attr :rating_group,
+        type: String
+
+      dirty_valid_attr :quantity,
+        type: Numeric,
+        required?: true,
+        valid?: min(0)
+
+      dirty_valid_attr :specific_billing_period,
+        type: String
+
+      dirty_valid_attr :specific_end_date,
+        type: String
+
+      dirty_valid_attr :tiers
+
+      dirty_valid_attr :trigger_event,
+        type: String,
+        valid?: one_of(TRIGGER_EVENTS)
+
+      dirty_valid_attr :trigger_date,
+        type: Date
+
+      dirty_valid_attr :unused_units_credit_rates,
+        type: String
+
+      dirty_valid_attr :up_to_periods_type,
+        type: String,
+        valid?: one_of(UP_TO_PERIODS)
+
+      dirty_valid_attr :up_to_periods,
+        type: String,
+        required?: other_attr_eq(:end_date_condition,
+          'Fixed_Period')
+
+      dirty_valid_attr :weekly_bill_cycle_day,
+        type: String
+
+      alias_method :initialize, :initialize_attributes!
     end
   end
 end

data/lib/zuora/models/subscription.rb

@@ -3,48 +3,78 @@
 module Zuora
   module Models
     class Subscription
-      include ActiveModel::Model
-
-      ATTRIBUTES = :account_key,
-                   :invoice_owner_account_key,
-                   :term_type,
-                   :contract_effective_date,
-                   :service_activation_date,
-                   :customer_acceptance_date,
-                   :term_start_date,
-                   :initial_term,
-                   :initial_term_period_type,
-                   :auto_renew,
-                   :renewal_term,
-                   :renewal_term_period_type,
-                   :renewal_setting,
-                   :notes,
-                   :invoice_collect,
-                   :invoice,
-                   :collect,
-                   :invoice_separately,
-                   :apply_credit_balance,
-                   :invoice_target_date,
-                   :subscribe_to_rate_plans
-
-      attr_accessor(*ATTRIBUTES)
-
-      def attributes
-        ATTRIBUTES
-      end
-
-      validates :account_key,
-                :term_type,
-                :contract_effective_date,
-                :subscribe_to_rate_plans,
-                presence: true
-
-      validates :term_type,
-                inclusion: { in: Zuora::SUBSCRIPTION_TERM_TYPES }
-
-      validates :initial_term,
-                presence: true,
-                if: proc { |sub| sub.term_type == 'EVERGREEN' }
+      include DirtyValidAttr
+
+      dirty_valid_attr :auto_renew,
+        type: Boolean
+
+      dirty_valid_attr :apply_credit_balance,
+        type: String
+
+      dirty_valid_attr :account_key,
+        type: String,
+        required?: true
+
+      dirty_valid_attr :contract_effective_date,
+        type: Date,
+        required?: true
+
+      dirty_valid_attr :collect,
+        type: String
+
+      dirty_valid_attr :customer_acceptance_date,
+        type: Date
+
+      dirty_valid_attr :term_type,
+        type: String,
+        required?: true,
+        valid?: one_of(Zuora::SUBSCRIPTION_TERM_TYPES)
+
+      dirty_valid_attr :initial_term,
+        type: String,
+        required?: other_attr_eq(:term_type, 'EVERGREEN')
+
+      dirty_valid_attr :initial_term_period_type,
+        type: String
+
+      dirty_valid_attr :invoice_owner_account_key,
+        type: String
+
+      dirty_valid_attr :invoice_collect,
+        type: Boolean
+
+      dirty_valid_attr :invoice,
+        type: String
+
+      dirty_valid_attr :invoice_separately,
+        type: String
+
+      dirty_valid_attr :invoice_target_date,
+        type: Date
+
+      dirty_valid_attr :notes,
+        type: String
+
+      dirty_valid_attr :renewal_term,
+        type: Numeric
+
+      dirty_valid_attr :renewal_term_period_type,
+        type: String
+
+      dirty_valid_attr :renewal_setting,
+        type: String
+
+      dirty_valid_attr :service_activation_date,
+        type: Date
+
+      dirty_valid_attr :subscribe_to_rate_plans,
+        type: Array,
+        required?: false
+
+      dirty_valid_attr :term_start_date,
+        type: Date
+
+      alias_method :initialize, :initialize_attributes!
     end
   end
 end

data/lib/zuora/models/tier.rb

@@ -1,27 +1,27 @@
 module Zuora
   module Models
     class RatePlanChargeTier
-      include ActiveModel::Model
+      include DirtyValidAttr
 
-      ATTRIBUTES = :tier,
-                   :starting_unit,
-                   :ending_unit,
-                   :price,
-                   :price_format
+      dirty_valid_attr :tier,
+        type: Numeric,
+        required?: true
 
-      attr_accessor(*ATTRIBUTES)
+      dirty_valid_attr :starting_unit,
+        type: Numeric
 
-      def attributes
-        ATTRIBUTES
-      end
+      dirty_valid_attr :ending_unit,
+        type: Numeric
 
-      validates :tier,
-                :price,
-                presence: true
+      dirty_valid_attr :price,
+        type: Numeric,
+        required?: true
 
-      validates :price_format,
-                inclusion: { in: %w(FlatFee PerUnit) },
-                allow_nil: true
+      dirty_valid_attr :price_format,
+        type: String,
+        valid?: one_of(%w(FlatFee PerUnit))
+
+      alias_method :initialize, :initialize_attributes!
     end
   end
 end

data/lib/zuora/models/validation_predicates.rb

@@ -0,0 +1,29 @@
+module ValidationPredicates
+  def length(n)
+    -> (s) { s.length == n }
+  end
+
+  def min_length(n)
+    ->(s) { s.length >= n }
+  end
+
+  def max_length(n)
+    -> (s) { s.length <= n }
+  end
+
+  def min(n)
+    -> (s) { s >= n }
+  end
+
+  def valid_year
+    ->(y) { (y.to_s.length == 4) && (y.to_i > Time.now.year - 1) }
+  end
+
+  def one_of(thing)
+    ->(t) { thing.include? t }
+  end
+
+  def other_attr_eq(attr, val)
+    ->(model) { model.respond_to?(attr) && model.send(attr) == val }
+  end
+end

data/lib/zuora/resources.rb

@@ -1,15 +1,4 @@
 module Zuora
-  module Resources
-    InvalidModel = Class.new(StandardError)
-
-    def self.with_valid(model, &block)
-      if model.valid?
-        block.call model
-      else
-        fail InvalidModel, model
-      end
-    end
-  end
 end
 
 require_relative 'resources/accounts'

data/lib/zuora/resources/accounts.rb

@@ -3,16 +3,17 @@ module Zuora
     module Accounts
       RESOURCE_URI = '/rest/v1/accounts'
 
-      def self.create!(client, model, serializer = Zuora::Serializers::Noop)
-        Zuora::Resources.with_valid model do |mod|
-          client.post RESOURCE_URI, serializer.serialize(mod)
-        end
+      def self.request!(verb, uri, args)
+        client, model, serializer = args
+        client.send verb, uri, serializer.serialize(model)
       end
 
-      def self.update!(client, model, serializer = Zuora::Serializers::Noop)
-        Zuora::Resources.with_valid model do |mod|
-          client.post RESOURCE_URI, serializer.serialize(mod)
-        end
+      def self.create!(*args)
+        request! :post, RESOURCE_URI, args
+      end
+
+      def self.update!(*args)
+        request! :put, RESOURCE_URI, args
       end
     end
   end

data/lib/zuora/resources/payment_methods/credit_card.rb

@@ -16,9 +16,7 @@ module Zuora
         # @param [Class] serializer: any object supporting .serialze(data)
         # @return [Faraday::Response]
         def self.create!(client, model, serializer = Zuora::Serializers::Noop)
-          Zuora::Resources.with_valid model do |mod|
-            client.post RESOURCE_URI, serializer.serialize(mod)
-          end
+          client.post RESOURCE_URI, serializer.serialize(model)
         end
       end
     end

data/lib/zuora/resources/subscriptions.rb

@@ -6,15 +6,11 @@ module Zuora
       RESOURCE_URI = '/rest/v1/subscriptions'
 
       def self.create!(client, model, serializer = Zuora::Serializers::Noop)
-        Zuora::Resources.with_valid model do |mod|
-          client.post RESOURCE_URI, serializer.serialize(mod)
-        end
+        client.post RESOURCE_URI, serializer.serialize(model)
       end
 
       def self.update!(client, model, serializer = Zuora::Serializers::Noop)
-        Zuora::Resources.with_valid model do |mod|
-          client.post RESOURCE_URI, serializer.serialize(mod)
-        end
+        client.post RESOURCE_URI, serializer.serialize(model)
       end
     end
   end