fanforce 0.7.5 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDQzNzczOWNiNmM0NjBhY2VkZDAwZmE3ZGIwNWYzNWU0MmRlNWEzOQ==
+    YThhNWRiNmFkOTY5OGNlMmQyODNiNjlkMDA1Y2Q1MDA5YzE2Y2FmYg==
   data.tar.gz: !binary |-
-    YTVhOWNiMjJkYTRlOTBhMGNkNzY5NTJkNDk4ODA2ZTM0MGE5ZDA1MQ==
+    MDBjMGI3M2U1MDViZTkzZDI4NThmMTAxYmJlZmEyYWFiYjFmZTdlNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDlmYmFlNjdiYTc0OTA2YTg1MjE5ZGM4ZDg1MGE0YmZiZDVkMGEyNTM2YzFh
-    MTBmODcyNmIyMGZjNTJlZmUwMjM3YTJhZjBlZWM0ODcyM2VmZDQ2N2QxYzk3
-    ZDg0YjJmN2EwODExZWZiYWNmMTU1NGY3MGUxYTYxYzk5Y2M2NTY=
+    OWI2ODJhMmViY2I4OWUzNmZjZDI5NDQ4NWQxNmQ4NDQ4ZTdmNjYzYWFkNGVk
+    ZDdkYjM4ODIxZWZlOGVlOTgyNDQxZWVlN2E5ZDliODJmM2QyZGI2ZTkxMjIw
+    MjMyYjZlNTZjYTg4YzNmZDk2YmZiY2U0NTM3NTE5MWJjMDQ0OTc=
   data.tar.gz: !binary |-
-    YjUxMzE4Yjc0NDY0YmVhY2JkMmY0OWIzNGNmYmVhMGM0NTMyMmJmZmI1YjJk
-    MjM2MWRiNWMxMjRiYWM1Y2ZhZmUwZGZlMmZlMzBhNjBiZmUzYWUyMjFkZjJi
-    OGI4ZjNiZjFkZWRmNDYzZDc5OTEwNWViYzU0ZjhlMDE2OTRhNDQ=
+    MDA0YmM4N2U4ZTg1YTEyNjk2MGM4M2VjMWQwNWQ2MmQ5NGMyMmJiYjhhM2I3
+    MjEwOGZiOGE4NjE1Y2I0NmFiZjNjNTg0NWUxZmE3MzAyNjM0NWM0NGQ1N2I5
+    Y2U5NzZkNmUzODYwODkyODc1Yzk1MTQ2OWEzZDE2NWY2Y2RmMjE=

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Caleb Clark
+Copyright (c) 2013 Caleb Clark
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,133 +1,4 @@
-## Install
+fanforce
+========
 
-Via rubygems.org:
-
-```
-$ gem install fanforce
-```
-
-To build and install the development branch yourself from the latest source:
-
-```
-$ git clone git@github.com:mlabs/fanforce-ruby.git
-$ cd fanforce-ruby
-$ git checkout master
-$ rake gem
-$ gem install pkg/fanforce-{version}
-```
-
-## Getting Started
-
-### Set It Up
-
-``` ruby
-require 'rubygems' # not necessary with ruby 1.9 but included for completeness
-require 'fanforce'
-
-# put your own credentials here
-api_key = 'ACxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-
-# set up a client to talk to the Fanforce API
-ff = Fanforce.new api_key
-```
-
-### Making Your First Call
-
-``` ruby
-# get your api access info
-ff.get('/access_info', {})
-```
-
-## Full REST Access
-
-### GET
-
-``` ruby
-ff.get('/', {})
-```
-
-### POST
-
-``` ruby
-ff.post('/', {})
-```
-
-### PUT
-
-``` ruby
-ff.put('/', {})
-```
-
-### DELETE
-
-``` ruby
-ff.delete('/')
-```
-
-## Error Handling
-
-```ruby
-begin
-    ff.get('/bad_page')
-rescue Fanforce::Error => e
-    puts e.curl_command
-end
-```
-
-e.curl_command
-e.response_code
-e.response_body
-e.request_url
-e.request_params
-
-BadRequestError
-
-## Utils
-
-ff.get_url(path, query_params)
-
-ff.curl_command(method, path, query_params)
-
-ff.validate_auth
-
-ff.to_query_string
-
-ff.compile_jquery_tmpls
-
-ff.decode_json
-
-ff.parse_url
-
-ff.remove_sensitive_params
-
-ff.remove_internal_params
-
-## Handling Results
-
-response.result
-response.results
-
-response.total_results
-response.current_results
-response.current_page
-response.total_pages
-
-## Paging
-
-response.prev_url
-response.next_url
-
-## Logging
-
-By default logging is turned off.
-```ruby
-Fanforce.config do |config|
-  config.logging = true
-end
-```
-
-For more info, see RestClient.logging.
-
-## More Information
-
-Visit the Fanforce Developers site to explore the full API access methods available.
+foundational gem used internally by other fanforce gems

