tickethub 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e87494a40da501ed5049f42be78ad18c060c598
-  data.tar.gz: 17da18e8657285fce922f03b835cc2409d942e27
+  metadata.gz: 75b7f07212e2ad1e522dbd7aad6d12f182a741dd
+  data.tar.gz: 801f6f6e85e89700f476424154fd922fd6948e94
 SHA512:
-  metadata.gz: 9ca70e607c4b5f654a77ec62cffe889b97d875cfcf57b599095a29d222ce0e750417213a8636ed8e47129def26b92d7186dbd67dfb7d1dbd7fd1a855f1b5b593
-  data.tar.gz: 0434a2ddc9ef885cfd7b1037e558ca05f36b3f1216983eaf92da2ce8c15c54e37dcd375027e19e63ce71f8e9e46d514d23a06a08b54f71d61878027c1e0ee5ca
+  metadata.gz: 84b02aa3524c5bc2d21a344179a9719a70c88436b6567eb82cea112708af6984b3f8a9d375c8e04cc122d3ce52e9f9bb901608214d531bb10863952164d64758
+  data.tar.gz: 108ddb446e8a39ce8513ebbf63c359a82ae34ca59c92c65db8e3811b574797313fe82ee500b53475a4382e65c0f104a5f19187ab5042f163690cd0c1205c6791

data/lib/tickethub.rb

@@ -4,9 +4,9 @@ module Tickethub
     @path = path
   end
 
-  def self.endpoint
-    Endpoint.new @path || 'https://api.tickethub.io', format: :json,
-      headers: { 'Accept-Version' => 'v1', 'Accept' => 'application/json' }
+  def self.endpoint(options = {})
+    Endpoint.new @path || 'https://api.tickethub.io', options.merge(format: :json,
+      headers: { 'Accept-Version' => 'v1', 'Accept' => 'application/json' })
   end
 
   require_relative 'tickethub/helpers'

data/lib/tickethub/app.rb

@@ -24,8 +24,8 @@ module Tickethub
       attributes ||= endpoint.get
 
       if attributes['token']
-        endpoint = Tickethub.endpoint['/app', {
-          auth_type: :bearer, password: attributes['token']['access_token'] }]
+        endpoint = Tickethub.endpoint(auth_type: :bearer,
+          password: attributes['token']['access_token'])[self.class.path]
       end
 
       super(endpoint, attributes)

data/lib/tickethub/collection.rb

@@ -1,9 +1,10 @@
+require 'cgi'
 require_relative 'helpers'
 
 module Tickethub
   class Collection < Enumerator
     attr_accessor :cache
-    attr_reader :count, :endpoint
+    attr_reader :count, :endpoint, :params
 
     def initialize(endpoint, klass, params = {})
       @params = params.dup
@@ -13,7 +14,7 @@ module Tickethub
       klass.registered_types.each do |type, options|
         define_singleton_method type do
           instance_variable_defined?("@#{type}") ? instance_variable_get("@#{type}") :
-            instance_variable_set("@#{type}", Tickethub::Collection.new(@endpoint[type], options[:klass]))
+            instance_variable_set("@#{type}", Tickethub::Collection.new(endpoint[type], options[:klass]))
         end
       end
 
@@ -22,27 +23,28 @@ module Tickethub
       end
 
       super() do |yielder|
-        self.reload! if @cache.nil?
+        self.reload! if cache.nil?
 
-        @cache.each do |row|
-          yielder << @klass.load(@endpoint, row)
+        cache.each do |row|
+          yielder << @klass.load(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)
+        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)
           end
         end
       end
     end
 
     def reload!
-      @cache = (response = @endpoint.get @params).decoded
+      @cache = (response = endpoint.get params).decoded
       @count, @offset, @limit =
         response.status == 206 ? 
           response.headers.values_at(*%w(x-total-count x-offset x-limit))
             .collect { |value| value[0].to_i } : [@cache.length, 0, @cache.length]
+      return self
     end
 
     def last
@@ -54,8 +56,8 @@ module Tickethub
         reload! if @limit.nil?
         return @limit
       else
-        self.class.new @endpoint, @klass,
-          @params.merge(limit: value)
+        self.class.new endpoint, @klass,
+          params.merge(limit: value)
       end
     end
 
@@ -64,23 +66,23 @@ module Tickethub
         reload! if @offset.nil?
         return @offset
       else
-        self.class.new @endpoint, @klass,
-          @params.merge(offset: value)
+        self.class.new endpoint, @klass,
+          params.merge(offset: value)
       end
     end
 
     def filter(value)
-      self.class.new @endpoint, @klass,
-        @params.merge(filters: (@params[:filters] || {}).merge(value))
+      self.class.new endpoint, @klass,
+        params.merge(filters: filters.merge(value))
     end
 
     def filters
-      @params[:filters].dup
+      (params[:filters] || {}).dup
     end
 
     def order(value = nil)
-      return @params[:order].dup if value.nil?
-      order = (@params[:order] || []) + (case value
+      return params[:order].dup if value.nil?
+      order = (params[:order] || []) + (case value
         when Symbol, String then [value.to_s]
         when Hash
           value.collect do |key, direction|
@@ -88,18 +90,23 @@ module Tickethub
           end
         end)
 
-      self.class.new @endpoint, @klass,
-        @params.merge(order: order)
+      self.class.new endpoint, @klass,
+        params.merge(order: order)
+    end
+
+    def scope(path, params = {})
+      self.class.new endpoint[path], @klass,
+        self.params.merge(params)
     end
 
     [:get, :post, :patch, :delete].each do |key|
-      define_method key do |path, params = {}, options = {}|
+      define_method key do |path, params = {}|
         endpoint = (if path.is_a? Hash
           params, options = [path, params]
           self.endpoint
         else self.endpoint[path] end)
 
-        if (response = endpoint.send(key, @params.merge(params), options)).body.length > 2
+        if (response = endpoint.send(key, self.params.merge(params))).body.length > 2
           return response.decoded
         end
       end
@@ -123,31 +130,26 @@ module Tickethub
       return @count
     end
 
-    def [](*args)
-      case (key = args[0])
+    def [](search)
+      case search
       when Fixnum
-        self.offset(key).first
+        self.offset(search).first
       when Hash
-        self.filter(key).first
+        self.filter(search).first
       when Range
-        self.offset(key.min).first(key.max)
+        self.offset(search.min).first(search.max)
       when String
-        options = { params: args[1] || {} }.merge args[2] || {}
-        @klass.load @klass.endpoint[key, @endpoint[nil, options].options]
+        endpoint = self.endpoint[@klass.path, CGI::escape(search)]
+        @klass.load endpoint, endpoint.get(params)
       else
         raise ArgumentError, 'invalid search value type'
       end
     end
 
     def create(attributes = {})
-      @klass.load @endpoint, @endpoint.post(attributes).decoded
+      @klass.load endpoint, post(attributes)
     rescue Tickethub::ResourceInvalid => err
-      @klass.load @endpoint, Tickethub::Response.new(err.response).decoded
-    end
-
-    def scope(key, params = {}, options = {})
-      Tickethub::Collection.new @endpoint[key, options.merge(params: params)], @klass,
-        filters: @filters, order: @order
+      @klass.load endpoint, Tickethub::Response.new(err.response).decoded
     end
   end
 end

data/lib/tickethub/endpoint.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 require_relative 'request'
 require_relative 'response'
 require_relative 'helpers'
@@ -6,31 +8,29 @@ module Tickethub
   class Endpoint
     attr_reader :options, :url
 
-    def initialize(url, options = {})
-      @url     = url
+    def initialize(url, options)
+      @url     = _normalize_path url
       @options = options
     end
 
-    def [](suburl, options = {})
-      url = (if suburl.nil? then self.url
-        else
-          suburl = suburl.to_s
-          base   = self.url
-          base  += "/" unless base =~ /\/$/
-          URI.join(base, suburl).to_s
-        end)
-
-      self.class.new url, Tickethub::Helpers.deep_merge(@options, options)
+    def [](*parts)
+      parts = parts.compact.map { |part| _normalize_path part.to_s }
+      self.class.new URI.join(url, *parts).to_s, @options
     end
 
     [:get, :post, :delete, :patch].each do |method|
-      define_method method do |params = {}, options = {}|
-        request options.merge(method: method, params: params)
+      define_method method do |params = {}|
+        request params, options.merge(method: method)
       end
     end
 
-    def request(options = {})
-      Tickethub::Request.new(url, Tickethub::Helpers.deep_merge(@options, options)).execute
+    def request(params, options)
+      raise 'this endpoint is readonly' if frozen?
+      Tickethub::Request.new(url, options.merge(params: params)).execute
+    end
+
+    def _normalize_path(str)
+      str.match(/\/$/) ? str : "#{str}/"
     end
   end
 end

data/lib/tickethub/helpers.rb

@@ -10,14 +10,6 @@ module Tickethub
       value.to_s.split('_').map {|w| w.capitalize }.join
     end
 
-    def deep_merge(hash, other_hash)
-      hash.merge(other_hash) do |key, oldval, newval|
-        oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
-        newval = newval.to_hash if newval.respond_to?(:to_hash)
-        oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? deep_merge(oldval, newval) : newval
-      end
-    end
-
     # Stolen from Rack:
 
     DEFAULT_SEP = /[&;] */n

data/lib/tickethub/resource.rb

@@ -10,14 +10,14 @@ module Tickethub
 
     class << self
 
-      def path(value, options = {})
-        @path = value
-        @options = options
+      def singleton?
+        !! @singleton
       end
 
-      def endpoint
-        return self.superclass.endpoint unless @path
-        Tickethub.endpoint[@path, @options]
+      def path(value = nil, singleton: false)        
+        return @path || (superclass.respond_to?(:path) ? superclass.path : nil) if value.nil?
+        @singleton = singleton
+        @path = value
       end
 
       def registered_types
@@ -151,9 +151,12 @@ module Tickethub
       end
 
       klass = klass ? klass[1][:klass] : self
-
-      if id = attributes['id']
-        endpoint = klass.endpoint[id, endpoint.options]
+      endpoint = if klass.singleton?
+        endpoint[klass.path]
+      elsif id = attributes['id']
+        endpoint[klass.path, id]
+      else # readonly
+        endpoint[klass.path].freeze
       end
 
       klass.new endpoint, attributes
@@ -161,30 +164,18 @@ module Tickethub
 
     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
-
-      define_method "#{key}=" do |value|
-        instance_variable_set "@#{key}", ((value.nil? || value.is_a?(klass)) ? value :
-          klass.load(@endpoint[path], value))
+        @attributes.key?(key.to_sym) ? 
+          (attrs = @attributes[key.to_sym]) &&
+            klass.load(@endpoint[path], attrs) :
+              klass.load(@endpoint[path])
       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}", id??
