aboutyou-sdk 0.0.14 → 0.0.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDBmNjhmNzliNGI3N2JjOTk4MDgxODc0NDBjNTYwZjI5N2RlNGIzZA==
+    NDI2YWFmYTE1OWEzMDIxM2ZiYzgxN2IwNWExOTc1MjM5MjI3MWRkNw==
   data.tar.gz: !binary |-
-    YWZkODI5NmM1ODhhMDFiOWJkNTBmODI3ZjczYTIzYjRjZDJiMzc2OQ==
+    OTMyZGRkNjUzOWRiZDAwMGFmMTczMTJjZWMxMDdiOTYxY2IzNThmYg==
 SHA512:
   metadata.gz: !binary |-
-    MDJhYjY1MGRhYjc3ZjEyOWM4YTNiZDlhMGY0YjZiOGM0Y2UxNWM5YjI1ZTQx
-    NzY4Y2JiMzljMDBlYzliNTVhYjY4ODNmN2ExYjQyMTlmMDBhY2M3NmUzYzBj
-    ZDg4YzdlOGZhNzA5Yjg0ZGZmZjdmOGE2YzQyNDc1MWM0MTE3NjI=
+    ZDQ4N2MwZjIzODI4NWVmNzUyZDhhZGM3ZTI3ZWM4NWE4MzMxMzI3MTVkNzA3
+    MjMwNDk2NmZlYzBhNjhmOGJhZjRjMDAzN2FhODhkODkwNDQyYjU3Y2QzODRi
+    NTFlMzM2MjU4MDZiNDBjZGU2YzI1NDQ5NzhmYjI3MDVkOTI4NTI=
   data.tar.gz: !binary |-
-    NDAxMWRlNjQyNDdkZWU4ZjU1M2I1OTQ3ZjExMTViNmEwMjFlYzA3NzcyZjg0
-    MDI2OTg2MmMzMmQzMTRkMmI1Y2U3NmY5ZTQxNjEyZGU5YTUzZjRjYzNiZTJi
-    NTAyMmYyNDUwMGZmMWE0NWM1N2E4ZTE2NDk2YTA4YmM0MTdlYzM=
+    OWZiNzIxNWNiOWNlMTRlZjY3OTE0Y2ZlYzI2ZGE1ZmZhYTRmZjUwZDM4ZGVh
+    NTg2YTljMzM3NGQyYTViM2FjNTBiMjkyMTFmYzQ3OTQxY2U5MjAwODU2NDM1
+    MTYzYWViOWMzNTM2NTNmZTgzNzlhOGQwODVlNmY2YTM1MzZiYTE=

data/lib/aboutyou-sdk.rb

@@ -63,17 +63,11 @@ class AY
       appPassword,
       sessionId = 'SESSION_ID',
       cache = nil,
-      cacheServer= nil,
       apiEndPoint = AboutYou::SDK::Constants::API_ENVIRONMENT_LIVE,
       resultFactory = nil,
       logger = nil
     )
-    
-    if cacheServer == nil
-      cacheServer = 'localhost:11211' if cache == 'memcache'
-      cacheServer = {:host => "localhost", :port => 6379} if cache == 'redis'
-    end
-    
+       
     self.sessionId   = sessionId
     self.appId       = appId
     self.appPassword = appPassword
@@ -84,9 +78,7 @@ class AY
       logger
     )
         
-    self.cache = Dalli::Client.new(cacheServer, {:value_max_bytes => 5242880}) if cache == 'memcache' 
-    self.cache = Redis.new(cacheServer) if cache == 'redis'
-
+    self.cache = cache
     if resultFactory
       self.modelFactoryInstance = resultFactory
     else

data/lib/aboutyou-sdk/CacheProvider/Dalli.rb

@@ -0,0 +1,28 @@
+module AboutYou
+  module SDK
+    module CacheProvider
+      class Dalli
+        attr_accessor :client
+        def initialize(client)
+          self.client = client
+        end
+        
+        def set(key, value, duration)
+          self.client.set(key, value, duration)
+        end
+        
+        def get(key)
+          self.client.get(key)
+        end
+        
+        def delete(key)
+          self.client.delete(key)
+        end
+        
+        def exists(key)
+          self.client.get(key) != nil
+        end
+      end
+    end
+  end
+end

