tickethub 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4a096f67ed58b50591b241abd2255bfa3ac03e
-  data.tar.gz: 8c46ad998705a95f638119f825ebb5280292ac74
+  metadata.gz: 1cb8b0b77986976c93f03f3bb4d277f44fd8b613
+  data.tar.gz: 226d787e65748b173aab9859a5e6e20c036e99fb
 SHA512:
-  metadata.gz: d019a9d113811eae8b1103cf140823963e73bbc125c326b6929ac02e4c7d86ffd935a3ed269ecdd6510f51b8da2d6a41ff6afbb246a67c0feb31390043f66806
-  data.tar.gz: 490b52b2a3966e513c03cb8bf40039759da47d39f683d93f3cd5e886f2668c22ec11dcb1839a7a31f1cf184921ca4887611444807673eed2f676bca973e2b696
+  metadata.gz: e0ac1c12c2d2a53fee584287dfc93d3a8c0a6d7729b740c720df4380174aaea75d8f4bbbfc4bff77706554df49aa3954c9e56e367eb97e8ed618f4b156f61826
+  data.tar.gz: 200666283f1cebd7e78d2ad8f96359bb9728df7e673b2f476f9d497d2bbd068c380318b584edc61719613a2e46ad8225543009bf75b58c49d7e8130613194d56

data/lib/tickethub.rb

@@ -26,5 +26,4 @@ module Tickethub
   require_relative 'tickethub/supplier'
   require_relative 'tickethub/app'
   require_relative 'tickethub/user'
-  require_relative 'tickethub/job'
 end

data/lib/tickethub/collection.rb

@@ -30,13 +30,13 @@ module Tickethub
         self.reload! if cache.nil?
 
         cache.each do |row|
-          yielder << @klass.load(endpoint, row)
+          yielder << @klass.call(endpoint, row)
         end
 
         while (offset + cache.length) < count
           response = endpoint.get params.merge(offset: cache.length)
           response.decoded.each do |row| cache << row
-            yielder << @klass.load(endpoint, row)
+            yielder << @klass.call(endpoint, row)
           end
         end
       end
@@ -143,16 +143,16 @@ module Tickethub
         self.filter(id: search)
       when String
         endpoint = self.endpoint[@klass.path, CGI::escape(search)]
-        @klass.load endpoint, endpoint.get(params)
+        @klass.call endpoint, endpoint.get(params)
       else
         raise ArgumentError, 'invalid search value type'
       end
     end
 
     def create(attributes = {})
-      @klass.load endpoint, post(attributes)
+      @klass.call endpoint, post(attributes)
     rescue Tickethub::ResourceInvalid => err
-      @klass.load endpoint, Tickethub::Response.new(err.response).decoded
+      @klass.call endpoint, Tickethub::Response.new(err.response).decoded
     end
   end
 end

data/lib/tickethub/resource.rb

@@ -151,9 +151,8 @@ module Tickethub
       end.to_h
     end
 
-    def self.load(endpoint, attributes = nil)
+    def self.call(endpoint, attributes = nil)
       attributes ||= endpoint.get
-      return attributes if attributes.is_a? Tickethub::Job
 
       klass = registered_types.find do |type, options|
         attributes[options[:attribute].to_s] == type
@@ -171,18 +170,18 @@ module Tickethub
       klass.new endpoint, attributes
     end
 
-    def self.association(key, klass, path: key)
+    def self.association(key, klass)
       define_method key do
         @attributes.key?(key.to_sym) ? 
           (attrs = @attributes[key.to_sym]) &&
-            klass.load(@endpoint[path], attrs) :
-              klass.load(@endpoint[path])
+            klass.call(@endpoint[key], attrs) :
+              klass.call(@endpoint[key])
       end
     end
 
-    def self.collection(key, klass, path: key, &block)
+    def self.collection(key, klass, &block)
       define_method key do |params = {}|
-        Tickethub::Collection.new(@endpoint[path], klass, params).tap do |collection|
+        Tickethub::Collection.new(@endpoint[key], klass, params).tap do |collection|
           collection.instance_eval &block if block
         end
       end
@@ -218,7 +217,7 @@ module Tickethub
     end
 
     def reload!
-      self.load @endpoint.get
+      self.call @endpoint.get
     end
 
     def load(attributes)
@@ -277,8 +276,7 @@ module Tickethub
 
         case match[2]
           when '='
-            @attributes[key] = self.class
-              .load_value(key, arguments.first, self)
+            @attributes[key] = self.class.load_value(key, arguments.first, self)
           when "?"
             !! @attributes[key]
         end

data/lib/tickethub/response.rb

@@ -26,7 +26,6 @@ module Tickethub
 
     def decoded
       @decoded ||= parser ? parser.decode(body) : body
-      code == 202 ? Tickethub::Job.load(Tickethub.endpoint, @decoded) : @decoded
     end
 
     def respond_to?(name)

data/lib/tickethub/supplier.rb

@@ -26,6 +26,7 @@ module Tickethub
     require_relative 'supplier/message'
     require_relative 'supplier/charge'
     require_relative 'supplier/import'
+    require_relative 'supplier/broadcast'
 
     require_relative 'contact'
     require_relative 'token'
@@ -55,6 +56,7 @@ module Tickethub
     collection :messages, Message
     collection :charges, Charge
     collection :imports, Import
