infopark_reactor 1.15.0.beta1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a56b31ba2e29489af380f651342ddc82f3b542d3
-  data.tar.gz: 9ed150774b911bb3dfb2c311d7a84dff1dc4fd72
+  metadata.gz: 9d51a7c5afd4000ea8e81db0087cc71d2b7dddaf
+  data.tar.gz: ee5eb6afd1de7fb108017e7a82d3bb27f9990acc
 SHA512:
-  metadata.gz: 78174cc1ebf120f5f844e1ebcb26c1f1e4245cb63bd03540bca50a380e455717c11580e4607a62e2406f1392991f1686670e7d39b5930259b598f3290dc3b134
-  data.tar.gz: 4faab19e5c534b811533d7a106057c03ed9fc2cff51fc70013a1743d2460db98e05ca12aa8d04bae89bedea2e4c3c3defc9004eb1afb2a2dd0884eeeba889ca4
+  metadata.gz: d221067cab1005f0735f2cdc346c26b72268281c45a08340158a03716938aead93f94b5da7d58a71263e2b40c20cb3ba5476e9279aa7756b3ae834484e0cce6e
+  data.tar.gz: 880558efbed693fed5b80eab63ce1c479c5b4df8f2d147f5106fd86574e6ad86c81e802b60e2c47f16b1465a234f221d58345bcaff2cdda109e96efdb7b777dd

data/lib/reactor/cache/permission.rb

@@ -1,36 +1,34 @@
 # -*- encoding : utf-8 -*-
-require 'singleton'
 
 module Reactor
   module Cache
     class Permission
-      include Singleton
+      BACKING_CACHE_EXPIRATION = 5
 
-      def lookup(user, key, &block)
-        set(user, key, yield) unless set?(user, key)
-        get(user, key)
+      def self.instance
+        self.new
       end
 
       def initialize
-        @cache = {}
-      end
-
-      def invalidate(user)
-        @cache[user] = {}
+        @@backing_storage ||= ActiveSupport::Cache::MemoryStore.new({ size: 1.megabyte })
       end
 
-      protected
-      def set?(user, key)
-        @cache.key?(user) && @cache[user].include?(key)
+      def lookup(user, key, &block)
+        cache_entry = @@backing_storage.fetch(user.to_s, :expires_in => BACKING_CACHE_EXPIRATION.minutes) do
+          {key => block.call}
+        end
+        if cache_entry.key?(key)
+          cache_entry[key]
+        else
+          result = block.call
+          @@backing_storage.write(user.to_s, cache_entry.merge({key => result}), :expires_in => BACKING_CACHE_EXPIRATION.minutes)
+          result
+        end
       end
 
-      def set(user, key, value)
-        @cache[user] ||= {}
-        @cache[user][key] = value
-      end
 
-      def get(user, key)
-        @cache[user][key]
+      def invalidate(user)
+        @@backing_storage.delete(user.to_s)
       end
     end
   end

data/lib/reactor/cache/user.rb

@@ -1,38 +1,36 @@
 # -*- encoding : utf-8 -*-
-require 'singleton'
 
 module Reactor
   module Cache
     class User
-      include Singleton
+      BACKING_CACHE_EXPIRATION = 5
+
+      def self.instance
+        self.new
+      end
+
+      def initialize
+        @@backing_storage ||= ActiveSupport::Cache::MemoryStore.new({ size: 1.megabyte })
+      end
 
       def get(user_name)
         @cache ||= {}
         # Rails.logger.debug "User:Cache hit: #{hit?(user_name.to_s)} [#{@cache[user_name.to_s].inspect}]"
 
         key = user_name.to_s
-        if hit?(key)
-          @cache[key]
-        else
-          @cache[key] = Reactor::Session::User.new(key)
+        @@backing_storage.fetch(key, :expires_in => BACKING_CACHE_EXPIRATION.minutes) do
+          Reactor::Session::User.new(key)
         end
       end
 
       def set(user_name, user)
-        @cache ||= {}
-        @cache[user_name.to_s] = user
+        @@backing_storage.write(user_name.to_s, user, :expires_in => BACKING_CACHE_EXPIRATION.minutes)
       end
 
       def invalidate(user_name)
-        @cache ||= {}
-        @cache[user_name.to_s] = nil
+        @@backing_storage.delete(user_name.to_s)
       end
 
-      private
-      def hit?(user_name)
-        key = user_name.to_s
-        @cache.key?(key) && !@cache[key].nil?
-      end
     end
   end
 end

data/lib/reactor/permission.rb

@@ -218,7 +218,7 @@ module Reactor
 
       def granted?(user, permission)
         user ||= default_user
-        cache.lookup(user, "#{obj.path}:#{permission}") do
+        cache.lookup(user, "#{obj.id}:#{permission}") do
           lookup.superuser?(user) || lookup.send("#{permission}?", user)
         end
       end

data/lib/reactor/session/user.rb

@@ -13,6 +13,10 @@ module Reactor
         @superuser= user.is_root?
       end
 
+      def to_s
+        @user_name
+      end
+
       attr_reader :user_name, :groups, :language
 
       def superuser?

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.15.0.beta1"
+  VERSION = "1.16.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.15.0.beta1
+  version: 1.16.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -225,9 +225,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14