infopark_fiona7 1.1.0.0.4 → 1.1.0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e4faba12e3777d253526addb84018eccbd43d47
-  data.tar.gz: 3a977b389028604ec428e740d27817d8850c89fe
+  metadata.gz: 4907bd859a689f02a8bae66d243fe0a220c37f46
+  data.tar.gz: 0c4575f211bb94278ac1535e2eade5564bd541cf
 SHA512:
-  metadata.gz: fa45a12ba6bf41a71a95297a5068b578e90350515e593cce94c374b855094634a5cc35029bb6cbb727db333e5b544ed2e9fd4017be19560ee74f3b85460ef169
-  data.tar.gz: 838319f5d92587be802dda0b0a73275e3dfce799a8ebfe55fcf1a1daadf65a6371f031ce05c0fd8d818ede2ae30ccb995fb6b76702a5dc29c94666368e627827
+  metadata.gz: 58c06f55d0889cc2eb014db5ea3d753d89599b327be9bfa022cbd191305373062b7c378079d55c329f6b5229ffb33253fed35574b06a3b6d2c535a926f981306
+  data.tar.gz: b2c57e029a10d8495115556a4fcad8f54456e654a385d93116a841095281a50585be8d6a1821e708872652d5caa801a3c029d3e2f97631f1fa7ae103e0267112

data/lib/fiona7/engine.rb

@@ -32,6 +32,7 @@ require "fiona7/scrivito_patches/layout_tags"
 require "fiona7/scrivito_patches/log_subscriber"
 require "fiona7/scrivito_patches/link_parser"
 require "fiona7/scrivito_patches/migrator"
+require "fiona7/scrivito_patches/model_library"
 require "fiona7/scrivito_patches/obj_params_parser"
 require "fiona7/scrivito_patches/page_config"
 require "fiona7/scrivito_patches/preset_routes"

data/lib/fiona7/mode_switch/views.rb

@@ -13,11 +13,11 @@ module Fiona7
 
       protected
       def scrivito_sdk_path
-        Gem.loaded_specs['scrivito_sdk'].full_gem_path
+        Gem.loaded_specs['scrivito_sdk'].full_name
       end
 
       def fiona_connector_path
-        Gem.loaded_specs['infopark_fiona_connector'].full_gem_path
+        Gem.loaded_specs['infopark_fiona_connector'].full_name
       end
 
       def reorder_view_paths(first, second)

data/lib/fiona7/routing_monkey_patch.rb

@@ -5,9 +5,9 @@ module ActionDispatch
         raise ArgumentError, "Invalid route name: '#{name}'" unless name.blank? || name.to_s.match(/^[_a-z]\w*$/i)
 
         forbidden_paths = [
-          ::File.join(Gem.loaded_specs['scrivito_sdk'].full_gem_path, "config/routes.rb"),
-          ::File.join(Gem.loaded_specs['scrivito_sdk'].full_gem_path, "config/precedence_routes.rb"),
-          ::File.join(Gem.loaded_specs['infopark_fiona_connector'].full_gem_path, "config/cms_routes.rb")
+          ::File.join(Gem.loaded_specs['scrivito_sdk'].full_name, "config/routes.rb"),
+          ::File.join(Gem.loaded_specs['scrivito_sdk'].full_name, "config/precedence_routes.rb"),
+          ::File.join(Gem.loaded_specs['infopark_fiona_connector'].full_name, "config/cms_routes.rb")
         ]
 
         if caller.any? {|path| forbidden_paths.any? {|fp| path.include?(fp) } }

data/lib/fiona7/scrivito_patches/model_library.rb

@@ -0,0 +1,19 @@
+require "scrivito/model_library"
+
+module Scrivito
+  class ModelLibrary
+
+    private
+    # support for ShadowClasses
+    def load_model(class_name, base_class)
+      model_class = class_name.constantize
+      return model_class if model_class.ancestors.include?(base_class)
+
+      if Fiona7.mode == :legacy && model_class.respond_to?(:shadow_class)
+        model_class = model_class.shadow_class
+        model_class if model_class.ancestors.include?(base_class)
+      end
+    rescue NameError
+    end
+  end
+end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.1.0.0.4"
+  VERSION = "1.1.0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0.4
+  version: 1.1.0.0.5
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,7 @@ files:
 - lib/fiona7/scrivito_patches/link_parser.rb
 - lib/fiona7/scrivito_patches/log_subscriber.rb
 - lib/fiona7/scrivito_patches/migrator.rb
+- lib/fiona7/scrivito_patches/model_library.rb
 - lib/fiona7/scrivito_patches/obj_params_parser.rb
 - lib/fiona7/scrivito_patches/page_config.rb
 - lib/fiona7/scrivito_patches/preset_routes.rb