infopark_fiona7 1.5.2.0.0 → 1.5.2.1.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 741127529a15e35abbb025c194986fca04edb0da
-  data.tar.gz: 87098673b467a0ed0a93cc5e84f298365397f5b5
+  metadata.gz: d09cc0745bc37e2f791a58f3d0e1a8bc99ad16d6
+  data.tar.gz: fc71738b1f4cccedd1bc60583a6821639299514e
 SHA512:
-  metadata.gz: aa8b4752d37991650a8d51d0bf84e968d2fbe93b9472c4045591c2a5a7ca6a34c8d5e98b1e9a8813c6231de42bc436b7946e1157ec2d4311343203649275f25e
-  data.tar.gz: 5adea82b2c79308ff97ccf118568545b314226081a2acf9ca3bfb4ae8624383e9b5938ad9b717935ed1bfe408b4e368f98d89afed36b71f3de36a41aaa884751
+  metadata.gz: 6dd5dd123b3a866da27aa07a9daa68a6847fe85b94f2257b543390986114359ec8b565ac72db292279382ce65f2ca3eabb1f8cd9c7fe8c03f9de844cc00ac304
+  data.tar.gz: e407f9c445403f1fee0707fa10c28afbc2704e1ce80ff9dfb7ef317db95c3811e957c0bfd6f7e02f8cfb4aa52aedf90f165039bed0f90f7918d6eef148f66364

data/infopark_fiona7.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"
-  s.add_dependency "infopark_reactor", ">= 1.22.4"
+  s.add_dependency "infopark_reactor", "= 1.23.0.beta2"
   s.add_dependency "mini_magick"
   #s.add_development_dependency "ruby-prof"
   s.add_development_dependency "scrivito_development"

data/lib/fiona7/engine.rb

@@ -157,16 +157,21 @@ module Fiona7
           config.editing_auth do |env|
             request  = ActionDispatch::Request.new(env)
             session  = request.session
-            rsession = session[:rsession]
+            rsession = Reactor::SessionHelper::RsessionHelper.from_session(session)
             if rsession && rsession.user?
               Fiona7::ScrivitoUser.define(rsession.user)
             end
           end
 
           config.find_user do |user_id|
-            user = Reactor::Cache::User.instance.get(user_id)
-
-            Fiona7::ScrivitoUser.define(user)
+            begin
+              user = Reactor::Cache::User.instance.get(user_id)
+              Fiona7::ScrivitoUser.define(user)
+            rescue Reactor::Cm::XmlSingleRequestError => e
+              # this is the error code for entry (possibly user) not found
+              # other errors we want to pass on (unauthorized, etc)
+              raise e unless e.message =~ /060001/
+            end
           end
         end
       end
@@ -239,7 +244,7 @@ module Fiona7
           # for the current user (root most likely), which is not
           # really a thing that we want - being root by default
           # should only happen in the root mode
-          if !session[:rsession]
+          if !rsession.user?
             rsession.destroy
           end
         end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.5.2.0.0"
+  VERSION = "1.5.2.1.0-beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.5.2.0.0
+  version: 1.5.2.1.0.pre.beta1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,16 @@ dependencies:
   name: infopark_reactor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.22.4
+        version: 1.23.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.22.4
+        version: 1.23.0.beta2
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -336,9 +336,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.2.2