halo-api 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d241a3a1fe1f27c5cb995fafd2d02b4a9d861a9e
-  data.tar.gz: 2f16787de453f9975aba2c683ef74b4cebc9ab14
+  metadata.gz: ac6683a4f6b77b466d74763747790e755a27d5dd
+  data.tar.gz: 306f987da2c11c26ea94a0ce0a53ec68596be007
 SHA512:
-  metadata.gz: 98e71bf3bb6b85f0d9386ed8c9e83615e11a5a2abdb4228817af018557c4aebfd596d0c48a4a173b0acacbfa4e8efdbc3edfb27ee5e9fa1cd808504283cfbc82
-  data.tar.gz: b9d1cc843c195d556b896ccc87fb7d7e3656ca46ac40a68103102ac37914e6853b6e0dc54bc618d6f27aa0ce7373a78865c7b79ae723fb8fca8a0e64fc4da511
+  metadata.gz: 0a0e6ebeb64625c5fabedf95a8a18731b0fac70c2a859eb0ac261c99ca9d33763045c9d6112a40d93f3fbe85e1baf38624036c3ee8682da5100292c088a371ba
+  data.tar.gz: f5b0459e581a3ea4e8f01f497558245ce34803bd58099f959d35c5349f8086765aa5275970d9ad831e87c12fe788b754e28ecb7dcaa36d6dac0d1db3d0a326df

data/lib/halo-api/api_response.rb

@@ -1,5 +1,6 @@
 require 'httparty'
 require 'addressable/uri'
+require 'redis'
 
 module Halo
   class InvalidCacheStore < StandardError; end
@@ -10,7 +11,7 @@ module Halo
     def initialize(options = {})
       client       = options.delete(:client)
       @api_key     = client.api_key
-      @region      = client.region
+      @region      = client.region || Halo::Configuration::DEFAULT_REGION
       @cache_store = client.cache_store || {}
 
       raise InvalidCacheStore if cached? && !redis_store.is_a?(Redis)
@@ -19,20 +20,21 @@ module Halo
     end
 
     def get_data(path, options = {})
+      store_key = "#{path}#{options}#{@region}"
       if cached?
-        result = redis_store.get("#{path}#{options}")
+        result = redis_store.get(store_key)
         return JSON.parse(result) if result
       end
       response = perform_uncached_request(:get, path, options)
-      redis_store.setex "#{path}#{options}", ttl, response.to_json if cached?
+      redis_store.setex(store_key, ttl, response.to_json) if cached?
       response
     end
 
     def perform_uncached_request(verb, path, params = {})
       options = {}
       headers = {
-        'Ocp-Apim-Subscription-Key' => @api_key,
-        'Accept-Language' => @region
+        'Ocp-Apim-Subscription-Key': @api_key,
+        'Accept-Language': @region
       }
 
       options[:headers] = headers unless headers.empty?

data/lib/halo-api/client.rb

@@ -1,13 +1,5 @@
-require 'halo-api/version'
-require 'halo-api/api_response'
-require 'halo-api/configuration'
-
-require 'redis'
-
-
 module Halo
   class Client
-    include HTTParty
 
     attr_accessor(*Configuration::OPTIONS)
 

data/lib/halo-api/configuration.rb

@@ -4,9 +4,9 @@ module Halo
     OPTIONS = %i[api_key region redis ttl].freeze
 
     DEFAULT_API_KEY = nil
-    DEFAULT_REGION = 'en'
-    DEFAULT_REDIS = 'redis://localhost:6379'
-    DEFAULT_TTL = 1800
+    DEFAULT_REGION = 'en'.freeze
+    DEFAULT_REDIS = 'redis://localhost:6379'.freeze
+    DEFAULT_TTL = 1800 # 30m
 
     attr_accessor(*OPTIONS)
 

data/lib/halo-api/version.rb

@@ -1,3 +1,3 @@
 module Halo
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halo-api
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Carlos Ruiz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty