cmor_cms 0.0.42.pre → 0.0.43.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f0546f5a5685f505565098b2661619c9ebd7709e9f417afec3c59ce148c57f
-  data.tar.gz: 692e92872c9310bcb78619d4a9c2daf11ca479ec95bee3fce82393be4fefeea9
+  metadata.gz: 62378282011ac914e66b1b911b6a9e0af66dc39cc90e6f3781a9f60a91dc889e
+  data.tar.gz: 62766f7b594a93bfefa7e5a04fd48a60afd06da9cb1678f14e16e5ebd6464cbe
 SHA512:
-  metadata.gz: 70caf6861fb95e2443cc061457052fafc548429abd3959dfea37eb33128b88795a8daa998801504b711a36ddc2b023829bc870fe3471e78d59e4fef5f62ed080
-  data.tar.gz: ef85c25428f70e360cab41df214b30ba6267b2922af79c759a4f3f94253ad94d1b441cfa5d92b84fb0eebd66de137de6ff99925bd7244a38e2991429b3831921
+  metadata.gz: 1c78ab39e5da99a7c81b92e4274cf285c075e6d7f1f3724630084d4ce56d50ccdc1e53a229af27a29ba49a5aadd153e2cba71adfef1f66ca440557f3778f8547
+  data.tar.gz: fa57e4753ec0a31a7ae4647b7b1e198d1825a886cb445fd43068e3c626a935c493fa8825ccccb11b8f804ba8f581b8b94a2b7e1f9516a8e0acdf68de472b6f81

data/app/concerns/cmor/cms/navigation_item/properties_concern.rb~

@@ -0,0 +1,21 @@
+module Cmor::Cms::NavigationItem::PropertiesConcern
+  extend ActiveSupport::Concern
+
+  included do
+    serialize :properties, OpenStruct
+    delegate *Cmor::Cms::Configuration.navigation_item_properties, to: :li_attributes
+    delegate *Cmor::Cms::Configuration.navigation_item_properties.collect { |a| "#{a}=".to_sym }, to: :li_attributes
+  end
+
+  def highlights_on
+    properties.highlights_on ||= nil
+  end
+
+  delegate :highlights_on=, to: :properties
+
+  def li_attributes
+    properties.li_attributes ||= OpenStruct.new
+  end
+
+  delegate :li_attributes=, to: :properties
+end

data/app/models/cmor/cms/navigation_item.rb

@@ -1,6 +1,6 @@
 module Cmor::Cms
   class NavigationItem < ActiveRecord::Base
-    include Cmor::Cms::NavigationItem::PropertiesConcern
+    # include Cmor::Cms::NavigationItem::PropertiesConcern
 
     # associations
     belongs_to :navigation,
@@ -84,5 +84,29 @@ module Cmor::Cms
     def update_url_form_page
       self.url = build_url_from_page(page.locale, page.pathname, page.basename, page.home_page?)
     end
+    
+    module PropertiesConcern
+      extend ActiveSupport::Concern
+
+      included do
+        serialize :properties, OpenStruct
+        delegate *Cmor::Cms::Configuration.navigation_item_properties, to: :li_attributes
+        delegate *Cmor::Cms::Configuration.navigation_item_properties.collect { |a| "#{a}=".to_sym }, to: :li_attributes
+      end
+
+      def highlights_on
+        properties.highlights_on ||= nil
+      end
+
+      delegate :highlights_on=, to: :properties
+
+      def li_attributes
+        properties.li_attributes ||= OpenStruct.new
+      end
+
+      delegate :li_attributes=, to: :properties
+    end
+
+    include PropertiesConcern
   end
 end

data/lib/cmor/cms/action_view/template_patch.rb

@@ -12,7 +12,7 @@ module ActionView
             original_initialize(source, identifier, handler, details)
           end
         else
-          def initialize(source, identifier, handler, format: nil, variant: nil, locals: nil, virtual_path: nil, layout: layout)
+          def initialize(source, identifier, handler, format: nil, variant: nil, locals: nil, virtual_path: nil, layout: nil)
             @layout = layout
             original_initialize(source, identifier, handler, format: format, variant: variant, locals: locals, virtual_path: virtual_path)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.42.pre
+  version: 0.0.43.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.42.pre
+        version: 0.0.43.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.42.pre
+        version: 0.0.43.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.42.pre
+        version: 0.0.43.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.42.pre
+        version: 0.0.43.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -418,7 +418,7 @@ files:
 - app/assets/stylesheets/cmor/cms/application.css
 - app/assets/stylesheets/cmor/cms/application/keep.css
 - app/assets/stylesheets/cmor_cms.css
-- app/concerns/cmor/cms/navigation_item/properties_concern.rb
+- app/concerns/cmor/cms/navigation_item/properties_concern.rb~
 - app/controllers/cmor/cms/page_controller.rb
 - app/importers/cmor/cms/importers/navigation.rb
 - app/importers/cmor/cms/importers/navigation_item.rb

data/app/concerns/cmor/cms/navigation_item/properties_concern.rb

@@ -1,23 +0,0 @@
-module Cmor::Cms
-  module NavigationItem::PropertiesConcern
-    extend ActiveSupport::Concern
-
-    included do
-      serialize :properties, OpenStruct
-      delegate *Cmor::Cms::Configuration.navigation_item_properties, to: :li_attributes
-      delegate *Cmor::Cms::Configuration.navigation_item_properties.collect { |a| "#{a}=".to_sym }, to: :li_attributes
-    end
-
-    def highlights_on
-      properties.highlights_on ||= nil
-    end
-
-    delegate :highlights_on=, to: :properties
-
-    def li_attributes
-      properties.li_attributes ||= OpenStruct.new
-    end
-
-    delegate :li_attributes=, to: :properties
-  end
-end