data/lib/aboutyou-sdk/CacheProvider/Redis.rb

@@ -0,0 +1,30 @@
+module AboutYou
+  module SDK
+    module CacheProvider
+      class Redis
+        attr_accessor :client
+        def initialize(client)
+          self.client = client
+        end
+        
+        def set(key, value, duration)
+          value = value.to_json unless value.is_a?(String)
+          self.client.set(key, value)
+          self.client.expire(key, duration)
+        end
+        
+        def get(key)
+          JSON.parse(self.client.get(key))
+        end
+        
+        def delete(key)
+          self.client.del(key)
+        end
+        
+        def exists(key)
+          self.client.exists(key)
+        end
+      end
+    end
+  end
+end

data/lib/aboutyou-sdk/Model/CategoryManager/DefaultCategoryManager.rb

@@ -44,27 +44,21 @@ module AboutYou
           # Gets the cached Categories for this app
           ###
           def loadCachedCategories
-            parseJson(self.cache.get(self.cacheKey), self.shopApi.modelFactoryInstance) if self.cache && self.cache.get(self.cacheKey)
+            parseJson(self.cache.get(self.cacheKey), self.shopApi.modelFactoryInstance) if self.cache && self.cache.exists(self.cacheKey)
           end
 
           ###
           # This method caches the currently read-in categories
           ###
           def cacheCategories(jsonObject)
-            self.cache.set(self.cacheKey, jsonObject, DEFAULT_CACHE_DURATION) if self.cache.instance_of?(Dalli::Client)
-            if self.cache.instance_of?(Redis)
-              jsonObject = jsonObject.to_json unless jsonObject.is_a? String
-              self.cache.set(self.cacheKey, jsonObject)
-              self.cache.expire(self.cacheKey, DEFAULT_CACHE_DURATION)
-            end
+            self.cache.set(self.cacheKey, jsonObject, DEFAULT_CACHE_DURATION)
           end
 
           ###
           # This method clears the cache
           ###
           def clearCache
-            self.cache.delete(self.cacheKey) if self.cache.instance_of?(Dalli::Client)
-            self.cache.del(self.cacheKey) if self.cache.instance_of?(Redis)
+            self.cache.delete(self.cacheKey)
           end
 
           ###
@@ -81,7 +75,6 @@ module AboutYou
           def parseJson(jsonObject, factory)
             unless self.categories
               self.categories = {} 
-              jsonObject = JSON.parse(jsonObject) if jsonObject.is_a? String
             
               if jsonObject
                 self.cacheCategories(jsonObject)

data/lib/aboutyou-sdk/Model/FacetManager/DefaultFacetManager.rb

@@ -32,26 +32,19 @@ module AboutYou
             end
 
             def loadCachedFacets
-              parseJson(self.cache.get(self.cacheKey), self.shopApi.modelFactoryInstance) if self.cache && self.cache.get(self.cacheKey)
+              parseJson(self.cache.get(self.cacheKey), self.shopApi.modelFactoryInstance) if self.cache && self.cache.exists(self.cacheKey)
             end
 
             def cacheFacets(jsonObject)
-              self.cache.set(self.cacheKey, jsonObject, DEFAULT_CACHE_DURATION) if self.cache.instance_of?(Dalli::Client)
-              if self.cache.instance_of?(Redis)
-                jsonObject = jsonObject.to_json unless jsonObject.is_a?(String)
-                self.cache.set(self.cacheKey, jsonObject)
-                self.cache.expire(self.cacheKey, DEFAULT_CACHE_DURATION)
-              end
+              self.cache.set(self.cacheKey, jsonObject, DEFAULT_CACHE_DURATION)
             end
 
             def clearCache
-              self.cache.delete(self.cacheKey) if self.cache.instance_of?(Dalli::Client)
-              self.cache.del(self.cacheKey) if self.cache.instance_of?(Redis)
+              self.cache.delete(self.cacheKey)
             end
             
             def parseJson(jsonObject, factory, query=nil)
               unless self.facets
