fanforce 0.6.4 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDE3NjVjZjMyODBmY2MzYmM4MDRlOTg0ZDc5MmZkZmJmZWJjYzM4YQ==
+    YThmODJmMjE2M2EzZDRmYTBmNjY0YmJlNjM5MmU0MTg3YzA1YTBlOA==
   data.tar.gz: !binary |-
-    OWJiMWE5OWIxMGQ5Njg4NjY1NWFkODQ1ZDBlZmE4YTY4YzE2ODQ3OQ==
+    YzJlZTljMTZkOWI3YzA3ZDgxNjlkYTM3NjEzOTdlYzNlNjVhODk5YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDZlMzU3ZDYxN2ZkZDI3ZmE0ZGE0ZjhkYTliNjMxMjJjMGViYmM1MmE5NGE5
-    ZGVmOGMxNWYyYjNjYzQ0ZTRiZjUyYWM2ZWVmZTlkN2VlYTAwM2U0OTczZjdj
-    NzY0Zjk2NDQzNmUyYWRmMWE3ZmRiODUxODg4YzdhNDc0NzAwNjg=
+    OTcxMmM5NWQ4NzNkZDZkMTM4YTAxYTVmYTU3YTMxODQzM2JlYTZkZmY0Mzc3
+    MDVhYjI1NjliOTA5YmQxNGZiYzc0YTI2MzEyMDJhMTlhYTYzMzg3NDc3MDAw
+    YjJhZjkwNmI0M2MwMzBhN2E5ZmYxMGYyNWQ5M2I1YTU0NGY3ZGM=
   data.tar.gz: !binary |-
-    MzMwZjNmMGUyNjcyNmRiY2EwMTY1YTk0YmZiM2YwMmZkMTM1MmFjZWFlM2M3
-    MThlODY4ZmVjNWU4NmNjMjhhOWU0YTYyNWU2MjllNjQxMDVhNDExMDk2YTA0
-    ZDllNDg1MDdmMTJmN2IwOTVhZDQ2ZGFiMDgxNGRhNTkzOWNiYWU=
+    ZDA4NGQxZjRmNDdlMzMzYWE3NmE1OTUyMGIwNzAyYTA5NjJkZTkzNTY5ZTFh
+    MjlhNDc0YmUwYTkwNzQ5YzA1MDYxNDA3MTg2MTM4ZDFjYTYwZjFiNTc3NDcy
+    Y2UxMzFmNmU3M2Q4M2JmYTRlYjgzMmRlYjY1MGFkMTAxMDMzNzk=

data/lib/fanforce/api/_main.rb

@@ -28,7 +28,7 @@ module Fanforce::Api
   def get(path, req_params={})
     req_params = apply_auth(req_params)
     RestClient.get(url(path, req_params), :accept => :json) do |response, request, result, &block|
-      Fanforce::Response.new(response, request, complete_url(path), req_params)
+      Fanforce::Response.process(response, request, complete_url(path), req_params)
     end
   end
 
@@ -46,7 +46,7 @@ module Fanforce::Api
     url = complete_url(path)
     req_params = apply_auth(req_params)
     RestClient.post(url, req_params.to_json, :content_type => :json, :accept => :json) do |response, request, result, &block|
-      Fanforce::Api::Response.new(response, request, url, req_params)
+      Fanforce::Api::Response.process(response, request, url, req_params)
     end
   end
 
@@ -54,7 +54,7 @@ module Fanforce::Api
     url = complete_url(path)
     req_params = apply_auth(req_params)
     RestClient.put(url, req_params.to_json, :content_type => :json, :accept => :json) do |response, request, result, &block|
-      Fanforce::Api::Response.new(response, request, url, req_params)
+      Fanforce::Api::Response.process(response, request, url, req_params)
     end
   end
 
@@ -62,7 +62,7 @@ module Fanforce::Api
     url = complete_url(path)
     req_params = apply_auth(req_params)
     RestClient.delete(url, {:params => to_query_string(req_params), :accept => :json}) do |response, request, result, &block|
-      Fanforce::Api::Response.new(response, request, url, req_params)
+      Fanforce::Api::Response.process(response, request, url, req_params)
     end
   end
 

data/lib/fanforce/api/response.rb

@@ -1,87 +1,103 @@
 class Fanforce::Api::Response
   attr_reader :curl_command, :requested_url, :requested_params
 
