mosaic-foursquare 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzhiMjBkNTQ5YWIwYTA4Y2I1ZmM4YTJlYjQ4ODE0ZjU2OGM0OTk4MA==
+    ODk3YTJhYTEwMDBkZjNkZTcxZjFhNDNlZjU5MTVkYjA4ZWE3MjA3YQ==
   data.tar.gz: !binary |-
-    ZGE3MTIxMmVjZTQ0NGU2ZTU2MzA0NjcxNzVjMDc2NWZiMWQwMGUzMA==
+    ZTBmNTUzNjJiMzA3YmM2Y2M2NjVhNDVhYjk4NTQ0NGVmZTk2N2RhZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGU1ODBkOTE5MDUzMmQwYTk0NTMwOWI1NDI0ZjRlM2RkYTEyMmI2ZDdlYjhl
-    YTJkMDU0MWUzMWI2NWFiOGZkMmIyNTViZWU4Mjk1ZDhlY2QwZDBkMTU1MDJl
-    MmQwOGZlZDlhZTg2MzhmNTkyMmVkYzYwNzAwY2VkMmZiMWQwZTE=
+    NmI1MmViZjU4YjliMWM0ZGY2OWU5NDYwM2M2ODZkZWU1ZjFiMTE0OGU1ODk4
+    NjAyYmE1ZGE1MmQ2NmFhMmQ0ZmI3Mjg4NjNhMjJiNmQ0NWFiOGFlNDBiMmMw
+    OWMwYTFkMWZiZGUwNGQ0YTllMWQ2MWQyY2FkNDYwOTU4YmNmYTU=
   data.tar.gz: !binary |-
-    NzFmNWRlMDUyODc5MDMxNTgyYmY0ZWRiNjc1ODRhZTcyNTZlMTZjMzk1Nzky
-    N2Y0YTk5OTM3MmExOTg2MWEwOWQyMzgzNDIxNWQxN2JmNzA3MjhlMTFlNmYy
-    YjYxYjYzYzY3MDNiYTFjZDc5YjMzNmExODcyYTEyN2E3OTdkYzQ=
+    Nzg5MWQxYTE0ODFlNmQxOTNjZTcwNDM3OWQwOThjYjI3ODMyYjdkYzFmZmM4
+    N2FhMjdjMzU5NTNiNzkyODlmOTMwMWEzZDZjMjA4YmJiZDgyNDBmYWY4NTYy
+    MmY3NTQyNGIyYTBlYjliYjkzZmIzY2NlZjNkNTY3OTA2NzJlY2M=

data/lib/mosaic/foursquare/checkin.rb

@@ -7,7 +7,7 @@ module Mosaic
 
       class << self
         def find(id, options = {})
-          response = query("/checkins/#{id}", options)
+          response = query("checkins/#{id}", options)
           self.new response['response']['checkin']
         end
       end

data/lib/mosaic/foursquare/object.rb

@@ -1,21 +1,27 @@
-require 'httparty'
+require 'faraday'
+require 'faraday_middleware'
 
 module Mosaic
   module Foursquare
     class Object
       include Mosaic::Utils::Helpers
-      include HTTParty
-      base_uri 'https://api.foursquare.com/v2'
 
       class << self
+        def conn
+          @conn ||= Faraday.new('https://api.foursquare.com/v2/') do |faraday|
+            faraday.request :url_encoded
+            faraday.response :json, :content_type => /\bjson$/
+            faraday.use Faraday::Response::RaiseError
+
+            faraday.adapter Faraday.default_adapter
+          end
+        end
+
         def query(path, options)
           options = Mosaic::Foursquare.config.merge(options)
           self.request_count += 1
-          # STDERR.puts "REQUEST[#{self.request_count}]: #{path} with #{options.inspect}"
-          response = get(path, :query => options.merge(:v =>20130614))
-          # STDERR.puts "RESPONSE[#{self.request_count}]: #{response.inspect}"
-          response.error! unless response.success?
-          response
+          response = conn.get path, options.merge(:v =>20130614)
+          response.body
         end
 
         def request_count

data/lib/mosaic/foursquare/tip.rb

@@ -6,7 +6,7 @@ module Mosaic
       attr_accessor :created_at, :id, :text, :venue, :user
       class << self
         def find(id, options = {})
-          response = query("/tips/#{id}", options)
+          response = query("tips/#{id}", options)
           self.new response['response']['tip']
         end
       end

data/lib/mosaic/foursquare/venue.rb

@@ -7,7 +7,7 @@ module Mosaic
 
       class << self
         def find(id, options = {})
-          response = query("/venues/#{id}", options)
+          response = query("venues/#{id}", options)
           self.new response['response']['venue']
         end
       end
@@ -37,17 +37,17 @@ module Mosaic
       end
 
       def herenow(options = {})
-        response = self.class.query("/venues/#{id}/herenow", options)
+        response = self.class.query("venues/#{id}/herenow", options)
         response['response']['hereNow']['items'].collect { |item| Mosaic::Foursquare::Checkin.new(item) }
       end
 
       def photos(options = {})
-        response = self.class.query("/venues/#{id}/photos", options)
+        response = self.class.query("venues/#{id}/photos", options)
         response['response']['photos']['items'].collect { |item| Mosaic::Foursquare::Photo.new(item) }
       end
 
       def tips(options = {})
-        response = self.class.query("/venues/#{id}/tips", options)
+        response = self.class.query("venues/#{id}/tips", options)
         response['response']['tips']['items'].collect { |item| Mosaic::Foursquare::Tip.new(item) }
       end
     end

data/lib/mosaic/foursquare/version.rb

@@ -1,5 +1,5 @@
 module Mosaic
   module Foursquare
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/mosaic-foursquare.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.files =`git ls-files`.split($/)
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.add_dependency "httparty", "~> 0.10.2"
+  s.add_dependency "faraday", "~> 0.8.7"
+  s.add_dependency "faraday_middleware", "~> 0.9.0"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mosaic-foursquare
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - S. Brent Faulkner
@@ -35,22 +35,36 @@ cert_chain:
   cWkwT1ZqMjAvRCsvcjJxRkNqV2cwVjAzdTdGNDg2UkwKbkVBa3lXL3NaTjRX
   Q29RbmpoeDF3MmYrd2FnVURBTzY4L0E1U0kxaUdyZVlRb3VvN1lRS0xNWC9p
   WlFKYng2QwpzTERtRXdUcgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement