tickethub 0.3.30 → 0.3.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28513ad4d64c4b5a963c448af58969545ec4c195
-  data.tar.gz: a345587d2fdd077a6bd18c952d3557b5e28abcea
+  metadata.gz: 07c9fbf4c9ee640bac8a02569679bdccec914a6d
+  data.tar.gz: 335943a4029d019d8188f20dedbf8ee37e78f224
 SHA512:
-  metadata.gz: 3bfbe048e2d428b494a925cc710ada39370bc9f8fb2f262c0ecb4db33bf4869c9f058ca51af6d86b428ca12cb964bc208560e0d7673622d6bd2ac7f9a49a7c36
-  data.tar.gz: 96c808bbcc1207ba2474cb64f12dfbae3d65e7d5dedadfc71131fa2edec8c3e2eedcc4f3cdf07492cbc521868ca53cc0c1f7c852b52dbdbf1f6ebcebebe7916d
+  metadata.gz: aafcc034f51534c2b5cc3f6fc62610f9888b0bf1cdb3de3d7e0ec4c8292b446430cc297674fe5621baf6edb91a6eb9a3b9444f4e5c4f8738e5d20bb589771915
+  data.tar.gz: 55a409843cd7c4bcad3cb3d5a1434923fa8a8fc980965017584a5ec53a5eedc4926101c447dcd5f4d8113293fe67e3f992951cc1f12730fa4a181c2fd11dc8d5

data/lib/tickethub/collection.rb

@@ -10,8 +10,9 @@ module Tickethub
     attr_accessor :cache
     attr_reader :count, :endpoint, :params
 
-    def initialize(endpoint, klass, params = {})
+    def initialize(endpoint, klass, params = {}, options = {})
       @params = params.dup
+      @options = options.dup
       @endpoint = endpoint
       @klass = klass
 
@@ -142,17 +143,16 @@ module Tickethub
       when Array
         self.filter(id: search)
       when String
-        endpoint = self.endpoint[@klass.path, CGI::escape(search)]
-        @klass.call endpoint, endpoint.get(params)
+        @klass.call endpoint, CGI::escape(search), @options
       else
         raise ArgumentError, 'invalid search value type'
       end
     end
 
     def create(attributes = {})
-      @klass.call endpoint, post(attributes)
+      @klass.call endpoint, post(attributes), @options
     rescue Tickethub::ResourceInvalid => err
-      @klass.call endpoint, Tickethub::Response.new(err.response).decoded
+      @klass.call endpoint, Tickethub::Response.new(err.response).decoded, @options
     end
   end
 end

data/lib/tickethub/endpoint.rb

@@ -24,8 +24,8 @@ module Tickethub
       end
     end
 
-    def url(params = {})
-      params.any?? "#{@url}?#{Helpers.to_param(params)}" : @url
+    def uri
+      URI.parse @url
     end
 
     def request(params, options)

data/lib/tickethub/reseller/channel.rb

@@ -0,0 +1,18 @@
+require_relative '../resource'
+
+module Tickethub
+  class Reseller::Channel < Resource
+    path '/reseller/channels'
+
+    require_relative 'product'
+    require_relative '../token'
+
+    association :private_token, Tickethub::Token
+    association :public_token, Tickethub::Token
+
+    association :product, Reseller::Product
+
+    attribute :updated_at, type: :datetime
+    attribute :created_at, type: :datetime
+  end
+end

data/lib/tickethub/reseller/product.rb

@@ -0,0 +1,19 @@
+require_relative '../resource'
+
+module Tickethub
+  class Reseller::Product < Resource
+    path '/reseller/products'
+
+    require_relative '../contact'
+    require_relative '../address'
+
+    association :contact, Tickethub::Contact
+    association :address, Tickethub::Address
+
+    attribute :time_zone, type: :timezone
+    attribute :currency, type: :currency
+
+    attribute :created_at, type: :datetime
+    attribute :updated_at, type: :datetime
+  end
+end

data/lib/tickethub/reseller.rb

@@ -0,0 +1,33 @@
+module Tickethub
+  class Reseller < Resource
+    path '/resellers'
+
+    require_relative 'contact'
+    require_relative 'reseller/channel'
+
+    association :contact, Tickethub::Contact
+    association :token, Tickethub::Token
+
+    association :category, App::Category
+    collection :subscriptions, App::Subscription
+
+    attribute :currency, type: :currency
+
+    def self.[](attributes)
+      token = attributes[:token].is_a?(String) ? attributes[:token]
+        : attributes[:token][:access_token]
+      self.new Tickethub.endpoint(auth_type: :bearer, password: token)['/reseller']
+    end
+
+    def initialize(endpoint, attributes = nil)
+      attributes ||= endpoint.get
+
+      if attributes['token']
+        endpoint = Tickethub.endpoint(auth_type: :bearer,
+          password: attributes['token']['access_token'])[self.class.path]
+      end
+
+      super(endpoint, attributes)
+    end
+  end
+end

data/lib/tickethub/resource.rb

@@ -151,7 +151,13 @@ module Tickethub
       end.to_h
     end
 
-    def self.call(endpoint, attributes = nil)
+    def self.call(endpoint, attributes = nil, options = {})
+      if attributes.is_a? String
+        attributes = (options[:shallow] == false ?
+          endpoint[CGI::escape(attributes)] :
+          endpoint[self.path, CGI::escape(attributes)]).get
+      end
+
       attributes ||= endpoint.get
 
       klass = registered_types.find do |type, options|
@@ -159,10 +165,12 @@ module Tickethub
       end
 
       klass = klass ? klass[1][:klass] : self
+      path = options[:shallow] == false ? endpoint.uri.path + klass.path : klass.path
+
       endpoint = if klass.singleton?
         endpoint[klass.path]
       elsif id = attributes['id']
-        endpoint[klass.path, id]
+        options[:shallow] == false ? endpoint[id] : endpoint[klass.path, id]
       else # readonly
         endpoint[klass.path].freeze
       end
@@ -170,18 +178,18 @@ module Tickethub
       klass.new endpoint, attributes
     end
 
-    def self.association(key, klass)
+    def self.association(key, klass, options = {})
       define_method key do
         @attributes.key?(key.to_sym) ? 
           (attrs = @attributes[key.to_sym]) &&
-            klass.call(@endpoint[key], attrs) :
-              klass.call(@endpoint[key])
+            klass.call(@endpoint[key], attrs, options) :
+              klass.call(@endpoint[key], nil, options)
       end
     end
 
-    def self.collection(key, klass, &block)
+    def self.collection(key, klass, options = {}, &block)
       define_method key do |params = {}|
-        Tickethub::Collection.new(@endpoint[key], klass, params).tap do |collection|
+        Tickethub::Collection.new(@endpoint[key], klass, params, options).tap do |collection|
           collection.instance_eval &block if block
         end
       end

data/lib/tickethub/supplier/override.rb

@@ -0,0 +1,16 @@
+require_relative '../resource'
+
+module Tickethub
+  class Supplier::Override < Resource
+    path '/supplier/overrides'
+
+    attribute :price, type: :money
+    attribute :currency, type: :currency
+
+    attribute :notice, type: :duration
+    attribute :period, type: :duration
+
+    attribute :interval, type: :duration
+    attribute :duration, type: :duration
+  end
+end

data/lib/tickethub/supplier/product.rb

@@ -59,9 +59,5 @@ module Tickethub
 
     attribute :created_at, type: :datetime
     attribute :updated_at, type: :datetime
-
-    def resellers
-      Collection.new @endpoint['/supplier/resellers'], Supplier::Reseller, filters: { products: [id] }
-    end
   end
 end

data/lib/tickethub/supplier/reseller.rb

@@ -4,13 +4,13 @@ module Tickethub
   class Supplier::Reseller < Resource
     path '/supplier/resellers'
 
