infopark_reactor 1.22.6 → 1.23.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 411243dbe16d77f7eb90a4db5971c1311a4d5572
-  data.tar.gz: 9a78a8c682728552b701b6c9fec5f1de1d23adf1
+  metadata.gz: 07d1a2447746fc85e6dbbec92b8999053f9a1f9a
+  data.tar.gz: 1fc2128aafa6d33799f34f030bf5fb817a249ecd
 SHA512:
-  metadata.gz: a0b887b0cc7e81fddada0d55e0d745401fe757f41fef3dc3d4f0f59a6a33d0016f2bd18fdced5cf26c9fc952497f300e93816c922d1f37180ee658737d94cfa9
-  data.tar.gz: e370727be51373b5f8a834805c99ca5d9b0f227cfb8e1dfe2bdfe9264c6c72759f554b95b23edd189509e09c192a2f0b5fd475143b85044b766fa3e9a623a7f6
+  metadata.gz: df3a64681d484882e178f6331f4ecf668ea9827579a3521555d9840dad8bb6bbb976719ba6d12b441384676362b7bae388160898c59b6c3c0aa825ec3a80c8d1
+  data.tar.gz: 7998b90a010e9e8e77bcfddcde22ca2d268ab630f7324b0c5eee9d2a48617bef59065479c86a3ea27acc735bef5a5cbbb92c94d8ef91b080e6878ee67a8f78d1

data/lib/reactor/engine.rb

@@ -1,3 +1,5 @@
+require 'reactor/session_helper'
+
 # -*- encoding : utf-8 -*-
 module Reactor
 
@@ -14,36 +16,10 @@ module Reactor
     end
 
     initializer "reactor.rsession" do |app|
-      if app.config.action_dispatch.cookies_serializer && app.config.action_dispatch.cookies_serializer != :marshal
-        Rails.logger.info "Cookie session serializer #{app.config.action_dispatch.cookies_serializer} unsupported. Enforcing :marshal instead."
-        app.config.action_dispatch.cookies_serializer = :marshal
-      end
-
-      # FIXME: extract !
-      AbstractController::Base.__send__(:define_method, :rsession) do
-        self.session[:rsession] ||= Reactor::Session.instance
-      end
+      ActionController::Base.__send__(:include, Reactor::SessionHelper::RsessionHelper)
       ActionController::Base.__send__(:helper_method, :rsession)
 
-      ActionController::Base.__send__(:define_method, :rsession_auth) do
-        if RailsConnector::Configuration.mode == :editor && (jsessionid = cookies['JSESSIONID']).present?
-          # Why the gsub? It's a dirty hack! Reason: JSESSIONIDs are unescaped
-          # when read through Rails and hence all + are converted into spaces.
-          # CM Kernel though stores escaped IDs.
-          # From the possible generated characters only the + seems to be
-          # problematic.
-          # CGI.escape would be the solution, but it's deprecated
-          # URI.escape does too much
-          jsessionid.gsub!(' ','+')
-
-          Rails.logger.info "Trying to log in at #{Reactor::Configuration.xml_access[:host]}:#{Reactor::Configuration.xml_access[:port]} with JSESSIONID=#{jsessionid}."
-          rsession.login(jsessionid)
-          Rails.logger.info %|Logged in as "#{rsession.user_name}".| if rsession.user?
-        else
-          rsession.destroy
-        end
-      end
-      ActionController::Base.__send__(:before_filter, :rsession_auth)
+      ActionController::Base.__send__(:include, Reactor::SessionHelper::AuthHelper)
     end
 
   end

data/lib/reactor/session.rb

@@ -6,34 +6,37 @@ require 'reactor/cache/user'
 require 'reactor/session/observers'
 
 class Reactor::Session
-  attr_reader :user_name, :session_id
   include Observable
 
-  def self.instance
-    self.for(Reactor::Configuration.xml_access[:username])
-  end
+  class State < Struct.new(:user_name, :session_id)
+    def serialize
+      [self.user_name, self.session_id]
+    end
 
-  def self.for(user_name)
-    self.new.tap do |instance|
-      instance.instance_variable_set(:@user_name, user_name)
-      instance.send(:proper_notify_observers, user_name, false)
+    def self.deserialize(array)
+      self.new(*array)
     end
   end
 
-  def marshal_dump
-    [@user_name, @session_id]
+  def initialize(state=State.new)
+    self.initialize_and_notify(state)
   end
 
-  def marshal_load(array)
-    @user_name, @session_id = array
-    self.add_observers
-    self.proper_notify_observers(@user_name, false)
+  def user_name
+    self.state.user_name
   end
 
-  def initialize
-    self.add_observers
+  def session_id
+    self.state.session_id
   end
 
+  def self.instance
+    self.for(Reactor::Configuration.xml_access[:username])
+  end
+
+  def self.for(user_name)
+    self.new(State.new(user_name, nil))
+  end
 
   def login(session_id)
     if !logged_in?(session_id)
@@ -58,13 +61,26 @@ class Reactor::Session
   end
 
   def user_name=(new_user_name)
-    @user_name = new_user_name
-    self.proper_notify_observers(@user_name, true)
-    @user_name
+    self.state.user_name = new_user_name
+    self.proper_notify_observers(new_user_name, true)
+    new_user_name
+  end
+
+  def marshal_dump
+    self.state.serialize
+  end
+
+  def marshal_load(array)
+    self.initialize_and_notify(State.deserialize(array))
   end
 
   protected
-  attr_writer :session_id
+  attr_accessor :state
+  def initialize_and_notify(state)
+    self.state = state
+    self.add_observers
+    self.proper_notify_observers(self.user_name, false)
+  end
 
   def authenticate(session_id)
     self.session_id = session_id
@@ -84,4 +100,8 @@ class Reactor::Session
     self.changed(true)
     self.notify_observers(*args)
   end
+
+  def session_id=(new_session_id)
+    self.state.session_id = new_session_id
+  end
 end

data/lib/reactor/session_helper.rb

@@ -0,0 +1,70 @@
+module Reactor
+  module SessionHelper
+    module AuthHelper
+      def rsession_auth
+        if RailsConnector::Configuration.mode == :editor && (jsessionid = cookies['JSESSIONID']).present?
+          # Why the gsub? It's a dirty hack! Reason: JSESSIONIDs are unescaped
+          # when read through Rails and hence all + are converted into spaces.
+          # CM Kernel though stores escaped IDs.
+          # From the possible generated characters only the + seems to be
+          # problematic.
+          # CGI.escape would be the solution, but it's deprecated
+          # URI.escape does too much
+          jsessionid.gsub!(' ','+')
+
+          Rails.logger.info "Trying to log in at #{Reactor::Configuration.xml_access[:host]}:#{Reactor::Configuration.xml_access[:port]} with JSESSIONID=#{jsessionid}."
+          rsession.login(jsessionid)
+          if rsession.user?
+            Rails.logger.info %|Logged in as "#{rsession.user_name}".|
+          end
+        else
+          rsession.destroy
+        end
+      end
+
+      def self.included(base)
+        base.__send__(:before_filter, :rsession_auth)
+      end
+    end
+
+    module RsessionHelper
+      def rsession
+        @__rsession ||= RsessionHelper.from_session(self.session)
+      end
+
+      def self.from_session(session)
+        Reactor::Session.new(
+          # This passes the very powerfull rails session object
+          SessionState.new(session)
+        )
+      end
+    end
+
+    class SessionState < Reactor::Session::State
+      USER_NAME_KEY  = "rsession$user_name"
+      SESSION_ID_KEY = "rsession$session_id"
+
+      def initialize(session)
+        self.session = session
+        super(session[USER_NAME_KEY], session[SESSION_ID_KEY])
+      end
+
+      def user_name=(new_user_name)
+        # this is a little bit of magic: it will trigger
+        # the the session serialization routine, and will
+        # persist the new information after processing the request
+        self.session[USER_NAME_KEY] = new_user_name
+        new_user_name
+      end
+
+      def session_id=(new_session_id)
+        # see above
+        self.session[SESSION_ID_KEY] = new_session_id
+        new_session_id
+      end
+
+      protected
+      attr_accessor :session
+    end
+  end
+end

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.22.6"
+  VERSION = "1.23.0.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.22.6
+  version: 1.23.0.beta2
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,7 @@ files:
 - lib/reactor/session.rb
 - lib/reactor/session/observers.rb
 - lib/reactor/session/user.rb
+- lib/reactor/session_helper.rb
 - lib/reactor/streaming_upload.rb
 - lib/reactor/sudo.rb
 - lib/reactor/support/link_matcher.rb
@@ -213,9 +214,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.1