infopark_reactor 1.9.1 → 1.10.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 432173125e16982290bf5e7eb40370e0f37585d5
-  data.tar.gz: 2d7268785b33578ddee8890d8a2ac92deb3b1b91
+  metadata.gz: 58b80269428f681b9bd1375c20c6640c7aa0160e
+  data.tar.gz: e26a90fb05c668147402917ba45fb94bc769f00b
 SHA512:
-  metadata.gz: 00ffdd16e4a53f1246861515d148ccf7031e4aa1a2b6cbf2f5e809ed806269357db74c467d031e7c1abcd80bcb00f80a5df5bcfde862035eb1acf2d3a1681bbe
-  data.tar.gz: 7b1bfb1775ed0df349f555d0971beee2e323520c27a5c022ce490a50d7f86b29ea10ed32c97d518c5192504f2b71ea8ab91d88b9dfa8e07323ce8c6d6b6ecb11
+  metadata.gz: 5c4ce7c7f0a82236966a5e0b3649aa5de302e3f5bd57dec6a90143b1d3380bb70e9cd63bd1682e484572f9ef24a20a994c9ebbbd76f02fb67dab2a38cf023bb5
+  data.tar.gz: 345721a55faaaf7f0cc400f4d31e9db040d648645fe18ec22114c2615e8cbb21af3f02fcd633e2f92d866664af85928b053f95a2b422124a0865eed0de4e471e

data/lib/infopark_reactor.rb

@@ -40,7 +40,6 @@ require 'reactor/streaming_upload'
 
 # require rails integration
 require 'reactor/session'
-require 'reactor/session/observers'
 require 'reactor/session/user'
 
 # require engine

data/lib/reactor/session/observers.rb

@@ -1,33 +1,25 @@
 # -*- encoding : utf-8 -*-
-require 'reactor/session'
 
-module Reactor::Session::Observers
-  class PermissionCacheInvalidator
-    def update(user_name)
-      #puts '%%% invalidating permission cache'
-      Reactor::Cache::Permission.instance.invalidate(user_name)
-    end
-  end
+module Reactor
+  class Session
+    module Observers
+      class PermissionCacheInvalidator
+        def update(user_name, new_login=false)
+          Reactor::Cache::Permission.instance.invalidate(user_name) if new_login
+        end
+      end
 
-  class UserCacheInvalidator
-    def update(user_name)
-      #puts '%%% invalidating user cache'
-      Reactor::Cache::User.instance.invalidate(user_name)
-    end
-  end
-
-  class CmsAccessDataPropagator
-    def update(user_name)
-      #puts '%%% propagating user'
-      Reactor::Configuration.xml_access[:username] = user_name
-    end
-  end
+      class UserCacheInvalidator
+        def update(user_name, new_login=false)
+          Reactor::Cache::User.instance.invalidate(user_name) if new_login
+        end
+      end
 
-  self.constants.each do |possible_observer_name|
-    possible_observer = self.const_get(possible_observer_name)
-    if possible_observer.method_defined?(:update)
-      Reactor::Session.instance.add_observer(possible_observer.new)
+      class CmsAccessDataPropagator
+        def update(user_name, new_login=false)
+          Reactor::Configuration.xml_access[:username] = user_name
+        end
+      end
     end
   end
 end
-  

data/lib/reactor/session.rb

@@ -1,15 +1,33 @@
 # -*- encoding : utf-8 -*-
-require 'singleton'
 require 'observer'
 
 require 'reactor/cm/bridge'
 require 'reactor/cache/user'
+require 'reactor/session/observers'
 
 class Reactor::Session
   attr_reader :user_name, :session_id
-  include Singleton
   include Observable
 
+  def self.instance
+    self.new
+  end
+
+  def marshal_dump
+    [@user_name, @session_id]
+  end
+
+  def marshal_load(array)
+    @user_name, @session_id = array
+    self.add_observers
+    self.proper_notify_observers(@user_name, false)
+  end
+
+  def initialize
+    self.add_observers
+  end
+
+
   def login(session_id)
     if !logged_in?(session_id)
       self.user_name = authenticate(session_id)
@@ -34,8 +52,8 @@ class Reactor::Session
 
   def user_name=(new_user_name)
     @user_name = new_user_name
-    changed(true) # I will find and burn your house to the ground if you remove this line
-    notify_observers(@user_name)
+    self.proper_notify_observers(@user_name, true)
+    @user_name
   end
 
   protected
@@ -46,4 +64,17 @@ class Reactor::Session
     Reactor::Cm::Bridge.login_for(session_id)
   end
 
+  def add_observers
+    Observers.constants.each do |possible_observer_name|
+      possible_observer = Observers.const_get(possible_observer_name)
+      if possible_observer.method_defined?(:update)
+        self.add_observer(possible_observer.new)
+      end
+    end
+  end
+
+  def proper_notify_observers(*args)
+    self.changed(true)
+    self.notify_observers(*args)
+  end
 end

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.9.1"
+  VERSION = "1.10.0.beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0.beta
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14