tickethub 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b17caefcb50ec0f515e5353ed3b1e6b5482a9e
-  data.tar.gz: a7c2ffbe9f3bf76390cf4f91537938dd291e01c1
+  metadata.gz: ccb152a358383394fb8a2903b7cf8355371fb8d7
+  data.tar.gz: 828a41238c5ab820f77bcdf4348b54c177360c89
 SHA512:
-  metadata.gz: aae62d812c0fa09ccf4f8047dc61868b835358e94ee81fc4c7ab4e77b514b033d5a5dca54e8788249e89db8f5e3ec4975435d866310e0a3de4f12e98dbf817fb
-  data.tar.gz: d1bdccf887031cc948ec303fce72c2f08fb1a26a5d4982a2f38a4ae8a82e1963e8788758dc6638ea464838c0dfa2c2761c851fe77380ca04aa5e9da15ecb0238
+  metadata.gz: e9812ade047a542884babf81062e6dc99974d101b10ece33b5a8ccbb6279eba62a0d9e8de576bffb37f01173b3568b3ae4d6e88fa7275dc0bd14d4f655f5d341
+  data.tar.gz: d194028938875dda6266b94883f92e948114abf244e36aefa3758d2ad56068382425f36fe51e51221124976a4892d0fb03a5b286d663e9bfeeaf9d6267147b3f

data/lib/tickethub/collection.rb

@@ -137,9 +137,9 @@ module Tickethub
     end
 
     def create(attributes = {})
-      @klass.new @endpoint, @endpoint.post(attributes).decoded
+      @klass.load @endpoint, @endpoint.post(attributes).decoded
     rescue Tickethub::ResourceInvalid => err
-      @klass.new @endpoint, Tickethub::Response.new(err.response).decoded
+      @klass.load @endpoint, Tickethub::Response.new(err.response).decoded
     end
 
     def scope(key, params = {}, options = {})

data/lib/tickethub/resource.rb

@@ -10,16 +10,13 @@ module Tickethub
 
     class << self
 
-      def all(params = {})
-        Tickethub::Collection.new @endpoint, self, params
-      end
-
-      def polymorphic(type, options = {})
-        self.superclass.register_type type, **options
+      def path(value, options = {})
+        @path = value
+        @options = options
       end
 
-      def register_type(type, klass: self, attribute: :type) # klass, attribute
-        registered_types[type] = { klass: klass, attribute: attribute }
+      def endpoint
+        Tickethub.endpoint[@path, @options]
       end
 
       def registered_types
@@ -30,150 +27,163 @@ module Tickethub
         @scopes ||= {}
       end
 
-      def path(value, options = {})
-        @singleton = options.delete(:singleton) || false
-        @path = value
-        @options = options
+      def attributes
+        @attributes ||= {}
       end
 
-      def endpoint
-        Tickethub.endpoint[@path, @options]
+      def descendants
+        @descendants ||= []
       end
+    end
 
-      def scope(key, proc = -> (params = {}) { self.scope key, params })
-        self.scopes[key] = proc
+    def self.inherited(descendant)
+      if descendant.ancestors.member? Tickethub::Resource
+        self.descendants.push descendant
       end
+    end
 
-      def singleton?
-        !! @singleton
-      end
+    def self.all(params = {})
+      Tickethub::Collection.new self.endpoint, self, params
+    end
 
-      def attribute(key, options = nil)
-        options.nil?? (self.attributes[key] ||= {}).dup
-          : self.attributes[key] = options
-      end
+    def self.polymorphic(type, attribute = :type)
+      self.superclass.register_type type, self, attribute
+    end
 
-      def attributes
-        @attributes ||= {}
-      end
+    def self.register_type(type, klass, attribute = :type) # klass, attribute
+      self.registered_types[type] = { klass: klass, attribute: attribute }
+    end
 
