thinknear 0.0.12 → 0.0.13

data/Gemfile

@@ -2,6 +2,9 @@ source 'http://rubygems.org'
 
 gem 'oauth'
 gem 'json'
+gem 'activesupport'
+gem 'i18n'
+
 
 group :development do
   gem 'rspec'

data/Gemfile.lock

@@ -1,8 +1,10 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.0.9)
     diff-lcs (1.1.2)
     git (1.2.5)
+    i18n (0.6.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -24,7 +26,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   bundler
+  i18n
   jeweler
   json
   oauth

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/think_near/client.rb

@@ -4,10 +4,11 @@ module ThinkNear
     @@debug = false
 
     class << self
-      def set_credentials(token, secret, api_host = API_HOST)
+      def set_credentials(token, secret, api_host = API_HOST, app_id = nil)
         @@api_host = api_host || API_HOST
         @@connection = Connection.new(token, secret)
         @@connection.debug = @@debug
+        Endpoint.app_id = app_id if app_id
       end
 
       def debug=(debug_flag)
@@ -43,34 +44,34 @@ module ThinkNear
         get Endpoint.draws(category)
       end
 
-      def get_offers(params)
-        get Endpoint.offers(params)
+      def get_offers(params, app_id = nil)
+        get Endpoint.offers(params, app_id)
       end
 
-      def get_offer(id)
-        get Endpoint.offer(id)
+      def get_offer(id, app_id = nil)
+        get Endpoint.offer(id, app_id)
       end
 
-      def claim_offer(offer_id, latitude, longitude)
-        post Endpoint.claim_offer(offer_id, latitude, longitude)
+      def claim_offer(offer_id, latitude, longitude, app_id = nil)
+        post Endpoint.claim_offer(offer_id, latitude, longitude, app_id)
       end
 
-      def save_offer(offer_id, email)
-        post Endpoint.save_offer(offer_id, email)
+      def save_offer(offer_id, email, app_id = nil)
+        post Endpoint.save_offer(offer_id, email, app_id)
       end
 
-      def get_feed(city)
-        get Endpoint.feed(city)
+      def get_feed(city, app_id = nil)
+        get Endpoint.feed(city, app_id)
       end
 
-      def get(endpoint, data=nil)
+      def get(endpoint)
         raise NoConnectionEstablished  if @@connection.nil?
-        @@connection.get endpoint, data
+        @@connection.get endpoint
       end
 
-      def post(endpoint, data=nil)
+      def post(endpoint)
         raise NoConnectionEstablished  if @@connection.nil?
-        @@connection.post endpoint, data
+        @@connection.post endpoint
       end
     end
   end

data/lib/think_near/endpoint.rb

@@ -1,6 +1,7 @@
 module ThinkNear
   class Endpoint
     class << self
+
       def ping
         endpoint_url 'ping'
       end
@@ -21,42 +22,47 @@ module ThinkNear
         endpoint_url "draws/#{category}"
       end
 
-      def offers(params)
+      def offers(params, app_id)
         latitude = params.delete(:latitude)
         longitude = params.delete(:longitude)
         zipcode = params.delete(:zipcode)
         params = params.select { |k, v| !v.blank? }
+        params.merge(app_id_hash(app_id))
 
         if !latitude.blank? && !longitude.blank?
-          endpoint_url("offers/#{latitude},#{longitude}") + "?#{params.to_param}"
+          endpoint_url("offers/#{latitude},#{longitude}", params)
         elsif !zipcode.blank?
-          endpoint_url("offers/#{zipcode}") + "?#{params.to_param}"
+          endpoint_url("offers/#{zipcode}", params)
         end 
       end
 
-      def offer(id)
-        endpoint_url "offers/#{id}"
+      def offer(id, app_id)
+        endpoint_url "offers/#{id}", app_id_hash(app_id)
       end
 
-      def claim_offer(offer_id, latitude, longitude)
+      def claim_offer(offer_id, latitude, longitude, app_id)
         if latitude && longitude
-          endpoint_url "offers/#{offer_id}/claim/#{latitude},#{longitude}"
+          endpoint_url "offers/#{offer_id}/claim/#{latitude},#{longitude}", app_id_hash(app_id)
         else
-          endpoint_url "offers/#{offer_id}/claim"
+          endpoint_url "offers/#{offer_id}/claim", app_id_hash(app_id)
         end 
       end
 
-      def save_offer(offer_id, email)
-        endpoint_url("offers/#{offer_id}/save") + "?email=#{CGI.escape(email)}"
+      def save_offer(offer_id, email, app_id)
+        endpoint_url("offers/#{offer_id}/save", {:email => CGI.escape(email)}.merge(app_id_hash(app_id)))
       end
 
       def feed(city)
-        endpoint_url('feeds', 'rss') + "?city=#{CGI.escape(city)}"
+        endpoint_url('feeds', {:city => CGI.escape(city)}.merge(app_id_hash(app_id)), 'rss')
       end
 
-      def endpoint_url(path, format = 'json', version = API_VERSION)
-        ["http://#{Client.api_host}", version, [path, format].join('.')].join('/')
+      def endpoint_url(path, params = {}, format = 'json', version = API_VERSION)
+        ["http://#{Client.api_host}", version, [path, format].join('.')].join('/') + "?#{params.to_param}"
       end
+
+      def app_id_hash(app_id) 
+        app_id ? {:app_id => app_id} : {} 
+      end 
     end
   end
 end

data/lib/think_near/offer.rb

@@ -1,9 +1,9 @@
 module ThinkNear
   class Offer < OpenStruct
-    def self.find(id_or_params)
+    def self.find(id_or_params, app_id = nil)
       if id_or_params.is_a? String
         begin
-          if params = Client.get_offer(id_or_params)['offer']
+          if params = Client.get_offer(id_or_params, app_id)['offer']
             new(params)
           else
             raise OfferNotFound, "Couldn't find Offer with ID=#{id_or_params}"
@@ -12,7 +12,7 @@ module ThinkNear
           raise OfferNotFound, "Couldn't find Offer with ID=#{id_or_params}"
         end
       elsif id_or_params.is_a? Hash
-        Client.get_offers(id_or_params).map do |item|
+        Client.get_offers(id_or_params, app_id).map do |item|
           new item['offer']
         end
       end
@@ -22,8 +22,8 @@ module ThinkNear
       @table
     end
 
-    def claim!(latitude = nil, longitude = nil)
-      self.class.new Client.claim_offer(id, latitude, longitude)['offer']
+    def claim!(latitude = nil, longitude = nil, app_id = nil)
+      self.class.new Client.claim_offer(id, latitude, longitude, app_id)['offer']
     end
 
     def save(email)

data/lib/think_near.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'active_support/core_ext'
 
 require 'think_near/connection'
 require 'think_near/endpoint'

data/thinknear.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thinknear}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Hinnegan", "Denis Barushev"]
-  s.date = %q{2011-07-09}
+  s.date = %q{2011-07-22}
   s.email = %q{john@thinknear.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -63,6 +63,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oauth>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -70,6 +72,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<oauth>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -78,6 +82,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<oauth>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -2,7 +2,7 @@
 name: thinknear
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - John Hinnegan
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-09 00:00:00 -07:00
+date: 2011-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,29 +37,29 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: i18n
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rspec
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -70,7 +70,7 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: bundler
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,6 +80,28 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 description: 
 email: john@thinknear.com
 executables: []
@@ -129,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2692734162681709451
+      hash: -2542798210434473424
       segments: 
       - 0
       version: "0"