aboutyou-sdk 0.0.11 → 0.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWI2YjA3YmNlNTE2ZTE4YzQ4YWM0NGZkMTYyYTQ5ZjM4MjZiNDQxOQ==
+    NDQzMDNhYThmZmVhMjk4MTQzZDMxZDBhMWE1MWQzZWYxY2EwYjgzYQ==
   data.tar.gz: !binary |-
-    ODZhYjdhYWZlOWFkOGY3MzdhMDg0NjhjMmM1ZWJiODM4NzZkNDIyNQ==
+    MjJiMWEyZTg1ZTFkY2NhMjg4ZjY0NWY5M2Q0OWM1NGM1YjAyZmM0Yg==
 SHA512:
   metadata.gz: !binary |-
-    ODBmNGUxMGUzMzk3MmJjODk5NjhmZDllZDJjYTc1YmMzNGZlMjZhYWE1ZDBk
-    NjdkMmVmZmRjNmJhODJjODNhMDhmZmIwMDRmMDJlZGJlODE1MDU2ODA5ODdj
-    ZTgwMTA5MTVjNDdmNzc1YWViYmNhNjlhOWZkMWY2Y2NlY2VlZDI=
+    ZmU3ZDljM2UwYmE0ODgzZjNkZTk3MGRmOTFhNWEyYmVmMGVmYzAwMDQ2ZmYz
+    ZjZkZmFlZjE1MTk0MTk3ZmU2NWZhMmEzOGY0ZmY3OTA0NmRmN2U4ZGZhMDY3
+    ZWY3OWM5MjY4ODA1ZDU3YjA3ODg3NTk4NDNiOTk5Y2RiYmI0ZWM=
   data.tar.gz: !binary |-
-    YWY3NzA5ZTgwZTRjZDQ1NzdiYTdlOTUwMmRiYjVmNjgzZGJhYWQ0ZWFlZDUw
-    YWQ1NzhkNDYxZTVlYmYwZDFmMmZiNWNjMmM1YTgzZGFhYzY1NzMzNGUyZDE1
-    MzM1NDRjYWI2MTgwYzljYjczMWJjNjYyM2JkYmE5NjY5NzY5OGY=
+    NGI0OWFkYTFiOGM4ZDM0MzhiODMxOGRhMzQ5NjIxMzdiMDdmZjQ4NmFkNDE2
+    MmZhMDU4YmYxZmVkMmE4ODI2ZGQwMzgxZGYxYjJjYmI3MjI3OWUzYjAzN2Nk
+    ZDdiYzQzN2E5ZDk5ZThlYjdjYWExYjMyZTA0ZGI5Y2JlMzFlYTY=

data/lib/aboutyou-sdk.rb

@@ -60,6 +60,7 @@ class AY
       appPassword,
       sessionId = 'SESSION_ID',
       cache = nil,
+      cacheServer= 'localhost:11211',
       apiEndPoint = AboutYou::SDK::Constants::API_ENVIRONMENT_LIVE,
       resultFactory = nil,
       logger = nil
@@ -85,7 +86,7 @@ class AY
     end
     if cache == 'memcache'
       require 'dalli'
-      self.cache = Dalli::Client.new('localhost:11211')
+      self.cache = Dalli::Client.new(cacheServer, {:value_max_bytes => 5242880})
     end
     resultFactory ? self.modelFactoryInstance = resultFactory : initDefaultFactory(self.cache)
   end
@@ -374,10 +375,10 @@ class AY
    #   - Instance of AboutYou::SDK::Model::Facet
    ###
   def fetchFacets(groupIds=[])
-
-    query.fetchFacets(groupIds).executeSingle
-    
-    self.modelFactoryInstance.facetManager.facets
+    if self.modelFactoryInstance.facetManager.isEmpty
+      query.fetchFacets.executeSingle
+    end
+    self.modelFactoryInstance.facetManager.facetsByGroupIds(groupIds)
   end
 
 