data/Rakefile

@@ -9,8 +9,8 @@ task :default => :build
 ########################################################################
 
 Rake::TestTask.new do |t|
-  t.libs.push "lib"
-  t.libs.push "test"
+  t.libs.push 'lib'
+  t.libs.push 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end

data/fanforce.gemspec

@@ -1,24 +1,19 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fanforce/api/version'
+require 'fanforce/version'
 
 Gem::Specification.new do |gem|
   gem.name        = 'fanforce'
-  gem.version     = Fanforce::Api::VERSION
-  gem.date        = '2012-10-19'
-  gem.summary     = %q{Ruby API wrapper for Fanforce}
-  gem.description = %q{Ruby API wrapper that interfaces with all six Fanforce APIs.}
+  gem.version     = Fanforce::VERSION
+  gem.date        = '2013-08-27'
+  gem.summary     = %q{Core Fanforce gem}
+  gem.description = %q{Core gem used internally by other Fanforce gems}
   gem.authors     = ['Caleb Clark']
   gem.email       = ['cclark@fanforce.com']
-  gem.homepage    = 'http://github.com/mlabs/fanforce-ruby'
+  gem.homepage    = 'http://github.com/fanforce/fanforce'
 
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
-
-  gem.add_runtime_dependency 'multi_json', '~> 1.3'
-  gem.add_runtime_dependency 'rest-client', '~> 1.6.7'
-
-  gem.add_runtime_dependency 'fanforce-internal-errors', '~> 0.1'
 end

data/lib/fanforce/domains.rb

@@ -0,0 +1,45 @@
+module Fanforce
+
+  if ENV['RACK_ENV'] == 'development'
+    TOP_LEVEL_DOMAIN  = ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN'] || 'gg'
+    BASE_DOMAIN       = ENV['FANFORCE_GEM_BASE_DOMAIN'] || 'fanforce.' + TOP_LEVEL_DOMAIN
+    SMARTURL_DOMAIN   = 'fanforc.gg'
+    FF_APP_DOMAIN     = 'ffapp.gg'
+    FF_PLUGIN_DOMAIN  = 'ffplugin.gg'
+    FF_WIDGET_DOMAIN  = 'ffwidget.gg'
+
+  elsif ENV['RACK_ENV'] == 'test'
+    BASE_DOMAIN       = 'fanforce.gg'
+    SMARTURL_DOMAIN   = 'fanforc.gg'
+    FF_APP_DOMAIN     = 'ffapp.gg'
+    FF_PLUGIN_DOMAIN  = 'ffplugin.gg'
+    FF_WIDGET_DOMAIN  = 'ffwidget.gg'
+
+  elsif ENV['RACK_ENV'] == 'staging'
+    BASE_DOMAIN       = 'fanforce-staging.com'
+    SMARTURL_DOMAIN   = 'fanforc.us'
+    FF_APP_DOMAIN     = 'ffapp.us'
+    FF_PLUGIN_DOMAIN  = 'ffplugin.us'
+    FF_WIDGET_DOMAIN  = 'ffwidget.us'
+
+  else
+    BASE_DOMAIN       = 'fanforce.com'
+    SMARTURL_DOMAIN   = 'fanforce.io'
+    FF_APP_DOMAIN     = 'ffapp.io'
+    FF_PLUGIN_DOMAIN  = 'ffplugin.io'
+    FF_WIDGET_DOMAIN  = 'ffwidget.io'
+  end
+
+  API_DOMAIN           = 'api.' + BASE_DOMAIN
+  I_DOMAIN             = 'i.' + BASE_DOMAIN
+  WEBSITE_DOMAIN       = BASE_DOMAIN
+  DEVELOPERS_DOMAIN    = 'developers.' + BASE_DOMAIN
+  CONTROLLER_DOMAIN    = 'controller.' + BASE_DOMAIN
+  ADDON_MANAGEMENT_URL = CONTROLLER_DOMAIN + '/db'
+
+  # these should be moved to edition
+  APP_DOMAIN           = 'app.' + BASE_DOMAIN
+  SIGNUP_DOMAIN        = 'signup.' + BASE_DOMAIN
+  MARKETPLACE_DOMAIN   = 'appstore.' + BASE_DOMAIN
+
+end

