pingpp 2.0.15 → 2.1.0

data/lib/pingpp/api_operations/create.rb

@@ -1,15 +1,9 @@
 module Pingpp
   module APIOperations
     module Create
-      module ClassMethods
-        def create(params={}, api_key=nil)
-          response, api_key = Pingpp.request(:post, self.url, api_key, params)
-          Util.convert_to_pingpp_object(response, api_key)
-        end
-      end
-
-      def self.included(base)
-        base.extend(ClassMethods)
+      def create(params={}, opts={})
+        response, opts = request(:post, resource_url(opts), params, opts)
+        Util.convert_to_pingpp_object(response, opts)
       end
     end
   end

data/lib/pingpp/api_operations/delete.rb

@@ -1,9 +1,10 @@
 module Pingpp
   module APIOperations
     module Delete
-      def delete(params = {})
-        response, api_key = Pingpp.request(:delete, url, @api_key, params)
-        refresh_from(response, api_key)
+      def delete(params={}, opts={})
+        opts = Util.normalize_opts(opts)
+        response, opts = request(:delete, resource_url(opts), params, opts)
+        initialize_from(response, opts)
       end
     end
   end

data/lib/pingpp/api_operations/list.rb

@@ -1,16 +1,14 @@
 module Pingpp
   module APIOperations
     module List
-      module ClassMethods
-        def all(filters={}, api_key=nil)
-          response, api_key = Pingpp.request(:get, url, api_key, filters)
-          Util.convert_to_pingpp_object(response, api_key)
-        end
-      end
+      def list(filters={}, opts={})
+        opts = Util.normalize_opts(opts)
 
-      def self.included(base)
-        base.extend(ClassMethods)
+        response, opts = request(:get, resource_url(opts), filters, opts)
+        ListObject.construct_from(response, opts)
       end
+
+      alias :all :list
     end
   end
 end

data/lib/pingpp/api_operations/request.rb

@@ -0,0 +1,46 @@
+module Pingpp
+  module APIOperations
+    module Request
+      module ClassMethods
+        OPTS_KEYS_TO_PERSIST = Set[:api_key, :api_base, :app, :user]
+
+        def request(method, url, params={}, opts={})
+          opts = Util.normalize_opts(opts)
+
+          headers = opts.clone
+          api_key = headers.delete(:api_key)
+          api_base = headers.delete(:api_base)
+          headers.delete(:app)
+          headers.delete(:user)
+          headers.delete(:parents)
+          # Assume all remaining opts must be headers
+
+          response, opts[:api_key] = Pingpp.request(
+            method, url, api_key, params, headers, api_base
+          )
+
+          # Hash#select returns an array before 1.9
+          opts_to_persist = {}
+          opts.each do |k, v|
+            if OPTS_KEYS_TO_PERSIST.include?(k)
+              opts_to_persist[k] = v
+            end
+          end
+
+          [response, opts_to_persist]
+        end
+      end
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      protected
+
+      def request(method, url, params={}, opts={})
+        opts = @opts.merge(Util.normalize_opts(opts))
+        self.class.request(method, url, params, opts)
+      end
+    end
+  end
+end

data/lib/pingpp/api_operations/update.rb

@@ -2,67 +2,40 @@ module Pingpp
   module APIOperations
     module Update
       module ClassMethods
-        def update(id, params={}, api_key=nil)
-          response, opts = Pingpp.request(:put, "#{self.url}/#{id}", api_key, params)
+        def update(id, params={}, opts={})
+          response, opts = request(:put, "#{resource_url(opts)}/#{id}", params, opts)
           Util.convert_to_pingpp_object(response, opts)
         end
       end
 
-      def save(opts={})
-        values = serialize_params(self).merge(opts)
+      def save(params={}, opts={})
+        update_attributes(params)
 
-        if @values[:metadata]
-          values[:metadata] = serialize_metadata
-        end
+        params = params.reject { |k, _| respond_to?(k) }
 
-        if values.length > 0
-          values.delete(:id)
+        values = self.serialize_params(self).merge(params)
 
-          response, api_key = Pingpp.request(:put, url, @api_key, values)
-          refresh_from(response, api_key)
-        end
-        self
-      end
+        values.delete(:id)
 