@@ -582,8 +583,8 @@ class AY
    ###
   def initDefaultFactory(cache = nil)
     resultFactory = AboutYou::SDK::Factory::DefaultModelFactory.new(self,
-          AboutYou::SDK::Model::FacetManager::DefaultFacetManager.new,
-          AboutYou::SDK::Model::CategoryManager::DefaultCategoryManager.new(cache, self.appId)
+          AboutYou::SDK::Model::FacetManager::DefaultFacetManager.new(cache, self.appId, self),
+          AboutYou::SDK::Model::CategoryManager::DefaultCategoryManager.new(cache, self.appId, self)
     )
     resultFactory.baseImageUrl=(self.baseImageUrl)
 

data/lib/aboutyou-sdk/Factory/DefaultModelFactory.rb

@@ -187,7 +187,7 @@ module AboutYou
         # * *Returns* :
         #   - a Hash containing pairs of facetKey => AboutYou::SDK::Model::Facet
         ###
-        def createFacetsList(jsonObject, query)
+        def createFacetsList(jsonObject, query=nil)
           self.createFacetList(jsonObject["facet"], query)
         end
         
@@ -515,7 +515,7 @@ module AboutYou
         #   - +query+ -> the query sent to the api
         ###
         def updateFacetManager(jsonObject, query)
-          self.facetManager.facets=(self.createFacetsList(jsonObject, query))
+          self.facetManager.parseJson(jsonObject, self, query)
         end
 
         ###

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

@@ -20,6 +20,7 @@ module AboutYou
           attr_accessor :cache
           # the cache key for the app
           attr_accessor :cacheKey
+          attr_accessor :shopApi
 
           ###
           # the Constructor for the AY class
@@ -31,7 +32,8 @@ module AboutYou
           # * *Returns* :
           #   - Instance of AboutYou::SDK::Model::CategoryManager::DefaultCategoryManager
           ###
-          def initialize(cache = nil, appId = '')
+          def initialize(cache = nil, appId = '', shopApi)
+              self.shopApi = shopApi
               self.cache    = cache
               self.cacheKey = 'AY:SDK:' + String(appId) + ':categories'
               self.loadCachedCategories
@@ -42,17 +44,16 @@ module AboutYou
           ###
           def loadCachedCategories
             if self.cache
-              self.categories = self.cache.get(self.cacheKey) ? self.cache.get(self.cacheKey) : nil
+              parseJson(self.cache.get(self.cacheKey), self.shopApi.modelFactoryInstance)
             end
           end
 
           ###
           # This method caches the currently read-in categories
           ###
-          def cacheCategories
+          def cacheCategories(jsonObject)
             if self.cache
-              binding.pry
-              self.cache.set(self.cacheKey, self.categories, DEFAULT_CACHE_DURATION)
+              self.cache.set(self.cacheKey, jsonObject, DEFAULT_CACHE_DURATION)
             end
           end
 
@@ -78,13 +79,13 @@ module AboutYou
           ###
           def parseJson(jsonObject, factory)
             self.categories = {}
-            self.parentChildIds = jsonObject["parent_child"]
-
-            jsonObject["ids"].each do |id, jsonCategory|
-                self.categories[id] = factory.createCategory(jsonCategory)
+            if jsonObject
+              self.cacheFacets(jsonObject)
+              self.parentChildIds = jsonObject["parent_child"]
+              jsonObject["ids"].each do |id, jsonCategory|
+                  self.categories[id] = factory.createCategory(jsonCategory)
+              end
             end
-            self.cacheCategories()
-            self
           end
 
           ###

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

@@ -15,16 +15,17 @@ module AboutYou
             attr_accessor :cache
             
             # @var string */
-            @cacheKey;
             attr_accessor :cacheKey
+            attr_accessor :shopApi
 
              ###
              # @param Cache $cache
              # @param string $appId
              ###
-            def initialize(cache = nil, appId = '')
+            def initialize(cache = nil, appId = '', shopApi)
             
                 self.cache    = cache;
+                self.shopApi  = shopApi
                 self.cacheKey = 'AY:SDK:' + String(appId) + ':facets';
                 self.facets = Hash.new
 
@@ -34,14 +35,14 @@ module AboutYou
             def loadCachedFacets()
             
                 if (self.cache) 