-      def load_value(key, value, object)
-        return nil if value.nil? || (value.is_a?(String) && value.empty?)
-        case self.attribute(key)[:type]
-          when :date
-            case value
-              when String then ISO8601::Date.new(value)
-              else raise ArgumentError, 'invalid date value: ' + value
-            end
-          when :datetime
-            case value
-              when String then ISO8601::DateTime.new(value)
-              else raise ArgumentError, 'invalid datetime value: ' + value
-            end
-          when :time
-            case value
-              when String then ISO8601::Time.new(value)
-              else raise ArgumentError, 'invalid time value: ' + value
-            end
-          when :duration
-            case value
-              when String then ISO8601::Duration.new(value)
-              else raise ArgumentError, 'invalid time value: ' + value
-            end
-          when :money
-            currency = Money::Currency.new(object.currency)
-            raise ArgumentError, 'invalid money currency' if currency.blank?
-
-            case value
-              when Fixnum then Money.new(value, currency)
-              when Numeric, String
-                currency = Money::Currency.wrap(currency)
-                Money.new(value.to_d * currency.subunit_to_unit, currency)
-              else raise ArgumentError, 'invalid money value: ' + value
-            end
-          when :currency
-            case value
-              when String then Money::Currency.new(value)
-              else raise ArgumentError, 'invalid currency value: ' + value
-            end            
-          when :timezone
-            case value
-              when String then Timezone::Zone.new(zone: value)
-              else raise ArgumentError, 'invalid timezone value: ' + value
-            end
-          when :country
-            case value
-              when String then Country.new(value)
-              else raise ArgumentError, 'invalid country value: ' + value
-            end
-          else value
-        end
+    def self.attribute(key, options)
+      self.attributes[key] = options
+
+      self.descendants.each do |descendant|
+        descendant.attributes[key] = options
       end
+    end
 
-      def dump_value(key, value)
-        case self.attribute(key)[:type]
-          when :date      then value.iso8601
-          when :datetime  then value.iso8601
-          when :time      then value.iso8601[10..-1]
-          when :duration  then value.iso8601
-          when :money     then value.fractional
-          when :timezone  then value.zone
-          when :country   then value.alpha2
-          when :currency  then value.iso_code
-          else value
-        end
+    def self.scope(key, proc = -> (params = {}) { self.scope key, params })
+      self.scopes[key] = proc
+    end
+
+    def self.load_value(key, value, object)
+      return nil if value.nil? || (value.is_a?(String) && value.empty?)
+      return value unless self.attributes.key? key
+
+      case self.attributes[key][:type]
+        when :date
+          case value
+            when String then ISO8601::Date.new(value)
+            else raise ArgumentError, 'invalid date value: ' + value
+          end
+        when :datetime
+          case value
+            when String then ISO8601::DateTime.new(value)
+            else raise ArgumentError, 'invalid datetime value: ' + value
+          end
+        when :time
+          case value
+            when String then ISO8601::Time.new(value)
+            else raise ArgumentError, 'invalid time value: ' + value
+          end
+        when :duration
+          case value
+            when String then ISO8601::Duration.new(value)
+            else raise ArgumentError, 'invalid time value: ' + value
+          end
+        when :money
+          currency = Money::Currency.new(object.currency)
+          raise ArgumentError, 'invalid money currency' if currency.blank?
+
+          case value
+            when Fixnum then Money.new(value, currency)
+            when Numeric, String
+              currency = Money::Currency.wrap(currency)
+              Money.new(value.to_d * currency.subunit_to_unit, currency)
+            else raise ArgumentError, 'invalid money value: ' + value
+          end
+        when :currency
+          case value
+            when String then Money::Currency.new(value)
+            else raise ArgumentError, 'invalid currency value: ' + value
+          end            
+        when :timezone
+          case value
+            when String then Timezone::Zone.new(zone: value)
+            else raise ArgumentError, 'invalid timezone value: ' + value
+          end
+        when :country
+          case value
+            when String then Country.new(value)
+            else raise ArgumentError, 'invalid country value: ' + value
+          end
+        else value
       end
+    end
 
-      def serialize(attributes)
-        attributes.collect do |key, value|
-          [key, dump_value(key, value)]
-        end.to_h
+    def self.dump_value(key, value)
+      return value unless self.attributes.key? key
+      case self.attributes[key][:type]
+        when :date      then value.iso8601
+        when :datetime  then value.iso8601
+        when :time      then value.iso8601[10..-1]
+        when :duration  then value.iso8601
+        when :money     then value.fractional
+        when :timezone  then value.zone
+        when :country   then value.alpha2
+        when :currency  then value.iso_code
+        else value
       end
+    end
 
-      def load(endpoint, attributes = nil)
-        attributes ||= endpoint.get
+    def self.serialize(attributes)
+      attributes.collect do |key, value|
+        [key, dump_value(key, value)]
+      end.to_h
+    end
 
-        klass = registered_types.find do |type, options|
-          attributes[options[:attribute].to_s] == type
-        end
+    def self.load(endpoint, attributes = nil)
+      attributes ||= endpoint.get
 
-        klass = klass ? klass[1][:klass] : self
+      klass = registered_types.find do |type, options|
+        attributes[options[:attribute].to_s] == type
+      end
 
-        if id = attributes['id']
-          endpoint = klass.endpoint[id, endpoint.options]
-        end
+      klass = klass ? klass[1][:klass] : self
 
