infopark_fiona7 0.71.0.4 → 0.71.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2943d8f71016c77e2923a62ebdc4c196046c7a12
-  data.tar.gz: 8cab80405cc8c406104dc1cf6f468ce63f8a3723
+  metadata.gz: c14523518e257dd8aac6700eee128ff69aaa9741
+  data.tar.gz: 693b82cb59011cac2c96c6b1c83a72d1967b761d
 SHA512:
-  metadata.gz: 29ebb08d03e8b21b8b01abaabd831a538365670613f4c19983fb23762a375109f8aefcabca4e723d1486b1af650c113c1165937d99c16e859070891176a3d433
-  data.tar.gz: 2286addb1ac034a38e69678963fd40ea175a03d784be6a301b7944e105e1fdfce9c1d6fc0339d30546590c6d9976136ab1f3a52dc1f202fcc10bdfac7dde6ff8
+  metadata.gz: 311e175c753051f99eccf5bdb03d8abec2e0e6065b8a1111cad6d7fcb5c04747f231796b5e590f7a55e13f562b1e54bf3f585d5c3dad13e3af08b23dad8bdbd7
+  data.tar.gz: 2a55154cf81b325cfd6e8395b411d4cd9674c971bce3e99fe6335bf92ada195ea2f1f639555bc7ce6f0a09448622a97578467709d7219650d0230c6fd7e21414

data/app/helpers/fiona7_override_helper.rb

@@ -44,7 +44,8 @@ module Fiona7OverrideHelper
     scrivito_tag_list(tag_name, obj, field_name, options) do |list, scrivito_child|
       fiona_child = children_map[scrivito_child.id]
 
-      next unless fiona_child.exportable? # suppress_export !
+      next if fiona_child.suppressed? # suppress_export
+      next if !scrivito_in_editable_view? && !fiona_child.active? # valid_from & valid_until
 
       block.call(list, fiona_child)
     end

data/infopark_fiona7.gemspec

@@ -21,7 +21,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.15.0.beta1"
+  s.add_dependency "infopark_reactor", ">= 1.16.0"
   s.add_dependency "mini_magick"
   s.add_development_dependency "ruby-prof"
 end

data/lib/fiona7/access_permission_check.rb

@@ -1,3 +1,5 @@
+require 'fiona7/editing_env_check'
+
 module Fiona7
   class AccessPermissionCheck
     def initialize(obj, env, rc_user, reactor_user)
@@ -19,8 +21,7 @@ module Fiona7
     attr_accessor :obj, :env, :rc_user, :reactor_user
     
     def editing?
-      editing_context = self.env[Scrivito::EditingContextMiddleware::ENVKEY]
-      editing_context && editing_context.authenticated_editor? && selected_workspace_id(editing_context) == 'rtc'
+      Fiona7::EditingEnvCheck.new(self.env).check?
     end
 
     # this is very quick!
@@ -39,12 +40,5 @@ module Fiona7
       end
     end
 
-    private
-    def selected_workspace_id(editing_context)
-      # NOTE: this does not require workspace lookup/load_obj
-      # and thus is potentially faster
-      editing_context.instance_variable_get(:@selected_workspace_id).to_s
-    end
-
   end
 end

data/lib/fiona7/controller_helper.rb

@@ -1,20 +1,12 @@
+require 'fiona7/in_editable_view'
+
 module Fiona7
   module ControllerHelper
-    def editing_context
-      Scrivito::EditingContextMiddleware.from_request(request)
-    end
-
-    def scrivito_in_editable_view?
-      editing_context.editable_display_mode?
-    end
-
-    def fiona7_in_editable_view?
-      scrivito_in_editable_view?
-    end
+    include InEditableView
 
     def self.included(base)
-      base.send(:helper_method, :scrivito_in_editable_view?)
-      base.send(:helper_method, :fiona7_in_editable_view?)
+      base.__send__(:helper_method, :scrivito_in_editable_view?)
+      base.__send__(:helper_method, :fiona7_in_editable_view?)
     end
   end
 end

data/lib/fiona7/editing_env_check.rb

@@ -0,0 +1,23 @@
+module Fiona7
+  class EditingEnvCheck
+    def initialize(env)
+      self.env = env
+    end
+
+    def check?
+      editing_context = self.env[Scrivito::EditingContextMiddleware::ENVKEY]
+      editing_context && editing_context.authenticated_editor? && selected_workspace_id(editing_context) == 'rtc'
+    end
+
+    protected
+    attr_accessor :env
+
+    private
+    def selected_workspace_id(editing_context)
+      # NOTE: this does not require workspace lookup/load_obj
+      # and thus is potentially faster
+      editing_context.instance_variable_get(:@selected_workspace_id).to_s
+    end
+  end
+end
+

data/lib/fiona7/fiona_connector_patches/cms_accessible.rb

@@ -1,8 +1,12 @@
 require 'rails_connector/cms_accessible'
+require 'fiona7/editing_env_check'
 require 'fiona7/access_permission_check'
+require 'fiona7/in_editable_view'
 
 module RailsConnector
   module CmsAccessible
+    protected
+
     # changed to check live and read permissions
     def ensure_object_is_permitted
       unless Fiona7::AccessPermissionCheck.new(@obj, request.env, current_user, rsession && rsession.user? && rsession.user).read_permitted?
@@ -12,5 +16,28 @@ module RailsConnector
       end
       return true
     end
+
+    # allow unreleased objects in editing mode
+    def ensure_object_is_active
+      return true if Fiona7::EditingEnvCheck.new(request.env).check?
+
+      unless @obj.active?
+        @valid_from = @obj.valid_from
+        @valid_until = @obj.valid_until
+        @obj = nil
+        render_obj_error(410, "gone")
+        return false
+      end
+      return true
+    end
+
+    include Fiona7::InEditableView
+
+    def self.included(base)
+      base.__send__(:helper_method, :is_permitted)
+      base.__send__(:helper_method, :scrivito_in_editable_view?)
+      base.__send__(:helper_method, :fiona7_in_editable_view?)
+    end
+
   end
 end

data/lib/fiona7/in_editable_view.rb

@@ -0,0 +1,15 @@
+module Fiona7
+  module InEditableView
+    def editing_context
+      Scrivito::EditingContextMiddleware.from_request(request)
+    end
+
+    def scrivito_in_editable_view?
+      editing_context.editable_display_mode?
+    end
+
+    def fiona7_in_editable_view?
+      scrivito_in_editable_view?
+    end
+  end
+end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.71.0.4"
+  VERSION = "0.71.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.71.0.4
+  version: 0.71.0.6
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-02 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.15.0.beta1
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0.beta1
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -182,9 +182,11 @@ files:
 - lib/fiona7/controllers/rest_api/blob_controller.rb
 - lib/fiona7/controllers/rest_api/obj_controller.rb
 - lib/fiona7/controllers/rest_api/workspace_controller.rb
+- lib/fiona7/editing_env_check.rb
 - lib/fiona7/engine.rb
 - lib/fiona7/fiona_connector_patches/basic_obj.rb
 - lib/fiona7/fiona_connector_patches/cms_accessible.rb
+- lib/fiona7/in_editable_view.rb
 - lib/fiona7/initializer.rb
 - lib/fiona7/json/obj_decorator.rb
 - lib/fiona7/json/reverse_obj_decorator.rb