-          (Tickethub::Collection.new(@endpoint[path], klass).tap do |collection|
-            collection.cache = values
-          end) : values.collect { |value| klass.load @endpoint, value }
+        Tickethub::Collection.new(@endpoint[path], klass, params).tap do |collection|
+          collection.instance_eval &block if block
+        end
       end
     end
 
@@ -246,7 +237,7 @@ module Tickethub
     end
 
     def hash
-      id?? id.hash : super
+      id?? [self.class, id].hash : super
     end
 
     def to_param

data/lib/tickethub/supplier.rb

@@ -1,6 +1,6 @@
 module Tickethub
   class Supplier < Resource
-    path '/supplier'
+    path '/supplier', singleton: true
 
     require_relative 'supplier/bill'
     require_relative 'supplier/customer'
@@ -66,15 +66,15 @@ module Tickethub
     def self.[](attributes)
       token = attributes[:token].is_a?(String) ? attributes[:token]
         : attributes[:token][:access_token]
-      self.new Tickethub.endpoint['/supplier', auth_type: :bearer, password: token]
+      self.load Tickethub.endpoint(auth_type: :bearer, password: token)[path]
     end
 
     def initialize(endpoint, attributes = nil)
       attributes ||= endpoint.get
 
       if attributes['token']
-        endpoint = Tickethub.endpoint['/supplier', {
-          auth_type: :bearer, password: attributes['token']['access_token'] }]
+        endpoint = Tickethub.endpoint(auth_type: :bearer,
+          password: attributes['token']['access_token'])[self.class.path]
       end
 
       super(endpoint, attributes)

data/lib/tickethub/supplier/option.rb

@@ -4,7 +4,7 @@ module Tickethub
   class Supplier::Option < Resource
     path '/supplier/options'
 
-    scope :dates, -> (params) { @endpoint[:dates, params: params].get.decoded }
+    scope :dates, -> (params) { @endpoint[:dates].get(params).decoded }
     scope :active
 
     require_relative 'season'

data/lib/tickethub/token.rb

@@ -1,6 +1,6 @@
 module Tickethub
   class Token < Resource
-    path '/token'
+    path '/token', singleton: true
 
     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'
+    path '/user', singleton: true
 
     require_relative 'user/app'
     require_relative 'user/supplier'
@@ -27,7 +27,7 @@ module Tickethub
           : attributes[:token][:access_token]
       end
 
-      endpoint = Tickethub.endpoint['/user', auth_type: :bearer, password: token]
+      endpoint = Tickethub.endpoint(auth_type: :bearer, password: token)['/user']
       self.new endpoint
     end
 

data/lib/tickethub/version.rb

@@ -1,3 +1,3 @@
 module Tickethub
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tickethub
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Oliver Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler