mosaic-facebook 0.2.1 → 0.9.0

data/lib/mosaic/facebook/api/api_object.rb

@@ -2,8 +2,11 @@ module Mosaic
   module Facebook
     module Api
       class ApiObject < Mosaic::Facebook::Object
-        base_uri 'https://api.facebook.com'
-
+        class << self
+          def base_uri
+            'https://api.facebook.com'
+          end
+        end
       end
     end
   end

data/lib/mosaic/facebook/api/notification.rb

@@ -5,12 +5,12 @@ require 'mosaic/facebook/error'
 module Mosaic
   module Facebook
     class Notification < Mosaic::Facebook::Api::ApiObject
-     
+
       class << self
         # send_email requires these parameters: to, subject, body, access_token
         def send_email(options)
-          response = get("/method/notifications.sendEmail", :query => options)
-          raise Mosaic::Facebook::Error.new(response['error_response']) if response.include?('error_response')
+          response = new.get('/method/notifications.sendEmail', options)
+          raise Mosaic::Facebook::Error.new(response.body['error_response']) if response.body.include?('error_response')
           response
         end
       end

data/lib/mosaic/facebook/fql/fql_object.rb

@@ -40,19 +40,19 @@ module Mosaic
             when Hash
               conditions.collect { |name,value| build_fql_condition(name,value) }.join(' AND ')
             else
-              raise TypeError, "expected string or hash of FQL conditions"
+              raise TypeError, 'expected string or hash of FQL conditions'
             end
           end
 
           def find(*args)
-            response = with_retry(Mosaic::Facebook::Fql::UnknownError) { find_by_fql(*args) }
+            response = find_by_sql(*args)
             data = response['fql_query_response'][record_name] || []
             data = [data] unless data.is_a?(Array)
             data.collect { |attributes| new(attributes) }
           end
 
           def find_by_fql(*args)
-            response = get('/method/fql.query', :query => build_fql(*args))
+            response = new.get('/method/fql.query', build_fql(*args))
             raise Mosaic::Facebook::Error.new(response['error_response']) if response.include?('error_response')
             response
           end

data/lib/mosaic/facebook/graph/account.rb

@@ -16,7 +16,7 @@ module Mosaic
         class << self
           def all(options = {})
             # need 'manage_pages' extended permission to get pages (via accounts connection)
-            @all ||= find("/me/accounts", options)
+            @all ||= find('/me/accounts', options)
           end
 
           def find_by_name(name, options = {})

data/lib/mosaic/facebook/graph/graph_object.rb

@@ -2,31 +2,35 @@ module Mosaic
   module Facebook
     module Graph
       class GraphObject < Mosaic::Facebook::Object
-        base_uri 'https://graph.facebook.com'
+        class << self
+          def base_uri
+            'https://graph.facebook.com'
+          end
+        end
 
         def delete(path, options = {})
           response = super(path, options)
-          raise Mosaic::Facebook::Error.new(response['error']) if !response.success?
+          raise Mosaic::Facebook::Error.new(response.body['error']) if !response.success?
           response
         end
 
         def get(path, options = {})
           response = super(path, options)
-          raise Mosaic::Facebook::Error.new(response['error']) if !response.success?
+          raise Mosaic::Facebook::Error.new(response.body['error']) if !response.success?
           response
         end
 
         def post(path, options = {})
           response = super(path, options)
-          raise Mosaic::Facebook::Error.new(response['error']) if !response.success?
+          raise Mosaic::Facebook::Error.new(response.body['error']) if !response.success?
           response
         end
 
         class << self
           def find(path, options = {})
-            response = get(path, :query => options)
-            raise Mosaic::Facebook::Error.new(response['error']) if !response.success?
-            data = response.parsed_response
+            response = new.get(path, options)
+            raise Mosaic::Facebook::Error.new(response.body['error']) if !response.success?
+            data = response.body
             if data.include?('data')
               data['data'].collect { |attributes| new(attributes) }
             else

data/lib/mosaic/facebook/graph/user.rb