+    require_relative 'user'
     require_relative 'invoice'
     require_relative 'product'
     require_relative 'message'
-    require_relative 'rate'
+    require_relative 'channel'
     require_relative 'broadcast'
 
-    require_relative '../token'
     require_relative '../contact'
     require_relative '../address'
 
@@ -21,9 +21,9 @@ module Tickethub
     collection :invoices, Supplier::Invoice
     collection :products, Supplier::Product
     collection :messages, Supplier::Message
-    collection :rates, Supplier::Rate
+    collection :channels, Supplier::Channel
+    collection :users, Supplier::User, shallow: false
 
-    association :token, Tickethub::Token
     association :contact, Tickethub::Contact
     association :address, Tickethub::Address
 

data/lib/tickethub/user/app.rb

@@ -1,3 +1,5 @@
+require_relative '../app'
+
 module Tickethub
   class User::App < Tickethub::App
     path '/user/apps'

data/lib/tickethub/user/reseller.rb

@@ -0,0 +1,7 @@
+require_relative '../reseller'
+
+module Tickethub
+  class User::Reseller < Tickethub::Reseller
+    path '/user/resellers'
+  end
+end

data/lib/tickethub/user/supplier.rb

@@ -1,3 +1,5 @@
+require_relative '../supplier'
+
 module Tickethub
   class User::Supplier < Tickethub::Supplier
     path '/user/suppliers'

data/lib/tickethub/user.rb

@@ -3,9 +3,11 @@ module Tickethub
     path '/user', singleton: true
 
     require_relative 'user/app'
+    require_relative 'user/reseller'
     require_relative 'user/supplier'
 
     collection :apps, User::App
+    collection :resellers, User::Reseller
     collection :suppliers, User::Supplier
 
     association :token, Tickethub::Token
@@ -17,6 +19,17 @@ module Tickethub
       new nil, Tickethub::Response.new(err.response).decoded
     end
 
+    def self.reset(email)
+      Tickethub.endpoint['/user/reset'].post email: email
+    end
+
+    def self.verify(attributes)
+      response = Tickethub.endpoint['/user/verify'].post(attributes)
+      self[email: response.decoded['email'], password: attributes['password']]
+    rescue Tickethub::ResourceInvalid => err
+      new nil, Tickethub::Response.new(err.response).decoded
+    end
+
     def self.[](attributes)
       token = if attributes[:email]
         Tickethub.endpoint['/user/token'].post(grant_type: 'password',

data/lib/tickethub/version.rb

@@ -1,3 +1,3 @@
 module Tickethub
-  VERSION = '0.3.30'
+  VERSION = '0.3.31'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tickethub
 version: !ruby/object:Gem::Version
-  version: 0.3.30
+  version: 0.3.31
 platform: ruby
 authors:
 - Oliver Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,9 @@ files:
 - lib/tickethub/formats/json_format.rb
 - lib/tickethub/helpers.rb
 - lib/tickethub/request.rb
+- lib/tickethub/reseller.rb
+- lib/tickethub/reseller/channel.rb
+- lib/tickethub/reseller/product.rb
 - lib/tickethub/resource.rb
 - lib/tickethub/response.rb
 - lib/tickethub/response/headers.rb
@@ -132,6 +135,7 @@ files:
 - lib/tickethub/supplier/message/sms.rb
 - lib/tickethub/supplier/option.rb
 - lib/tickethub/supplier/order.rb
+- lib/tickethub/supplier/override.rb
 - lib/tickethub/supplier/payment.rb
 - lib/tickethub/supplier/payment/cash.rb
 - lib/tickethub/supplier/payment/complimentary.rb
@@ -163,6 +167,7 @@ files:
 - lib/tickethub/token.rb
 - lib/tickethub/user.rb
 - lib/tickethub/user/app.rb
+- lib/tickethub/user/reseller.rb
 - lib/tickethub/user/supplier.rb
 - lib/tickethub/version.rb
 - tickethub.gemspec