fanforce 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmE3Y2YxNWNiMzU2N2M1ZGY2OGU3ZWI5MTE3ZmU3ZGQ3MTIwMjNlMA==
+    NTBmNDMzZTVhYzQwNDc3YzNkNTBkYzcyMDNmYjM3ZGYxMDY0YTI1Mg==
   data.tar.gz: !binary |-
-    M2U2YjRiMDgwMGFiMzdkM2FhZmI3YzY0NzU5ZmY4YWNmOWZmZjk2YQ==
+    ZDY5NmM5MjllNjAzYzM5ODYxYmZiZmJlNjA1OTEyMWMyMTc1NjBjMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmY1ZmE3YTUyOGI5NWU0YjdkY2RiM2U0MjUxMzZmMTQzNDRlNWQyOWJjMTQ5
-    ZGVlMDY5MDlhYzVkOWM3ZTZmNGM5ODkxYjFkODc5NTAyYTM3ZTEzNjkyNWNl
-    YThkM2Q3Y2RmYWI0MzdlNmVmNDhjZDUxYzY2NzAwZmU0NDQ1ODc=
+    MzFjZjQ2NGJlMDQ2Y2Q0MjFlZmUzZDdhNzMyNDJiMTI5MmYzOGVmNzZjYTc1
+    NTZhMDk1YTY2OTA1MjgxNDQxMTNmZjQ2NTcwMDZhZjI1MDVjZmU4YjUyMGZj
+    YTM2Zjg1MTQ2YjQ1MjE3Njk3ZWIxNDdkM2FlZmEyMTRmZGJlYzE=
   data.tar.gz: !binary |-
-    OTk1NTQwMTRjNzEyODg3Y2FmZjNlMDY2NDI3YzJiMTllNDBlNmM0ZTQyN2Rm
-    YmZjYjU3MGUxMWFjMWQwMWI3YmZjNzFiMGY0YjUzODU3YTcyZTdmZmRkMzA2
-    ZWQyM2ZiYWI4MDVjZTNjZDQxOWNhYjMzODZlMGQxOTM2NTA1NjE=
+    Y2M5ZWQ3N2Q0ZjE1OWE3Y2IzNDMyNWVmYmU0YWEwYTk3OGQ3OWFmZTY2ODQ5
+    NTkyMDk0ZjVkNDQxMGVkMDFjOTVhOTRhNGQ4ZjJiYzVhYzYyMGZlMDI2YWIz
+    NzkxODk1MjA4MjFjZTZhOGI4NjMwYjI0ZDNlYjhjODU4N2FmZjM=

data/lib/fanforce/api/error.rb

@@ -1,26 +1,68 @@
 require_relative 'utils'
 
 class Fanforce::Api::Error < StandardError
-  attr_accessor :path, :query_params, :request, :response, :request_url, :http_status
+  attr_accessor :response, :request, :requested_url, :requested_params, :errors
 
-  def initialize(response, request, path, query_params)
-    @query_params = query_params
-    @path = path
+  def initialize(message, response, request, requested_url, requested_params)
+    @response = response
     @request = request
+    @requested_url = requested_url
+    @requested_params = requested_params
+    @message = message
+    super(message)
+  end
+
+  def curl_command
+    method = begin @request.method rescue nil end
+    Fanforce::Utils.curl_command(method, @requested_url, @requested_params)
+  end
+
+  def code;    @response.respond_to?(:code) ? @response.code : 500 end
+  def to_s;    @message end
+  def to_hash; {}  end
+  def to_json; to_hash.to_json end
+end
+
+class Fanforce::Api::ServerError < Fanforce::Api::Error
+
+  def initialize(response, request, requested_url, requested_params)
+    @response_body = response.to_s
+
     begin
-      @response = MultiJson.load(response, :symbolize_keys => true)
+      @response_hash = Fanforce::Utils.decode_json(response)
+      @errors = @response_hash[:errors]
     rescue Exception => e
-      @response = "Error decoding JSON in Fanforce gem: #{e.message}"
+      raise Fanforce::Api::DecodingError.new(e, response, request, requested_url, requested_params)
     end
-    @request_url = "#{@path}?#{Fanforce::Utils.to_query_string(@query_params)}"
-    super(@response.is_a?(Hash) ? @response[:msg] : @response)
+
+    super(response.to_s, response, request, requested_url, requested_params)
+  end
+
+  def to_hash
+    @response_hash
   end
 
   def curl_command
     method = begin @request.method rescue nil end