data/lib/fanforce/version.rb

@@ -0,0 +1,3 @@
+class Fanforce
+  VERSION = '0.10.0'
+end

metadata

@@ -1,58 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fanforce
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.7
-- !ruby/object:Gem::Dependency
-  name: fanforce-internal-errors
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-description: Ruby API wrapper that interfaces with all six Fanforce APIs.
+date: 2013-08-27 00:00:00.000000000 Z
+dependencies: []
+description: Core gem used internally by other Fanforce gems
 email:
 - cclark@fanforce.com
 executables: []
@@ -60,22 +18,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rbenv-gemsets
-- .rbenv-version
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
 - fanforce.gemspec
-- lib/fanforce.rb
-- lib/fanforce/api/_main.rb
-- lib/fanforce/api/error.rb
-- lib/fanforce/api/ff_globals.rb
-- lib/fanforce/api/response.rb
-- lib/fanforce/api/utils.rb
-- lib/fanforce/api/version.rb
-- test/fanforce_test.rb
-homepage: http://github.com/mlabs/fanforce-ruby
+- lib/fanforce/domains.rb
+- lib/fanforce/version.rb
+homepage: http://github.com/fanforce/fanforce
 licenses: []
 metadata: {}
 post_install_message: 
@@ -97,6 +47,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Ruby API wrapper for Fanforce
-test_files:
-- test/fanforce_test.rb
+summary: Core Fanforce gem
+test_files: []

data/.rbenv-gemsets

@@ -1 +0,0 @@
-fanforce-ruby

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p194

data/lib/fanforce.rb

@@ -1,9 +0,0 @@
-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
-end
-

data/lib/fanforce/api/_main.rb

@@ -1,100 +0,0 @@
-require 'rest-client'
-require_relative 'utils'
-require_relative 'response'
-
-module 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)
-      auth(@params) if @params.length > 0
-    elsif arg.is_a?(String)
-      auth(arg)
-    end
-  end
-
-  def params
-    @params ||= {}
-  end
-
-  def add_params(params_to_add)
-    params.merge!(collect_known_params params_to_add)
-  end
-
-  def url(path, req_params={})
-    req_params = apply_auth(req_params)
-    "#{complete_url(path)}?#{to_query_string(req_params)}"
-  end
-
-  def curl_command(method, path, req_params={})
-    req_params = apply_auth(req_params)
-    Fanforce::Utils.curl_command(method, complete_url(path), req_params)
-  end
-
-  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)
-    end
-  end
-
-  def post(path, req_params={})
-    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.process(response, request, url, req_params)
-    end
-  end
-
-  def put(path, req_params={})
-    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.process(response, request, url, req_params)
-    end
-  end
-
-  def delete(path, req_params={})
-    url = complete_url(path)
-    req_params = apply_auth(req_params)
-    RestClient.delete(url(path, req_params), :accept => :json) do |response, request, result, &block|
-      Fanforce::Api::Response.process(response, request, url, req_params)
-    end
-  end
-
-  def identify(req_params)
-    post '/bie/identify', req_params
-    {success: true}
-  end
-
-  def track(plugin_id, req_params)
-    post '/bie/track', req_params.merge(plugin_id: plugin_id)
-    {success: true}
-  end
-
-  def auth(auth_data=nil)
-    @auth_hash ||= {}
-    return @auth_hash if is_blank?(auth_data)
-    auth_data = auth_data.is_a?(Hash) ? auth_data.symbolize_keys : {api_key: auth_data.to_s}
-    @auth_hash.merge! remove_nil_values(api_key: auth_data[:api_key], fanforce_id: auth_data[:fanforce_id], fanforce_slug: auth_data[:fanforce_slug])
-    params.merge!(@auth_hash)
-    valid_auth?
-  end
-
-  def valid_auth?
-    is_present?(@auth_hash) and is_present?(@auth_hash[:api_key]) and is_present?(@auth_hash[:fanforce_id])
-  end
-
-  def apply_auth(req_params)
-    req_params.merge(@auth_hash || {})
-  end
-
-  def complete_url(path)
-    'http://' + $API_DOMAIN + path
-  end
-
-end

data/lib/fanforce/api/error.rb

@@ -1,67 +0,0 @@
-require_relative 'utils'
-
-class Fanforce::Api::Error < StandardError
-  attr_accessor :response, :request, :requested_url, :requested_params, :errors
-
-  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
-end
-
-class Fanforce::Api::ServerError < Fanforce::Api::Error
-
-  def initialize(response, request, requested_url, requested_params)
-    @response_body = response.to_s
-
-    begin
-      @response_hash = Fanforce::Utils.decode_json(response)
-      @errors = @response_hash[:errors]
-    rescue Exception => e
-      raise Fanforce::Api::DecodingError.new(e, response, request, requested_url, requested_params)
-    end
-
-    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, @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/ff_globals.rb

@@ -1,73 +0,0 @@
-if !ENV['RACK_ENV'] or ENV['RACK_ENV'] == 'development'
-  top_level_domain = ENV['FANFORCE_GEM_TOP_LEVEL_DOMAIN'] || 'gg'
-  $BASE_DOMAIN    = ENV['FANFORCE_GEM_BASE_DOMAIN'] || 'fanforce.' + top_level_domain
-  $APP_DOMAIN     = 'app.' + $BASE_DOMAIN
-  $API_DOMAIN     = 'api.' + $BASE_DOMAIN
-  $I_DOMAIN       = 'i.'   + $BASE_DOMAIN
-  $WEBSITE_DOMAIN = $BASE_DOMAIN
-
-  $SMARTURL_DOMAIN  = 'fanforc.'  + top_level_domain
-  $FF_PLUGIN_DOMAIN = 'ffplugin.' + top_level_domain
-  $FF_APP_DOMAIN    = 'ffapp.'    + top_level_domain
-  $FF_WIDGET_DOMAIN = 'ffwidget.' + top_level_domain
-
-  $DEVS_DOMAIN = 'technical%40mobilizationlabs.com:zE27fdevelopers@developers-fanforce.dotcloud.com' # or localhost:3000'
-
-  $PUSHER_APP_ID = '23240'
-  $PUSHER_KEY    = '029caf227a64c8e82e99'
-  $PUSHER_SECRET = '3169163d2e27de9a2291'
-
-elsif ENV['RACK_ENV'] == 'test'
-  $BASE_DOMAIN    = 'fanforce.gg'
-  $APP_DOMAIN     = 'app.' + $BASE_DOMAIN
-  $API_DOMAIN     = 'api.' + $BASE_DOMAIN
-  $I_DOMAIN       = 'i.'   + $BASE_DOMAIN
-  $WEBSITE_DOMAIN = $BASE_DOMAIN
-
-  $SMARTURL_DOMAIN  = 'fanforc.gg'
-  $FF_PLUGIN_DOMAIN = 'ffplugin.gg'
-  $FF_WIDGET_DOMAIN = 'ffwidget.gg'
-  $FF_APP_DOMAIN    = 'ffapp.gg'
-
-  $DEVS_DOMAIN = 'technical%40mobilizationlabs.com:zE27fdevelopers@developers-fanforce.dotcloud.com'
-
-  $PUSHER_APP_ID = '23243'
-  $PUSHER_KEY    = '7bcc87b3c55301f687b9'
-  $PUSHER_SECRET = '61c760c05430e68d7e8d'
-
-elsif ENV['RACK_ENV'] == 'qa'
-  $BASE_DOMAIN    = 'fanforce-qa.com'
-  $APP_DOMAIN     = 'app.' + $BASE_DOMAIN
-  $API_DOMAIN     = 'api.' + $BASE_DOMAIN
-  $I_DOMAIN       = 'i.'   + $BASE_DOMAIN
-  $WEBSITE_DOMAIN = $BASE_DOMAIN
-
-  $SMARTURL_DOMAIN  = 'fanforc.us'
-  $FF_PLUGIN_DOMAIN = 'ffplugin.us'
-  $FF_APP_DOMAIN    = 'ffapp.us'
-  $FF_WIDGET_DOMAIN = 'ffwidget.us'
-
-  $DEVS_DOMAIN = 'technical%40mobilizationlabs.com:zE27fdevelopers@developers-fanforce.dotcloud.com'
-
-  $PUSHER_APP_ID = '14778'
-  $PUSHER_KEY    = 'b5e2e23fb9542798ef38'
-  $PUSHER_SECRET = '7bfba2003df078ca64e9'
-
-elsif ENV['RACK_ENV'] == 'production'
-  $BASE_DOMAIN    = 'fanforce.com'
-  $APP_DOMAIN     = 'app.' + $BASE_DOMAIN
-  $API_DOMAIN     = 'api.' + $BASE_DOMAIN
-  $I_DOMAIN       = 'i.'   + $BASE_DOMAIN
-  $WEBSITE_DOMAIN = $BASE_DOMAIN
-
-  $SMARTURL_DOMAIN  = 'fanforce.io'
-  $FF_PLUGIN_DOMAIN = 'ffplugin.io'
-  $FF_APP_DOMAIN    = 'ffapp.io'
-  $FF_WIDGET_DOMAIN = 'ffwidget.io'
-
-  $DEVS_DOMAIN = 'technical%40mobilizationlabs.com:zE27fdevelopers@developers-fanforce.dotcloud.com'
-
-  $PUSHER_APP_ID = '14778'
-  $PUSHER_KEY    = 'b5e2e23fb9542798ef38'
-  $PUSHER_SECRET = '7bfba2003df078ca64e9'
-end

