rsqoot 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: db6629abd6587c3672911e89bb6686b648e13d0e
-  data.tar.gz: 93dd7b2d00e771f81bc89821a4f5ce0166f9edb9
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTA2NTI1OGNiM2VkN2NmMTM5ODRiMDE3NTI5Y2Q5NjYxMGNiYjBiMQ==
+  data.tar.gz: !binary |-
+    ZWU5MmJjNjU2NzJiZGJhZDMzYTJjZWViMjNiMGQ4N2RhZWExNTkyMA==
 SHA512:
-  metadata.gz: ef941d492eb2cb23deab2cfdf17692bd055d3634af1930e5eb49d6b8fbfd7c521d703a50b85c1cc3cc62e8996752057868940f33cf5de8e9d45678aa2c91c13f
-  data.tar.gz: 4d34799a2d1b2320e24e497815f6983af1b0e7ade53798308828645b20b4e6f8a7cba9badcebd4a47f4a130bba62641603a02e610a687bffc9d6ebd8bd691a31
+  metadata.gz: !binary |-
+    MTA4NGM0MjI0YTk0MGMyZjRlZjA3NjI5YWE5MzhkNTA3NWU0ZmVjMzQyZWY0
+    YWMzODFhZGFkMzdjODc4MDZmNmQyNThjNTJmNTJjNTAzNTg2MWQ3MTBiNTQy
+    ZTRmOTk0NzdkNzhhOGNhMGJjMTAwNTQ2ZWZiNjE4MmJiOTc1OTM=
+  data.tar.gz: !binary |-
+    YzQ1OTI4NDNkMDI3NzBhYjhiYTY1MDRkYTI3OGI0MWRjNWNjMTQyZWU0MWI5
+    NTQxZTdiYzg0NmM1MDE4Y2MwMWNiNGQ2M2U3MTY3YmZjMWU3ZDEyMTAxNzYw
+    NTRiOGRmMjA3YzExMTk1NjRhYTI4MWY4OTVkYzkzY2VkZDJjYzU=

data/lib/rsqoot/category.rb

@@ -5,7 +5,11 @@ module RSqoot
     #
     # @return [Hashie::Mash] category list
     def categories(options={})
-      get('categories', options)
+      if categories_not_latest?(options)
+        @rsqoot_categories = get('categories', options)
+        @rsqoot_categories = @rsqoot_categories.categories if @rsqoot_categories
+      end
+      @rsqoot_categories
     end
   end
 end

data/lib/rsqoot/click.rb

@@ -8,7 +8,7 @@ module RSqoot
     #
     # @return [Hashie::Mash]
     def clicks(options={})
-      get('clicks', options)
+      get('clicks', options).clicks
     end
   end
 end

data/lib/rsqoot/client.rb

@@ -1,3 +1,4 @@
+require "rsqoot/helper"
 require "rsqoot/merchant"
 require "rsqoot/category"
 require "rsqoot/provider"
@@ -8,6 +9,7 @@ require "rsqoot/request"
 
 module RSqoot
   class Client
+    include Helper
     include Category
     include Click
     include Commission

data/lib/rsqoot/commission.rb

@@ -8,7 +8,7 @@ module RSqoot
     #
     # @return [Hashie::Mash]
     def commissions(options={})
-      get('commissions', options)
+      get('commissions', options).commissions
     end
 
   end

data/lib/rsqoot/deal.rb

@@ -9,21 +9,25 @@ module RSqoot
     # @param [Integer] page (Which page of result to return. Default to 1.)
     # @param [Integer] per_page (Number of results to return at once. Defaults to 10.)
     def deals(options={})
-      get('deals', options)
+      if deals_not_latest?(options)
+        @rsqoot_deals = get('deals', options) || []
+        @rsqoot_deals = @rsqoot_deals.deals.map(&:deal) if !@rsqoot_deals.empty?
+      end
+      @rsqoot_deals
     end
 
     # Retrieve a deal by id
     #
     def deal(id, options={})