-                jsonObject = JSON.parse(jsonObject) if jsonObject.is_a?(String)
                 if jsonObject
                   self.cacheFacets(jsonObject)
                   self.facets = factory.createFacetsList(jsonObject, query)

data/tests/testCategoryCaching.rb

@@ -3,13 +3,13 @@ require "pry_debug"
 require_relative'../lib/aboutyou-sdk.rb'
 
 get "/doCache" do
-shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'memcache')
-shop.fetchProductsByIds([661132, 660971, 661367, 661361], [AboutYou::SDK::Criteria::ProductFields::CATEGORIES])
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', AboutYou::SDK::CacheProvider::Dalli.new(Dalli::Client.new))
+  shop.fetchProductsByIds([661132, 660971, 661367, 661361], [AboutYou::SDK::Criteria::ProductFields::CATEGORIES])
 end
 
 get "/getCache" do
   result = ""
-  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'memcache')
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', AboutYou::SDK::CacheProvider::Dalli.new(Dalli::Client.new))
   
   shop.fetchCategoryTree.categories.each do |key, cate|
     result = result + cate.name + '  '
@@ -20,7 +20,7 @@ end
 
 get "/noCache" do
   result = ""
-  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'memcache')
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', AboutYou::SDK::CacheProvider::Dalli.new(Dalli::Client.new))
   shop.cache.delete('AY:SDK:281:categories')
   
   shop.fetchCategoryTree.categories.each do |key, cate|

data/tests/testFacetCaching.rb

@@ -3,14 +3,14 @@ require "pry_debug"
 require_relative'../lib/aboutyou-sdk.rb'
 
 get "/doCache" do
-shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'memcache')
-shop.fetchFacets(["0"])
-return "done"
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', AboutYou::SDK::CacheProvider::Dalli.new(Dalli::Client.new))
+  shop.fetchFacets(["0"])
+  return "done"
 end
 
 get "/getCache" do
   result = ""
-  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'memcache')
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', AboutYou::SDK::CacheProvider::Dalli.new(Dalli::Client.new))
   
   shop.fetchFacets(["0"]).each do |key, facet|
     result = result + key + '</br>'
@@ -21,7 +21,7 @@ end
 
 get "/noCache" do
   result = ""
-  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'memcache')
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', AboutYou::SDK::CacheProvider::Dalli.new(Dalli::Client.new))
   puts shop.cache.delete('AY:SDK:281:facets')
   shop.fetchFacets(["0"]).each do |key, facet|
     result = result + key + '</br>'

data/tests/testRedisCache.rb

@@ -3,13 +3,13 @@ require "pry_debug"
 require_relative'../lib/aboutyou-sdk.rb'
 
 get "/doCache" do
-shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'redis')
-shop.fetchProductsByIds([661132, 660971, 661367, 661361], [AboutYou::SDK::Criteria::ProductFields::CATEGORIES])
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', AboutYou::SDK::CacheProvider::Redis.new(Redis.new))
+  shop.fetchProductsByIds([661132, 660971, 661367, 661361], [AboutYou::SDK::Criteria::ProductFields::CATEGORIES])
 end
 
 get "/getCache" do
   result = ""
-  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'redis')
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', AboutYou::SDK::CacheProvider::Redis.new(Redis.new))
   
   shop.fetchCategoryTree.categories.each do |key, cate|
     result = result + cate.name + '  '
@@ -20,7 +20,7 @@ end
 
 get "/noCache" do
   result = ""
-  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'redis')
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', AboutYou::SDK::CacheProvider::Redis.new(Redis.new))
   shop.cache.delete('AY:SDK:281:categories')
   
   shop.fetchCategoryTree.categories.each do |key, cate|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aboutyou-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Ferenc Beutel
@@ -73,6 +73,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/aboutyou-sdk.rb
+- lib/aboutyou-sdk/CacheProvider/Dalli.rb
+- lib/aboutyou-sdk/CacheProvider/Redis.rb
 - lib/aboutyou-sdk/Client.rb
 - lib/aboutyou-sdk/Constants.rb
 - lib/aboutyou-sdk/Criteria/ProductFields.rb