data/lib/fanforce/api/response.rb

@@ -1,111 +0,0 @@
-class Fanforce::Api::Response
-  attr_reader :curl_command, :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
-    @response_hash = response_hash
-    self.replace(response_hash)
-  end
-
-  def data
-    self
-  end
-  alias result data
-
-  def curl_command
-    @curl_command ||= Fanforce::Utils.curl_command(@request.method, @requested_url, @requested_params)
-  end
-
-  def body;
-    @response.to_s
-  end
-
-  def current_results; 1   end
-  def total_results;   1   end
-  def current_page;    1   end
-  def total_pages;     1   end
-  def prev_page;       nil end
-  def next_page;       nil end
-  def prev_page_url;   nil end
-  def next_page_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
-    @response_hash = response_hash
-    self.replace(response_hash[:results])
-  end
-
-  def data
-    self
-  end
-  alias results data
-
-  def curl_command
-    @curl_command ||= Fanforce::Utils.curl_command(@request.method, @requested_url, @requested_params)
-  end
-
-  def body;
-    @response.to_s
-  end
-
-  def current_results
-    @current_results ||= @response_hash[:current_results]
-  end
-
-  def total_results;
-    @total_results ||= @response_hash[:total_results]
-  end
-
-  def current_page;
-    @current_page ||= @response_hash[:current_page]
-  end
-
-  def total_pages;
-    @total_pages ||= @response_hash[:total_pages]
-  end
-
-  def prev_page
-    @prev_page ||= (@request.method == :get and current_page > 1) ? current_page - 1 : nil
-  end
-
-  def next_page
-    @next_page ||= (@request.method == :get and total_pages > current_page) ? current_page + 1 : nil
-  end
-
-  def prev_page_url;
-    @prev_page_url ||= prev_page ? "#{@requested_url}?#{Fanforce::Utils.to_query_string(@requested_params.merge(page: current_page-1))}" : nil
-  end
-
-  def next_page_url;
-    @next_page_url ||= next_page ? "#{@requested_url}?#{Fanforce::Utils.to_query_string(@requested_params.merge(page: current_page+1))}" : nil
-  end
-  def code; @response.code end
-
-end