-        klass.new endpoint, attributes
+      if id = attributes['id']
+        endpoint = klass.endpoint[id, endpoint.options]
       end
 
-      def association(key, klass, path: key)
-        define_method key do
-          instance_variable_defined?("@#{key}") ? instance_variable_get("@#{key}") :
-            instance_variable_set("@#{key}", klass.load(@endpoint[path]))
-        end
+      klass.new endpoint, attributes
+    end
 
-        define_method "#{key}=" do |value|
-          instance_variable_set "@#{key}", ((value.nil? || value.is_a?(klass)) ? value :
-            klass.load(@endpoint[path], value))
-        end
+    def self.association(key, klass, path: key)
+      define_method key do
+        instance_variable_defined?("@#{key}") ? instance_variable_get("@#{key}") :
+          instance_variable_set("@#{key}", klass.load(@endpoint[path]))
       end
 
-      def collection(key, klass, path: key, &block)
+      define_method "#{key}=" do |value|
+        instance_variable_set "@#{key}", ((value.nil? || value.is_a?(klass)) ? value :
+          klass.load(@endpoint[path], value))
+      end
+    end
 
-        define_method key do |params = {}|
-          (instance_variable_defined?("@#{key}") ? instance_variable_get("@#{key}") :
-            (sinleton? || id?) ? instance_variable_set("@#{key}",
-              Tickethub::Collection.new(@endpoint[path], klass, params)) : []).tap do |collection|
-                collection.instance_eval &block if block
-              end
-        end
+    def self.collection(key, klass, path: key, &block)
+      define_method key do |params = {}|
+        (instance_variable_defined?("@#{key}") ? instance_variable_get("@#{key}") :
+          (sinleton? || id?) ? instance_variable_set("@#{key}",
+            Tickethub::Collection.new(@endpoint[path], klass, params)) : []).tap do |collection|
+              collection.instance_eval &block if block
+            end
+      end
 
-        define_method "#{key}=" do |values|
-          instance_variable_set "@#{key}", (singleton? || id?) ?
-            (Tickethub::Collection.new(@endpoint[path], klass).tap do |collection|
-              collection.cache = values
-            end) : values.collect { |value| klass.load @endpoint, value }
-        end
+      define_method "#{key}=" do |values|
+        instance_variable_set "@#{key}", id??
+          (Tickethub::Collection.new(@endpoint[path], klass).tap do |collection|
+            collection.cache = values
+          end) : values.collect { |value| klass.load @endpoint, value }
       end
     end
 
@@ -202,10 +212,6 @@ module Tickethub
       self.load @endpoint.delete.decoded
     end
 
-    def singleton?
-      !! @singleton
-    end
-
     def respond_to?(method, include_priv = false)
       @attributes.key?(method.to_s.remove(/[=\?]\Z/).to_sym) || super
     end

data/lib/tickethub/supplier/message/email.rb

@@ -2,7 +2,7 @@ require_relative '../message'
 
 module Tickethub
   class Supplier::Message::Email < Supplier::Message
-    polymorphic 'email', attribute: :type
+    polymorphic 'email'
     path '/supplier/messages/email'
   end
 end

data/lib/tickethub/supplier/message/sms.rb

@@ -2,7 +2,7 @@ require_relative '../message'
 
 module Tickethub
   class Supplier::Message::SMS < Supplier::Message
-    polymorphic 'sms', attribute: :type
+    polymorphic 'sms'
     path '/supplier/messages/sms'
   end
 end

data/lib/tickethub/supplier/payment/card.rb

@@ -2,17 +2,13 @@ require_relative '../payment'
 
 module Tickethub
   class Supplier::Payment::Card < Supplier::Payment
-    polymorphic 'card', attribute: :type
+    polymorphic 'card'
     path '/supplier/payments/card'
 
     require_relative '../card'
-    require_relative '../gateway'
-
     require_relative '../../address'
 
     association :card, Supplier::Card
-    association :gateway, Supplier::Gateway
-
     association :address, Tickethub::Address
   end
 end

data/lib/tickethub/supplier/payment/cash.rb

@@ -2,7 +2,7 @@ require_relative '../payment'
 
 module Tickethub
   class Supplier::Payment::Cash < Supplier::Payment
-    polymorphic 'cash', attribute: :type
+    polymorphic 'cash'
     path '/supplier/payments/cash'
   end
 end

data/lib/tickethub/supplier/payment/credit.rb

@@ -2,7 +2,7 @@ require_relative '../payment'
 
 module Tickethub
   class Supplier::Payment::Credit < Supplier::Payment
-    polymorphic 'credit', attribute: :type
+    polymorphic 'credit'
     path '/supplier/payments/credit'
   end
 end