-      def serialize_metadata
-        if @unsaved_values.include?(:metadata)
-          # the metadata object has been reassigned
-          # i.e. as object.metadata = {key => val}
-          metadata_update = @values[:metadata]  # new hash
-          new_keys = metadata_update.keys.map(&:to_sym)
-          # remove keys at the server, but not known locally
-          keys_to_unset = @previous_metadata.keys - new_keys
-          keys_to_unset.each {|key| metadata_update[key] = ''}
+        response, opts = request(:put, save_url, values, opts)
+        initialize_from(response, opts)
 
-          metadata_update
-        else
-          # metadata is a PingppObject, and can be serialized normally
-          serialize_params(@values[:metadata])
-        end
+        self
       end
 
-      def serialize_params(obj)
-        case obj
-        when nil
-          ''
-        when PingppObject
-          unsaved_keys = obj.instance_variable_get(:@unsaved_values)
-          obj_values = obj.instance_variable_get(:@values)
-          update_hash = {}
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
 
-          unsaved_keys.each do |k|
-            update_hash[k] = serialize_params(obj_values[k])
-          end
+      private
 
-          update_hash
+      def save_url
+        if self[:id] == nil && self.class.respond_to?(:create)
+          self.class.resource_url
         else
-          obj
+          resource_url
         end
       end
-
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
     end
   end
 end

data/lib/pingpp/api_resource.rb

@@ -1,30 +1,50 @@
 module Pingpp
   class APIResource < PingppObject
+    include Pingpp::APIOperations::Request
+
     def self.class_name
       self.name.split('::')[-1]
     end
 
-    def self.url
+    def self.object_name
+      class_name.downcase
+    end
+
+    def self.uri_object_name
+      object_name
+    end
+
+    def self.resource_url(opts={})
       if self == APIResource
         raise NotImplementedError.new('APIResource is an abstract class.  You should perform actions on its subclasses (Charge, etc.)')
       end
-      "/v1/#{CGI.escape(class_name.downcase)}s"
+
+      if opts.has_key?(:parents)
+        if opts[:parents].is_a?(Array)
+          "/v1/#{opts[:parents].join('/')}/#{CGI.escape(uri_object_name.downcase)}s"
+        else
+          raise ArgumentError.new("opts[:parents] should be an Array")
+        end
+      else
+        "/v1/#{CGI.escape(uri_object_name.downcase)}s"
+      end
     end
 
-    def url
+    def resource_url(opts={})
       unless id = self['id']
         raise InvalidRequestError.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{id.inspect}", 'id')
       end
-      "#{self.class.url}/#{CGI.escape(id)}"
+      "#{self.class.resource_url(opts)}/#{CGI.escape(id)}"
     end
 
     def refresh
-      response, api_key = Pingpp.request(:get, url, @api_key, @retrieve_options)
-      refresh_from(response, api_key)
+      response, opts = request(:get, resource_url(@opts), @retrieve_params)
+      initialize_from(response, opts)
     end
 
-    def self.retrieve(id, api_key=nil)
-      instance = self.new(id, api_key)
+    def self.retrieve(id, opts={})
+      opts = Util.normalize_opts(opts)
+      instance = self.new(id, opts)
       instance.refresh
       instance
     end

data/lib/pingpp/batch_refund.rb

@@ -0,0 +1,14 @@
+module Pingpp
+  class BatchRefund < APIResource
+    extend Pingpp::APIOperations::Create
+    extend Pingpp::APIOperations::List
+
+    def self.object_name
+      'batch_refund'
+    end
+
+    def self.resource_url(opts={})
+      '/v1/batch_refunds'
+    end
+  end
+end

data/lib/pingpp/batch_transfer.rb

@@ -0,0 +1,14 @@
+module Pingpp
+  class BatchTransfer < APIResource
+    extend Pingpp::APIOperations::Create
+    extend Pingpp::APIOperations::List
+
+    def self.object_name
+      'batch_transfer'
+    end
+
+    def self.resource_url(opts={})
+      '/v1/batch_transfers'
+    end
+  end
+end

data/lib/pingpp/charge.rb

@@ -1,13 +1,12 @@
 module Pingpp
   class Charge < APIResource
-    include Pingpp::APIOperations::List
-    include Pingpp::APIOperations::Create
-    include Pingpp::APIOperations::Update
+    extend Pingpp::APIOperations::Create
+    extend Pingpp::APIOperations::List
 
     private
 
     def refund_url
-      url + '/refunds'
+      resource_url + '/refunds'
     end
   end
 end

data/lib/pingpp/customs.rb