-  def initialize(response, request, requested_url, requested_params)
+  def self.process(response, request, requested_url, requested_params)
+    raise Fanforce::Api::ServerError.new(response, request, requested_url, requested_params) if response.code > 201
+    begin  response_hash = Fanforce::Utils.decode_json(response)
+    rescue Exception => e; raise Fanforce::Api::DecodingError.new(e, response, request, requested_url, requested_params) end
+    if response_hash[:results]
+      Fanforce::Api::Results.new(response_hash, response, request, requested_url, requested_params)
+    else
+      Fanforce::Api::Result.new(response_hash, response, request, requested_url, requested_params)
+    end
+  end
+
+end
+
+class Fanforce::Api::Result < Hash
+  attr_reader :requested_url, :requested_params
+
+  def initialize(response_hash, response, request, requested_url, requested_params)
     @response = response
     @request = request
     @requested_url = requested_url
     @requested_params = requested_params
-    raise Fanforce::Api::ServerError.new(response, request, requested_url, requested_params) if response.code > 201
-
-    begin
-      @response_hash = Fanforce::Utils.decode_json(response)
-    rescue Exception => e
-      raise Fanforce::Api::DecodingError.new(e, response, request, requested_url, requested_params)
-    end
-
-    @response_body = response.to_s
-    @curl_command = Fanforce::Utils.curl_command(request.method, requested_url, requested_params)
+    super(response_hash)
+  end
 
-    if @response_hash[:results].nil?
-      @result = @response_hash
-    else
-      @results = @response_hash[:results]
-      @current_results = @response_hash[:current_results]
-      @total_results = @response_hash[:total_results]
-      @current_page = @response_hash[:current_page]
-      @total_pages = @response_hash[:total_pages]
-      if request.method == :get and @response_hash[:total_pages] > @response_hash[:current_page]
-        next_page = @response_hash[:current_page] + 1
-        @next_url = "#{requested_url}?#{Fanforce::Utils.to_query_string(requested_params.merge(page: next_page))}"
-      end
-      if request.method == :get and @response_hash[:current_page] > 1
-        prev_page = @response_hash[:current_page] - 1
-        @prev_url = "#{requested_url}?#{Fanforce::Utils.to_query_string(requested_params.merge(page: prev_page))}"
-      end
-    end
+  def data
+    self
   end
+  alias result data
 
-  def code
-    @response.code
+  def curl_command
+    @curl_command ||= Fanforce::Utils.curl_command(@request.method, @requested_url, @requested_params)
   end
 
-  def to_hash
-    @response_hash
+  def body;
+    @response.to_s
   end
 
-  def to_s
-    @response_body
+  def current_results; 1   end
+  def total_results;   1   end
+  def current_page;    1   end
+  def total_pages;     1   end
+  def prev_url;        nil end
+  def next_url;        nil end
+  def code; @response.code end
+end
+
+class Fanforce::Api::Results < Array
+  attr_reader :requested_url, :requested_params
+
+  def initialize(response_hash, response, request, requested_url, requested_params)
+    @response = response
+    @request = request
+    @requested_url = requested_url
+    @requested_params = requested_params
+    super(response_hash[:results])
   end
 
-  def [](key)
-    @response_hash[key]
+  def data
+    self
   end
+  alias results data
 
-  def result
-    @result || (raise NoMethodError, 'This API response returns more than 1 record. Try using "results".')
+  def curl_command
+    @curl_command ||= Fanforce::Utils.curl_command(@request.method, @requested_url, @requested_params)
   end
 
-  def results
-    @results || (raise NoMethodError, 'This API response only returns 1 record. Try using "result".')
+  def body;
+    @response.to_s
   end
 
   def current_results
-    @current_results || 1
+    @current_results ||= @response_hash[:current_results]
   end
 
-  def total_results
-    @total_results || 1
+  def total_results;
+    @total_results ||= @response_hash[:total_results]
   end
 
-  def current_page
-    @current_page || 1
+  def current_page;
+    @current_page ||= @response_hash[:current_page]
   end
 
-  def total_pages
-    @total_pages || 1
+  def total_pages;
+    @total_pages ||= @response_hash[:total_pages]
   end
 
-  def prev_url
-    @prev_url || nil
+  def prev_url;
+    @prev_url ||= if request.method == :get and current_page > 1
+       "#{@requested_url}?#{Fanforce::Utils.to_query_string(@requested_params.merge(page: current_page-1))}"
+    end
   end
 
-  def next_url
-    @next_url || nil
+  def next_url;
+    @next_url ||= if @request.method == :get and total_pages > current_page
+      "#{@requested_url}?#{Fanforce::Utils.to_query_string(@requested_params.merge(page: current_page+1))}"
+    end
   end
+  def code; @response.code end
 
-end
+end

data/lib/fanforce/api/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module Api
-    VERSION = '0.6.4'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Caleb Clark