data/lib/tickethub/supplier/payment/direct.rb

@@ -2,7 +2,7 @@ require_relative '../payment'
 
 module Tickethub
   class Supplier::Payment::Direct < Supplier::Payment
-    polymorphic 'direct', attribute: :type
+    polymorphic 'direct'
     path '/supplier/payments/direct'
   end
 end

data/lib/tickethub/supplier/payment/gratuity.rb

@@ -2,7 +2,7 @@ require_relative '../payment'
 
 module Tickethub
   class Supplier::Payment::Gratuity < Supplier::Payment
-    polymorphic 'gratuity', attribute: :type
+    polymorphic 'gratuity'
     path '/supplier/payments/gratuity'
   end
 end

data/lib/tickethub/supplier.rb

@@ -1,9 +1,8 @@
 module Tickethub
   class Supplier < Resource
-    path '/supplier', singleton: true
+    path '/supplier'
 
     require_relative 'supplier/bill'
-    require_relative 'supplier/gateway'
     require_relative 'supplier/customer'
     require_relative 'supplier/template'
     require_relative 'supplier/order'
@@ -31,7 +30,6 @@ module Tickethub
     require_relative 'token'
 
     collection :bills, Bill
-    collection :gateways, Gateway
     collection :customers, Customer
     collection :templates, Template
     collection :orders, Order
@@ -80,7 +78,7 @@ module Tickethub
     end
 
     def settings
-      @endpoint[:settings].get
+      @endpoint[:settings].get.decoded
     end
   end
 end

data/lib/tickethub/token.rb

@@ -1,6 +1,6 @@
 module Tickethub
   class Token < Resource
-    path '/token', singleton: true
+    path '/token'
 
     def can?(scope)
       self.scope.member? scope.to_s

data/lib/tickethub/user.rb

@@ -1,6 +1,6 @@
 module Tickethub
   class User < Resource
-    path '/user', singleton: true
+    path '/user'
 
     require_relative 'user/app'
     require_relative 'user/supplier'

data/lib/tickethub/version.rb

@@ -1,3 +1,3 @@
 module Tickethub
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tickethub
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Oliver Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,11 +143,6 @@ files:
 - lib/tickethub/supplier/customer.rb
 - lib/tickethub/supplier/element.rb
 - lib/tickethub/supplier/fee.rb
-- lib/tickethub/supplier/gateway.rb
-- lib/tickethub/supplier/gateway/handpoint.rb
-- lib/tickethub/supplier/gateway/ideal.rb
-- lib/tickethub/supplier/gateway/paypal.rb
-- lib/tickethub/supplier/gateway/stripe.rb
 - lib/tickethub/supplier/invoice.rb
 - lib/tickethub/supplier/message.rb
 - lib/tickethub/supplier/message/email.rb

data/lib/tickethub/supplier/gateway/handpoint.rb

@@ -1,8 +0,0 @@
-require_relative '../gateway'
-
-module Tickethub
-  class Supplier::Gateway::Handpoint < Supplier::Gateway
-    polymorphic 'handpoint', attribute: :type
-    path '/supplier/gateways/handpoint'
-  end
-end

data/lib/tickethub/supplier/gateway/ideal.rb

@@ -1,8 +0,0 @@
-require_relative '../gateway'
-
-module Tickethub
-  class Supplier::Gateway::Ideal < Supplier::Gateway
-    polymorphic 'ideal', attribute: :type
-    path '/supplier/gateways/ideal'
-  end
-end

data/lib/tickethub/supplier/gateway/paypal.rb

@@ -1,8 +0,0 @@
-require_relative '../gateway'
-
-module Tickethub
-  class Supplier::Gateway::Paypal < Supplier::Gateway
-    polymorphic 'paypal', attribute: :type
-    path '/supplier/gateways/paypal'
-  end
-end

data/lib/tickethub/supplier/gateway/stripe.rb

@@ -1,8 +0,0 @@
-require_relative '../gateway'
-
-module Tickethub
-  class Supplier::Gateway::Stripe < Supplier::Gateway
-    polymorphic 'stripe', attribute: :type
-    path '/supplier/gateways/stripe'
-  end
-end

data/lib/tickethub/supplier/gateway.rb

@@ -1,16 +0,0 @@
-require_relative '../resource'
-
-module Tickethub
-  class Supplier::Gateway < Resource
-    path '/supplier/gateways'
-
-    require_relative 'gateway/stripe'
-    require_relative 'gateway/paypal'
-    require_relative 'gateway/handpoint'
-    require_relative 'gateway/ideal'
-
-    require_relative 'payment'
-
-    collection :payments, Supplier::Payment
-  end
-end