@@ -10,7 +10,7 @@ module Mosaic
         end
 
         def picture
-          @picture.is_a?(Hash) ? @picture["data"]["url"] : @picture
+          @picture.is_a?(Hash) ? @picture['data']['url'] : @picture
         end
 
         class << self

data/lib/mosaic/facebook/object.rb

@@ -1,24 +1,42 @@
-require 'httparty'
+require 'faraday'
+require 'faraday_middleware'
+require 'mosaic/facebook/error'
+require 'multi_xml'
 
 module Mosaic
   module Facebook
     class Object
-      include HTTParty
       # debug_output
 
+      class << self
+        def base_uri
+          raise NotImplementedError
+        end
+      end
+
       def initialize(attributes = {})
         attributes.each { |key,value| instance_variable_set("@#{key}".to_sym, value) }
+
+        @conn = Faraday.new do |faraday|
+          faraday.request :retry, :max => 3,
+            :exceptions => [Exception, Mosaic::Facebook::UnknownError]
+          faraday.request :url_encoded
+          faraday.response :json, :content_type => /\bjson$/
+          faraday.response :xml,  :content_type => /\bxml$/
+
+          faraday.adapter Faraday.default_adapter
+        end
       end
 
       def get(path, options = {})
         query = { :access_token => self.class.facebook_access_token }.merge(options)
-        self.class.get path, :query => query
+        @conn.get URI.join(self.class.base_uri, path), query
       end
 
       def post(path, options)
         query = { :access_token => self.class.facebook_access_token }.merge(options)
         body = Hash[instance_variables.collect { |ivar| [ivar.sub(/@/,''),instance_variable_get(ivar)] }]
-        self.class.post path, :query => query, :body => serialize_body(body)
+        @conn.post URI.join(self.class.base_uri, path), :query => query, :body => serialize_body(body)
       end
 
       class << self
@@ -64,29 +82,6 @@ module Mosaic
         def serialize_body(body)
           body.to_json
         end
-
-        def perform_request_with_retry(http_method, path, options)
-          with_retry do
-            perform_request_without_retry(http_method, path, options)
-          end
-        end
-        # alias_method_chain :perform_request, :retry
-        alias_method :perform_request_without_retry, :perform_request
-        alias_method :perform_request, :perform_request_with_retry
-
-        def with_retry(exception = Exception, attempts = 3)
-          tries = 0
-          begin
-            return yield
-          rescue exception => e
-            if tries < attempts
-              tries += 1
-              logger.debug "#{e.class.name}: #{e.message}: retry ##{tries}"
-              retry
-            end
-            raise e
-          end
-        end
       end
     end
   end

data/lib/mosaic/facebook/version.rb

@@ -1,5 +1,5 @@
 module Mosaic
   module Facebook
-    VERSION = "0.2.1"
+    VERSION = '0.9.0'
   end
 end

data/lib/mosaic_facebook.rb

@@ -1,2 +1,2 @@
-STDERR.puts "This version of the gem has been deprecated. Please upgrade to mosaic-facebook."
-require 'mosaic/facebook'
+STDERR.puts 'This version of the gem has been deprecated. Please upgrade to mosaic-facebook.'
+require 'mosaic/facebook'

data/mosaic-facebook.gemspec

@@ -18,10 +18,14 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "mosaic_facebook"
   s.required_rubygems_version = ">= 1.3.4"
 
-  s.add_dependency "httparty", "~> 0.10.2"
+  s.add_dependency "faraday", "~> 0.8.7"
+  s.add_dependency "faraday_middleware", "~> 0.9.0"
+  s.add_dependency "multi_xml", "~> 0.5.3"
   s.add_dependency "activesupport", "~> 3.0"
 
+  s.add_development_dependency "debugger"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 # $:.push File.expand_path("../lib", __FILE__)
-# require 'httparty'
 # require 'lib/mosaic_facebook'
 
 require 'rubygems'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mosaic-facebook
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: small app written and improved over time to solve our need to connect
   and fetch data from facebook
 email:
@@ -127,6 +191,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2014683090419711334
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: