yaccl 0.0.22 → 0.0.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGI3MTMzNDY0MTNlOWI1YTllM2EwODVkYTEwNWZhZDMzYjQ3OTliYw==
+    NTY1ZDVhM2UwMmFlMGQ2MWU2NTFkZmE4YTQ2YzVmNmZiZjE2Y2MyNg==
   data.tar.gz: !binary |-
-    MTc2ODUyMjM2NjJlNWU4ZWY5MDQ4ZWQwNTJlMjA3YWNmNmE4MjljZg==
+    Zjc3NjgyNWZjZjVjZDIxMjI2ZjkxZjE4M2Q1M2QzN2E4ZDEwZmM0NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjBiNjQzNGUzZWNmZjdhNzU0NTFhZjIxZGI2MjQ0NDU4NzFjNzk2YTYzNWZk
-    ZTg4NTk3OWVmZjc5ZTE2Nzk4OTQ1MWNkYzA5Yzk2YTkyMjZkOGI0NWFkZTE3
-    MTk5ZDFkODkwNDM2ZTFkODA5YjhiOThiYjllNGU2YWQ0NDNmNzQ=
+    NTJhOWNiMDgzZWVkYzgwMjE5YTMzM2Y1YTE1NDg4NGI2ODVlMGVhYWYwMWFi
+    NTNlNmZiZDM4ZmI5ODRlNWY1MTA5NGIyNmNhZDJiMWNiZTQ4MmY5ODFmOGZl
+    NjUzNmE2Y2UxNjFjYTZlYzI3YjYwY2NhMTE1OTBiNGMwMjM1ZjM=
   data.tar.gz: !binary |-
-    YjkwOGU1NjgyZTI5OTFlYzU5ZGFmOWE1MjcxMWYwZGMzOTc2ZWIyNzY5YzRm
-    ZWM0NGM4NjliYTQ1ZWNmOTU1ZTMwNmFhNzk4OWE3OTAzYTMwMGNlMjhhYjFi
-    NWM1NmY2Nzg3MWU4ODUyMmYzYjA2OTFhYTM2NGJhZDllMGZmNjM=
+    MDkzNGZjNDU5YTllODUyMTk0ZWIzYjQzNWNhMjc4MmQ4MTQ5MmFiNTBjZGRk
+    ZDhjYmM3YWU1N2QxMjcxNzQwMjU2YWI5Y2U4NzZmNmM3NDMxY2Y0M2UzNGFi
+    ZGEzZDc4ZTFhN2IwODQxYWNiZjJhOGViMzlmYWRmZmZiMjA5MWY=

data/lib/yaccl/services/internal/browser_binding_service.rb

@@ -1,7 +1,7 @@
 require 'httparty'
 require 'net/http/post/multipart'
 require 'multi_json'
-require 'volatile_hash'
+require_relative 'simple_cache'
 
 module YACCL
   module Services
@@ -9,14 +9,13 @@ module YACCL
 
     module Internal
       class BrowserBindingService
+
+        @@url_cache = SimpleCache::MemoryCache.new
+
         def initialize(service_url, basic_auth_username=nil, basic_auth_password=nil, succinct_properties=true)
           @service_url = service_url
           @basement = Basement.new(basic_auth_username, basic_auth_password)
-
           @succinct_properties = succinct_properties
-
-          @repository_urls = VolatileHash.new(strategy: 'lru')
-          @root_folder_urls = VolatileHash.new(strategy: 'lru')
         end
 
         def perform_request(required_params={}, optional_params={})
@@ -45,9 +44,9 @@ module YACCL
           end
           unless (200...300).include?(response.code.to_i)
             if result.is_a?(Hash) && result.has_key?(:exception)
-              raise CMISRequestError, "#{result[:exception]} -- #{result[:message]}"
+              raise CMISRequestError, "#{response.code} -- #{result[:exception]} -- #{result[:message]}"
             else
-              raise CMISRequestError, "#{result}"
+              raise CMISRequestError, "#{response.code} -- #{result}"
             end
           end
 
@@ -60,22 +59,19 @@ module YACCL
           if repository_id.nil?
             @service_url
           else
-            if object_id.nil?
-              if @repository_urls[repository_id].nil?
-                base = @basement.get(@service_url)
-                raise "No repository found with ID: #{repository_id}." unless base[repository_id]
-                repository_url = base[repository_id]['repositoryUrl']
-                @repository_urls[repository_id] = repository_url
-              end
-              return @repository_urls[repository_id]
-            else
-              if @root_folder_urls[repository_id].nil?
-                root_folder_url = @basement.get(@service_url)[repository_id]['rootFolderUrl']
-                @root_folder_urls[repository_id] = root_folder_url
-              end
-              return @root_folder_urls[repository_id]
-            end
+            repository_urls(repository_id)[object_id ? :root_folder_url : :repository_url]
+          end
+        end
+
+        def repository_urls(repository_id)
+          if @@url_cache[repository_id].nil?
+            repository_infos = @basement.get(@service_url)
+            raise "No repository found with ID #{repository_id}." unless repository_infos.has_key?(repository_id)
+            repository_info = repository_infos[repository_id]
+            @@url_cache[repository_id] = { repository_url: repository_info['repositoryUrl'],
+                                           root_folder_url: repository_info['rootFolderUrl'] }
           end
+          @@url_cache[repository_id]
         end
 
         def check(hash)

data/lib/yaccl/services/internal/simple_cache.rb

@@ -0,0 +1,97 @@
+=begin
+Code taken mostly from ActiveRecord::Cache
+Copyright (c) 2005-2011 David Heinemeier Hansson
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+require 'digest/md5'
+module SimpleCache
+  #TODO: add a super-class and implement FileSystemCache
+  class MemoryCache
+
+    attr_reader :cache_size
+
+    def initialize(options = {})
+      @cache = {}
+      @cache_size = 0
+      @key_access = {}
+      @max_size = options[:max_size] || 32 * 1024 #32 megabytes
+      @timeout  = options[:timeout]  || 60*30 #30 minutes
+    end
+
+    def encode(key)
+      Digest::MD5.hexdigest key
+    end
+
+    def delete(key)
+      entry = @cache.delete key
+      @key_access.delete key
+      @cache_size -= entry.size
+    end
+
+    def [](key)
+      key = encode(key)
+      entry = @cache[key]
+      if entry
+        @key_access[key] = Time.now.to_f
+      else
+        @key_access.delete key
+      end
+      entry
+    end
+
+    def []=(key, value)
+      key = encode(key)
+      old_entry = @cache[key]
+      @cache_size -= old_entry.size if old_entry
+      @key_access[key] = Time.now.to_f
+      @cache[key] = value
+      @cache_size += value.size
+      prune if @cache_size > @max_size
+    end
+
+    def has_key?(key)
+      !!@cache[encode(key)]
+    end
+
+    def prune
+      # first, the obvious cleanup
+      @cache.keys.each do |key|
+        delete(key) if stale? key
+      end
+
+      # now, try to leave it a 3/4 of it's capacity
+      target_size = 0.75 * @max_size
+
+      # delete the older entries
+      sorted_keys = @key_access.keys.sort{|a,b| @key_access[a].to_f <=> @key_access[b].to_f}
+      sorted_keys.each do |key|
+        return if @cache_size <= target_size
+        delete key
+      end
+    end
+
+    def stale?(key)
+      (Time.now.to_f - @key_access[key]) > @timeout.to_f
+    end
+
+  end
+end

data/lib/yaccl/version.rb

@@ -1,3 +1,3 @@
 module YACCL
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

data/yaccl.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'httparty', '~> 0.10'
   s.add_dependency 'multipart-post', '~> 1.1'
   s.add_dependency 'multi_json', '~> 1.5'
-  s.add_dependency 'volatile_hash', '~> 0.0.2'
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaccl
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -53,20 +53,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: volatile_hash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 description: A Ruby CMIS browser binding client library implementation.
 email:
 - gem@up-nxt.com
@@ -96,6 +82,7 @@ files:
 - lib/yaccl/services/acl_services.rb
 - lib/yaccl/services/discovery_services.rb
 - lib/yaccl/services/internal/browser_binding_service.rb
+- lib/yaccl/services/internal/simple_cache.rb
 - lib/yaccl/services/multi_filing_services.rb
 - lib/yaccl/services/navigation_services.rb
 - lib/yaccl/services/object_services.rb