fanforce-api 0.8.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDU1ZWM4ZmZhNjczM2Q4YmQzNGNhMjAzNmE2NGQwMzg4NzIzNmI5Mw==
+    ZWI4MzdiMTRmN2UwOGVlYTE2Yzg3ZWI4NTdiMmY3MDQ5YzU5YzJlNw==
   data.tar.gz: !binary |-
-    MjBlMzFmM2E5ZDViNDYwMjQ5ZTEwMDdhOTBjYzY1ZTM3ZTA1MDZjOQ==
+    NDEwZGY1Y2Y2ZDJmMTg2MTBkZjBjNjQyNDgwMDU5ODFlMjY4MjViNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzMwZmI4NjQyM2FlZWFkMDFkNzI4YzgyZDlhNGY3Mjk1OTE0OGJhZjE5M2Ji
-    YmRjYjA4MTE4NjcxNDAzNTUwNWI5OTc1NGE4MmQ4ZTM2ZjdhODUwOGRkMWQ2
-    NDEzNjQ3YWZhMjgyMjcyNThkNGRkN2I5ODE1YTc4Y2Y0Y2U1NDY=
+    NTgyNzc2Mzk0ZGUwOTlhODU5OTJiNGEzOGI4NzdkNDMzMmZmNWUzZTlkMjQz
+    YTEyMGQxMjNkOGJhZGE0YjVjODlmYTk0YzEzMGU1M2JkNDAyZjcyZjcxOGRm
+    ZDJiOWEzMGFhZjQ5ZWM2Zjk1NDFjZjU4MjYzMTk3Nzc5NWVjYTE=
   data.tar.gz: !binary |-
-    ZjE5YmM4ZWEyNGRlMTU3MDVjOTgwNGQyM2Q1YTU1MzhjODk4YzFkYmYyMzdl
-    YThkODYwYTg4Y2UyNzFiNTJiMWY4ZGQ2MzcxNWFhMGM1NjgzOGJiNWY4NzQ1
-    OTU5MDg0MjRiYjBkZDhhZjY0NjVkMDM1NmI0N2JiMjc5NTk4YmE=
+    MThkZTEzOGY5ZDQ3NDQ0NzlhZWZiYmI3YzZlMmM1NDU2YTBhOGVhMzkxOWMy
+    OTRmZGYzZDZjY2Y0MjI0NDQyMDA3OGNmNzAzNjgyMjhhYjNkYmI4OTM5OTY2
+    NzFlMTFiMGMzMWNjYTQ2YzQ2NGQxZDQ1MTRjMDc0Njc1YmRhMmU=

data/lib/fanforce.rb

@@ -1,9 +1,5 @@
-class Fanforce
-  require 'fanforce/errors'
-  require_relative 'fanforce/api/version'
-  require_relative 'fanforce/api/_main'
-  require_relative 'fanforce/api/ff_globals'
-  require_relative 'fanforce/api/error'
-  include Fanforce::Api
+require './fanforce/api'
+class Fanforce < Fanforce::Api
+  # ToDo: remove Fanforce::Api from inheritance. Fanforce should be a bare class.
 end
 

data/lib/fanforce/api.rb

@@ -0,0 +1,9 @@
+class Fanforce
+  require 'fanforce/errors'
+
+  require_relative 'api/_main'
+  require_relative 'api/version'
+  require_relative 'api/ff_globals'
+  require_relative 'api/error'
+end
+

data/lib/fanforce/api/_main.rb

@@ -2,12 +2,10 @@ require 'rest-client'
 require_relative 'utils'
 require_relative 'response'
 
-module Fanforce::Api
+class Fanforce::Api
   include Fanforce::Api::Utils
   include Fanforce::Errors
 
-  def self.included(base) base.extend(self)  end
-
   def initialize(arg={})
     if arg.is_a?(Hash)
       add_params(arg)
@@ -38,7 +36,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.process(response, request, complete_url(path), req_params)
+      Fanforce::Api::Response.process(response, request, complete_url(path), req_params)
     end
   end
 

data/lib/fanforce/api/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
-  module Api
-    VERSION = '0.8.0'
+  class Api
+    VERSION = '0.8.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-api
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Caleb Clark
@@ -68,6 +68,7 @@ files:
 - Rakefile
 - fanforce-api.gemspec
 - lib/fanforce.rb
+- lib/fanforce/api.rb
 - lib/fanforce/api/_main.rb
 - lib/fanforce/api/error.rb
 - lib/fanforce/api/ff_globals.rb