+    collection :broadcasts, Broadcast
 
     association :contact, Tickethub::Contact
     association :token, Tickethub::Token
@@ -69,7 +71,7 @@ module Tickethub
     def self.[](attributes)
       token = attributes[:token].is_a?(String) ? attributes[:token]
         : attributes[:token][:access_token]
-      self.load Tickethub.endpoint(auth_type: :bearer, password: token)[path]
+      self.call Tickethub.endpoint(auth_type: :bearer, password: token)[path]
     end
 
     def initialize(endpoint, attributes = nil)

data/lib/tickethub/supplier/booking.rb

@@ -15,9 +15,14 @@ module Tickethub
     require_relative 'message'
     require_relative 'extra'
     require_relative 'fee'
+    require_relative 'broadcast'
 
     collection_method :broadcast do |params|
-      Tickethub::Job.load self.endpoint, post(:broadcast, params)
+      Supplier::Broadcast.call self.endpoint, begin
+        post(:broadcast, params)
+      rescue Tickethub::ResourceInvalid => err
+        Tickethub::Response.new(err.response).decoded
+      end
     end
 
     collection :answers, Supplier::Answer

data/lib/tickethub/supplier/broadcast.rb

@@ -0,0 +1,13 @@
+require_relative '../resource'
+
+module Tickethub
+  class Supplier::Broadcast < Resource
+    path '/supplier/broadcasts'
+
+    require_relative 'message'
+
+    collection :messages, Supplier::Message
+
+    attribute :created_at, type: :datetime
+  end
+end

data/lib/tickethub/supplier/customer.rb

@@ -8,9 +8,14 @@ module Tickethub
     require_relative 'ticket'
     require_relative 'message'
     require_relative 'source'
+    require_relative 'broadcast'
 
     require_relative '../address'
 
+    collection_method :broadcast do |params|
+      Tickethub::Broadcast.call self.endpoint, post(:broadcast, params)
+    end
+
     collection :orders, Supplier::Booking
     collection :tickets, Supplier::Ticket
     collection :sources, Supplier::Source

data/lib/tickethub/supplier/message.rb

@@ -13,6 +13,15 @@ module Tickethub
     association :contact, Tickethub::Contact
     association :customer, Supplier::Customer
 
+    association :context, -> (endpoint, attributes) {
+      case attributes['object']
+        when 'booking'  then Supplier::Booking.call(endpoint, attributes)
+        when 'customer' then Supplier::Customer.call(endpoint, attributes)
+        when 'order'    then Supplier::Order.call(endpoint, attributes)
+        when 'reseller' then Supplier::Reseller.call(endpoint, attributes)
+      end
+    }
+
     attribute :created_at, type: :datetime
 
     collection :replies, Supplier::Message

data/lib/tickethub/supplier/order.rb

@@ -15,6 +15,11 @@ module Tickethub
     require_relative 'user'
     require_relative 'answer'
     require_relative 'message'
+    require_relative 'broadcast'
+
+    collection_method :broadcast do |params|
+      Tickethub::Broadcast.call self.endpoint, post(:broadcast, params)
+    end
 
     collection :bookings, Supplier::Booking
     collection :payments, Supplier::Payment
@@ -37,10 +42,6 @@ module Tickethub
     attribute :created_at, type: :datetime
     attribute :updated_at, type: :datetime
 
-    def restore(params = {})
-      self.load @endpoint[:restore].post(params)
-    end
-
     def confirm(params = {})
       self.load @endpoint[:confirm].post(params)
     end

data/lib/tickethub/supplier/reseller.rb

@@ -8,11 +8,16 @@ module Tickethub
     require_relative 'product'
     require_relative 'message'
     require_relative 'rate'
+    require_relative 'broadcast'
 
     require_relative '../token'
     require_relative '../contact'
     require_relative '../address'
 
+    collection_method :broadcast do |params|
+      Tickethub::Broadcast.call self.endpoint, post(:broadcast, params)
+    end
+
     collection :invoices, Supplier::Invoice
     collection :products, Supplier::Product
     collection :messages, Supplier::Message

data/lib/tickethub/version.rb

@@ -1,3 +1,3 @@
 module Tickethub
-  VERSION = '0.3.7'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tickethub
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Oliver Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,6 @@ files:
 - lib/tickethub/formats/form_format.rb
 - lib/tickethub/formats/json_format.rb
 - lib/tickethub/helpers.rb
-- lib/tickethub/job.rb
 - lib/tickethub/request.rb
 - lib/tickethub/resource.rb
 - lib/tickethub/response.rb
@@ -116,6 +115,7 @@ files:
 - lib/tickethub/supplier/booking.rb
 - lib/tickethub/supplier/booking/ticket.rb
 - lib/tickethub/supplier/booking/voucher.rb
+- lib/tickethub/supplier/broadcast.rb
 - lib/tickethub/supplier/charge.rb
 - lib/tickethub/supplier/charge/gateway.rb
 - lib/tickethub/supplier/charge/service.rb

data/lib/tickethub/job.rb

@@ -1,14 +0,0 @@
-module Tickethub
-  class Job < Resource
-    path '/jobs'
-
-    attribute :completed_at, type: :datetime
-    attribute :created_at, type: :datetime
-    attribute :updated_at, type: :datetime
-
-
-    def self.[](id)
-      self.load Tickethub.endpoint[path, id]
-    end
-  end
-end