-      get("deals/#{id}", options)
+      if deal_not_latest?(id)
+        @rsqoot_deal = get("deals/#{id}", options)
+        @rsqoot_deal = @rsqoot_deal.deal if @rsqoot_deal
+      end
+      @rsqoot_deal
     end
 
-    def deal_click(id, options={})
-      get("deals/#{id}/click", options, parse = false)
-    end
-
-    def deal_impression(id, options={})
-      get("deals/#{id}/image", options, parse = false)
+    def impression(deal_id, options={})
+      url_generator("deals/#{deal_id}/image", options, require_key = true).first.to_s
     end
 
   end

data/lib/rsqoot/helper.rb

@@ -0,0 +1,15 @@
+module RSqoot
+  module Helper
+    def self.included(base)
+      ['deals', 'deal', 'categories', 'providers', 'merchant'].each do |name|
+        attr_reader ('rsqoot_' + name).to_sym
+        attr_accessor (name + '_options').to_sym
+        base.send :define_method, (name + '_not_latest?').to_sym do |opt|
+          result = method(name + '_options').call == opt ? false : true
+          method(name + '_options=').call opt if result
+          result
+        end
+      end
+    end
+  end
+end

data/lib/rsqoot/merchant.rb

@@ -7,7 +7,11 @@ module RSqoot
     # @param [String] namespace (One of the supported namespaces. Factual, Foursquare, Facebook, Google, CitySearch, Yelp.)
 
     def merchant(id, options={})
-      get("merchants/#{id}", options)
+      if merchant_not_latest?(id)
+        @rsqoot_merchant = get("merchants/#{id}", options)
+        @rsqoot_merchant = @rsqoot_merchant.merchant if @rsqoot_merchant
+      end
+      @rsqoot_merchant
     end
   end
 end

data/lib/rsqoot/provider.rb

@@ -4,7 +4,11 @@ module RSqoot
     #
     # @return [Hashie::Mash]
     def providers(options={})
-      get('providers', options)
+      if providers_not_latest?(options)
+        @rsqoot_providers = get('providers', options)
+        @rsqoot_providers = @rsqoot_providers.providers if @rsqoot_providers
+      end
+      @rsqoot_providers
     end
   end
 end

data/lib/rsqoot/request.rb

@@ -5,28 +5,31 @@ require 'json'
 module RSqoot
   module Request
 
-    def get(path, opts = {}, parse = true)
-      uri       = URI.parse base_api_url
-      uri.path  = '/v2/' + path
-      headers   = {read_timeout: read_timeout}
-      query = options_parser opts
-      endpoint  = path.split('/')[0]
+    def get(path, opts = {})
+      uri, headers = url_generator(path, opts)
+      begin
+        json = JSON.parse uri.open(headers).read
+        ::Hashie::Mash.new json
+      rescue
+        nil
+      end
+    end
+
+    def url_generator(path, opts = {}, require_key = false)
+      uri      = URI.parse base_api_url
+      headers  = {read_timeout: read_timeout}
+      uri.path = '/v2/' + path
+      query    = options_parser opts
+      endpoint = path.split('/')[0]
       case authentication_method
       when :header
         headers.merge! h = {"Authorization" => "api_key #{api_key(endpoint)}"}
-        query = query + "&api_key=#{api_key(endpoint)}" if !parse
+        query = query + "&api_key=#{api_key(endpoint)}" if require_key
       when :parameter
         query = query + "&api_key=#{api_key(endpoint)}"
       end
       uri.query = query
-      if parse
-        begin
-          json = JSON.parse uri.open(headers).read
-          ::Hashie::Mash.new json
-        end
-      else
-        uri.to_s
-      end
+      [uri, headers]
     end
 
     private

data/lib/rsqoot/version.rb

@@ -1,3 +1,3 @@
 module RSqoot
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsqoot
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Felix Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -60,6 +60,7 @@ files:
 - lib/rsqoot/client.rb
 - lib/rsqoot/commission.rb
 - lib/rsqoot/deal.rb
+- lib/rsqoot/helper.rb
 - lib/rsqoot/merchant.rb
 - lib/rsqoot/provider.rb
 - lib/rsqoot/request.rb
@@ -75,17 +76,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Wrapper for Sqoot API V2