@@ -0,0 +1,10 @@
+module Pingpp
+  class Customs < APIResource
+    extend Pingpp::APIOperations::Create
+    extend Pingpp::APIOperations::List
+
+    def self.resource_url(opts={})
+      '/v1/customs'
+    end
+  end
+end

data/lib/pingpp/errors/channel_error.rb

@@ -3,8 +3,9 @@ module Pingpp
     attr_accessor :param
     attr_accessor :code
 
-    def initialize(message, code, param=nil, http_status=nil, http_body=nil, json_body=nil)
-      super(message, http_status, http_body, json_body)
+    def initialize(message, code, param=nil, http_status=nil, http_body=nil,
+                   json_body=nil, http_headers=nil)
+      super(message, http_status, http_body, json_body, http_headers)
       @code = code
       @param = param
     end

data/lib/pingpp/errors/invalid_request_error.rb

@@ -2,8 +2,9 @@ module Pingpp
   class InvalidRequestError < PingppError
     attr_accessor :param
 
-    def initialize(message, param, http_status=nil, http_body=nil, json_body=nil)
-      super(message, http_status, http_body, json_body)
+    def initialize(message, param, http_status=nil, http_body=nil, json_body=nil,
+                   http_headers=nil)
+      super(message, http_status, http_body, json_body, http_headers)
       @param = param
     end
   end

data/lib/pingpp/errors/pingpp_error.rb

@@ -4,12 +4,15 @@ module Pingpp
     attr_reader :http_status
     attr_reader :http_body
     attr_reader :json_body
+    attr_reader :http_headers
 
-    def initialize(message=nil, http_status=nil, http_body=nil, json_body=nil)
+    def initialize(message=nil, http_status=nil, http_body=nil, json_body=nil,
+                   http_headers=nil)
       @message = message
       @http_status = http_status
       @http_body = http_body
       @json_body = json_body
+      @http_headers = http_headers || {}
     end
 
     def to_s

data/lib/pingpp/errors/rate_limit_error.rb

@@ -0,0 +1,4 @@
+module Pingpp
+  class RateLimitError < PingppError
+  end
+end

data/lib/pingpp/event.rb

@@ -1,10 +1,8 @@
 module Pingpp
   class Event < APIResource
-    include Pingpp::APIOperations::List
 
-    def self.url
+    def self.resource_url(opts={})
       '/v1/events'
     end
-
   end
 end

data/lib/pingpp/identification.rb

@@ -1,12 +1,12 @@
 module Pingpp
   class Identification < APIResource
-    include Pingpp::APIOperations::Create
+    extend Pingpp::APIOperations::Create
 
-    def self.identify(params={}, api_key=nil)
-        create(params, api_key)
+    def self.identify(params={}, opts={})
+        create(params, opts)
     end
 
-    def self.url
+    def self.resource_url(opts={})
       '/v1/identification'
     end
 

data/lib/pingpp/list_object.rb

@@ -1,5 +1,8 @@
 module Pingpp
   class ListObject < PingppObject
+    include Pingpp::APIOperations::List
+    include Pingpp::APIOperations::Request
+    include Pingpp::APIOperations::Create
 
     def [](k)
       case k
@@ -14,22 +17,19 @@ module Pingpp
       self.data.each(&blk)
     end
 
-    def retrieve(id, api_key=nil)
-      api_key ||= @api_key
-      response, api_key = Pingpp.request(:get,"#{url}/#{CGI.escape(id)}", api_key)
-      Util.convert_to_pingpp_object(response, api_key)
+    def empty?
+      self.data.empty?
     end
 
-    def create(params={}, api_key=nil)
-      api_key ||= @api_key
-      response, api_key = Pingpp.request(:post, url, api_key, params)
-      Util.convert_to_pingpp_object(response, api_key)
+    def retrieve(id, opts={})
+      id, retrieve_params = Util.normalize_id(id)
+      response, opts = request(:get, "#{resource_url(opts)}/#{CGI.escape(id)}", retrieve_params, opts)
+      Util.convert_to_pingpp_object(response, opts)
     end
 
-    def all(params={}, api_key=nil)
-      api_key ||= @api_key
-      response, api_key = Pingpp.request(:get, url, api_key, params)
-      Util.convert_to_pingpp_object(response, api_key)
+    def resource_url(opts={})
+      self.url ||
+        raise(ArgumentError, "List object does not contain a 'url' field.")
     end
   end
 end