data/lib/fanforce/api/utils.rb

@@ -1,67 +0,0 @@
-require 'fanforce/utils'
-
-module Fanforce::Api::Utils
-  include Fanforce::Utils
-  extend Fanforce::Api::Utils
-  def self.included(base) base.extend(self) end
-
-  def valid_fanforce_js_request?(params=@params)
-    return false if !params.is_a?(Hash)
-    return false if is_blank?(params[:fanforce_id]) or is_blank?(params[:api_key])
-    return true
-  end
-
-  def valid_fanforce_request?(params=@params)
-    return false if !params.is_a?(Hash)
-    return false if is_blank?(params[:fanforce_id])
-    return false if is_blank?(params[:app_id]) and is_blank?(params[:behavior_plugin_id]) and is_blank?(params[:plugin_id]) and is_blank?(params[:widget_id])
-    return true
-  end
-
-  def valid_install_request?(params=@params)
-    return false if !params.is_a?(Hash)
-    return false if is_blank?(params[:fanforce_id])
-    return false if is_blank?(params[:app_id]) and is_blank?(params[:behavior_plugin_id]) and is_blank?(params[:plugin_id]) and is_blank?(params[:widget_id])
-    return false if is_blank?(params[:api_key])
-    return true
-  end
-
-  def valid_uninstall_request?(params=@params)
-    return false if !params.is_a?(Hash)
-    return false if is_blank?(params[:fanforce_id])
-    return false if is_blank?(params[:app_id]) and is_blank?(params[:behavior_plugin_id]) and is_blank?(params[:plugin_id]) and is_blank?(params[:widget_id])
-    return false if is_blank?(params[:api_key])
-    return true
-  end
-
-  def remove_nil_values(hash)
-    hash.clone.delete_if {|k,v| v.nil? }
-  end
-
-  def collect_known_params(params)
-    params = params.symbolize_keys
-    if is_present?(params[:app_id])
-      addon_type = :app
-      addon_id = params[:app_id]
-    elsif is_present?(params[:behavior_plugin_id])
-      addon_type = :plugin
-      addon_id = params[:behavior_plugin_id]
-    elsif is_present?(params[:plugin_id])
-      addon_type = :plugin
-      addon_id = params[:plugin_id]
-    elsif is_present?(params[:widget_id])
-      addon_type = :widget
-      addon_id = params[:widget_id]
-    end
-    remove_nil_values(:"#{addon_type}_id" => params[:"#{addon_type}_id"], addon_type: addon_type, addon_id: addon_id, fanforce_id: params[:fanforce_id], fanforce_slug: params[:fanforce_slug], api_key: params[:api_key], session_id: params[:session_id])
-  end
-
-  def remove_internal_params(params)
-    params.clone.delete_if { |k,v| [:app_id, :behavior_plugin_id, :plugin_id, :widget_id, :addon_type, :addon_id, :fanforce_id, :fanforce_slug, :api_key].include? k }
-  end
-
-  def remove_sensitive_params(params)
-    params.clone.delete_if { |k,v| [:api_key].include? k }
-  end
-
-end

data/lib/fanforce/api/version.rb

@@ -1,5 +0,0 @@
-class Fanforce
-  module Api
-    VERSION = '0.7.5'
-  end
-end

data/test/fanforce_test.rb

@@ -1,22 +0,0 @@
-require 'rubygems'
-require 'minitest/autorun'
-
-$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'fanforce'
-
-describe Fanforce do
-
-  it "should test if var is blank" do
-    assert Fanforce.is_blank?(nil)
-    assert !Fanforce.is_blank?("value")
-
-    ff = Fanforce.new
-    assert ff.is_blank?(nil)
-    assert !ff.is_blank?("value")
-  end
-
-  it "should create new instance of fanforce with api_key" do
-    Fanforce.new('13d90b01-6df7-4618-881c-c79320a0dc21')
-  end
-
-end