-                  self.facets = (self.cache.fetch(self.cacheKey)) ? self.cache.fetch(self.cacheKey): nil;
+                  parseJson(self.cache.get(self.cacheKey), self.shopApi.modelFactoryInstance)
                 end
             end
 
-            def cacheFacets()
+            def cacheFacets(jsonObject)
             
-                if (self.cache) 
-                    self.cache.save(self.cacheKey, self.facets, DEFAULT_CACHE_DURATION);
+                if (self.cache)
+                    self.cache.set(self.cacheKey, jsonObject, DEFAULT_CACHE_DURATION);
                 end
             end
 
@@ -51,16 +52,16 @@ module AboutYou
                     self.cache.delete(self.cacheKey);
                 end
             end
-
-            def isEmpty()
             
-                return (self.facets.empty?);
+            def parseJson(jsonObject, factory, query=nil)
+              if jsonObject
+                self.cacheFacets(jsonObject)
+                self.facets = factory.createFacetsList(jsonObject, query)
+              end
             end
 
-            def facets=(facets)
-            
-                @facets = facets;
-                self.cacheFacets();
+            def isEmpty()
+                return (self.facets.empty?);
             end
 
              ###
@@ -71,6 +72,11 @@ module AboutYou
                 lookupKey = AboutYou::SDK::Model::Facet.new(0, "", [], 0, "").uniqueKey(groupId, id);
                 return (self.facets[lookupKey]) ? self.facets[lookupKey] : nil;
             end
+            
+            def facetsByGroupIds(groupIds = [])
+              groupIds = groupIds.map { |gId| Integer(gId) }
+              self.facets.select { |key, facet| groupIds.include?(facet.groupId) }
+            end
         end
       end
     end

data/lib/aboutyou-sdk/Query.rb

@@ -106,6 +106,10 @@ module AboutYou
 
         return self
       end
+      
+      def fetchFacets(groupIds=[])
+        super(groupIds)
+      end
 
        ###
        # wrapper-method for fetchProductsByIds which coordinates Category- and Facet-Manager

data/tests/testCategoryCaching.rb

@@ -0,0 +1,35 @@
+require 'sinatra'
+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,
+    AboutYou::SDK::Criteria::ProductFields::VARIANTS]
+)
+end
+
+get "/getCache" do
+  result = ""
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'memcache')
+  
+  shop.fetchCategoryTree.categories.each do |key, cate|
+    result = result + cate.name + '  '
+  end
+  
+  return result
+end
+
+get "/noCache" do
+  result = ""
+  shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'memcache')
+  shop.cache.delete('AY:SDK:281:categories')
+  
+  shop.fetchCategoryTree.categories.each do |key, cate|
+    result = result + cate.name + '  '
+  end
+  
+  return result
+end

data/tests/testFacetCaching.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aboutyou-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Ferenc Beutel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -52,6 +52,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use the Ruby SDK to build apps for the ABOUT YOU platform.
 email: ferenc1993beutel@gmx.de
 executables: []
@@ -104,7 +118,8 @@ files:
 - tests/testAutocomplete.rb
 - tests/testCatFilter.rb
 - tests/testCatTree.rb
-- tests/testDalli.rb
+- tests/testCategoryCaching.rb
+- tests/testFacetCaching.rb
 - tests/testFacetTypes.rb
 - tests/testFacets.rb
 - tests/testFetchFacet.rb

data/tests/testDalli.rb

@@ -1,15 +0,0 @@
-require 'sinatra'
-require "pry_debug"
-require_relative'../lib/aboutyou-sdk.rb'
-
-shop = AY.new(281, 'e6068c4ca020262613d06122663cb300', 'sessionId', 'memcache')
-
-shop.fetchProductsByIds(
-  [661132, 660971, 661367, 661361],
-  [AboutYou::SDK::Criteria::ProductFields::CATEGORIES,
-    AboutYou::SDK::Criteria::ProductFields::VARIANTS]
-)
-get "/" do
-  binding.pry
-  return shop.cache.get('AY:SDK:281:categories')
-end