-    Fanforce::Utils.curl_command(method, @path, @query_params)
+    Fanforce::Utils.curl_command(method, @requested_url, @requested_params)
   end
 
   def code; @response.code end
 
 end
+
+class Fanforce::Api::DecodingError < Fanforce::Api::Error
+
+  def initialize(e, response, request, requested_url, requested_params)
+    @message = "There was a Fanforce gem error while decoding JSON response: #{e.message}"
+    @errors = [{message: @message}]
+    super(@message, response, request, requested_url, requested_params)
+  end
+
+  def to_hash
+    {errors: @errors}
+  end
+
+  def code; 500 end
+
+end

data/lib/fanforce/api/response.rb

@@ -1,49 +1,59 @@
 class Fanforce::Api::Response
-  attr_reader :curl_command, :request_url, :response_body, :response_json
-
-  def initialize(response, request, url, req_params)
-    case response.code
-    when 200, 201
-      begin
-        @response_body = response.to_s
-        @response_json = Fanforce::Utils.decode_json(response)
-        @curl_command = Fanforce::Utils.curl_command(request.method, url, req_params)
-        @request_url = url
-        if !@response_json[:results].nil?
-          @results = @response_json[:results]
-          @current_results = @response_json[:current_results]
-          @total_results = @response_json[:total_results]
-          @current_page = @response_json[:current_page]
-          @total_pages = @response_json[:total_pages]
-          if request.method == :get and @response_json[:total_pages] > @response_json[:current_page]
-            next_page = @response_json[:current_page] + 1
-            @next_url = "#{url}?#{Fanforce::Utils.to_query_string(req_params.merge(page: next_page))}"
-          end
-          if request.method == :get and @response_json[:current_page] > 1
-            prev_page = @response_json[:current_page] - 1
-            @prev_url = "#{url}?#{Fanforce::Utils.to_query_string(req_params.merge(page: prev_page))}"
-          end
-        else
-          @result = @response_json
-        end
-      rescue
-        raise
-      end
+  attr_reader :curl_command, :requested_url, :requested_params
+
+  def initialize(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)
+
+    if @response_hash[:results].nil?
+      @result = @response_hash
     else
-      raise Fanforce::Api::Error.new(response, request, url, req_params)
+      @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
   end
 
+  def code
+    @response.code
+  end
+
   def to_json
     to_hash.to_json
   end
 
   def to_hash
-    @response_json
+    @response_hash
+  end
+
+  def to_s
+    @response_body
   end
 
   def [](key)
-    @response_json[key]
+    @response_hash[key]
   end
 
   def result

data/lib/fanforce/api/utils.rb

@@ -65,37 +65,4 @@ module Fanforce::Api::Utils
     params.clone.delete_if { |k,v| [:api_key].include? k }
   end
 
-  def log(str)
-    #puts "Fanforce: #{str}"
-  end
-
-  def decode_json(str, symbolize_keys=true)
-    log str
-    MultiJson.load(str, :symbolize_keys => symbolize_keys)
-  end
-
-  # Creates a string representation of a javascript object for $.tmpl
-  def compile_jquery_tmpls(options={}, &block)
-    begin require 'haml' rescue LoadError raise "You must have the haml gem installed for Fanforce.compile_jquery_templates to work." end
-    context = Object.new
-    class << context
-      include Haml::Helpers
-    end
-    context.init_haml_helpers
-
-    format = if options[:format] == 'html' then :html else options[:callback].present? ? :jsonp : :json end
-
-    return context.capture_haml(&block) if format == :html
-    single_line_html = context.capture_haml(&block).split(/\r?\n/).inject('') {|sl, l| sl += l.strip + ' ' }
-    matches = single_line_html.scan(/<script id=[\"'](.*?)[\"'](?:.*?)>(.*?)(?:<\/script>)/mi)
-
-    templates = matches.inject({}) {|t,m| t[m[0]] = m[1]; t }
-    if format == :jsonp
-      "#{options[:callback]}(#{templates.to_json})"
-    else
-      templates.to_json
-    end
-  end
-
-
 end

data/lib/fanforce/api/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module Api
-    VERSION = '0.6.1'
+    VERSION = '0.6.2'
   end
 end

metadata

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