enjoy_cms_pages 0.4.0.beta3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c30ae742f626fdcc649fc07499b27d09f201bada
-  data.tar.gz: ff2cbc54810ff1ad186158ae2a5e2c1675e9cfff
+  metadata.gz: fe01ec663658abf68e20b4f8b69e0e380e1a4709
+  data.tar.gz: 738f1cbfc8942ae093c2b76fe4eb3f16a213d089
 SHA512:
-  metadata.gz: 99a0a69bb49147c94899f0a3a262a6d81ca656e0a9fd7ca50f02d959d351cf7622dc452817cab6bb367f0f29a3174e7b9f73b42206f7b2efd7e79f1826bbebfc
-  data.tar.gz: 6962d982df0dacadbb4cdfbb01e182ca41727e853bded0f4a49d43c9363b0154f38f82e27a4727ee945d63bfd66aa5215b846e2c25303b3b68cb99a4617a759e
+  metadata.gz: 6f80df982eeaf1a1058dfaae73fecaa26c4f336c99c92d38d7182ed4eab2857551326f024c033d59c0c6b3bd3efa1aec6eefe031c41a388f16a2a803830824a4
+  data.tar.gz: d8b6a6c4c93f33da3bf1c30267e1fa8e0f81bcc009926843d048463c84b410d35fbf1208594e6ace838aa727b3b96a9c844f4c3893c88b9ceb33854f8607f40d

data/app/controllers/concerns/enjoy/pages/blocksetable.rb

@@ -32,9 +32,15 @@ module Enjoy::Pages::Blocksetable
   def render_blockset(view, type)
     ret = []
     begin
-      blocks = blockset_get_blocks(type)
+      blockset = get_blockset(type)
+      blocks = blockset_get_blocks_for_render(blockset)
       blocks.each do |block|
-        ret << block.render_or_content_html(view)
+        ret << block.render_or_content_html(view) do |html|
+          after_render_blockset_block block, html
+        end
+      end
+      ret = blockset.render(view, ret.join.html_safe) do |html|
+        after_render_blockset blockset, html
       end
     rescue Exception => exception
       Rails.logger.error exception.message
@@ -44,14 +50,31 @@ module Enjoy::Pages::Blocksetable
       capture_exception(exception) if respond_to?(:capture_exception)
       # ret << blocks || []
     end
-    ret.join.html_safe
+    ret.is_a?(Array) ? ret.join.html_safe : ret
+  end
+
+  def after_render_blockset_block(block, html)
+    html
+  end
+
+  def after_render_blockset(blockset, html)
+    html
+  end
+
+  def get_blockset(type)
+    type.is_a?(Enjoy::Pages::Blockset) ? type : blockset_class.find(type.to_s)
   end
 
   def blockset_get_blocks(type)
-    blockset = blockset_class.find(type.to_s)
+    blockset = get_blockset type
     blockset.blocks.enabled.show_in_menu.sorted.to_a if blockset
   end
 
+  def blockset_get_blocks_for_render(type)
+    blockset = get_blockset type
+    blockset.blocks.enabled.sorted.to_a if blockset
+  end
+
   def blockset_class_name
     "Enjoy::Pages::Blockset"
   end

data/app/models/concerns/enjoy/pages/connectable.rb

@@ -22,7 +22,7 @@ module Enjoy::Pages::Connectable
         _name_attr = Enjoy::Pages.config.localize ? "name_translations" : "name"
         class_eval <<-EVAL
           after_create do
-            if self.enjoy_connectable_autocreate_page
+            if [true, 1, "1", "true", "t"].include?(self.enjoy_connectable_autocreate_page)
               _p = #{class_name}.new
               _p.#{_name_attr} = self.#{_name_attr}
               _p.connectable = self

data/enjoy_cms_pages.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'enjoy_cms', "~> 0.4.0.beta3"
+  spec.add_dependency 'enjoy_cms', "~> 0.4.0"
 
   spec.add_dependency 'simple-navigation'
 end

data/lib/enjoy/pages/admin/block.rb

@@ -37,6 +37,11 @@ module Enjoy::Pages
             field :wrapper_tag, :string
             field :wrapper_class, :string
             field :wrapper_id, :string
+            field :wrapper_attributes, :text do
+              formatted_value do
+                bindings[:object] and bindings[:object].wrapper_attributes ? bindings[:object].wrapper_attributes.to_json : "{}"
+              end
+            end
           end
 
           # field :content_html, :ck_editor

data/lib/enjoy/pages/admin/blockset.rb

@@ -15,6 +15,19 @@ module Enjoy::Pages
             searchable true
           end
 
+          group :wrapper do
+            active false
+            field :use_wrapper, :toggle
+            field :wrapper_tag, :string
+            field :wrapper_class, :string
+            field :wrapper_id, :string
+            field :wrapper_attributes, :text do
+              formatted_value do
+                bindings[:object] and bindings[:object].wrapper_attributes ? bindings[:object].wrapper_attributes.to_json : "{}"
+              end
+            end
+          end
+
           group :blocks do
             active false
             field :blocks do

data/lib/enjoy/pages/controllers/pages.rb

@@ -8,6 +8,7 @@ module Enjoy::Pages
             @seo_page = model.enabled.find(params[:id] || params[:slug])
           end
         end
+        after_initialize
         if @seo_page.nil?
           render_404
           return true
@@ -18,9 +19,13 @@ module Enjoy::Pages
         end
       end
 
+      private
       def model
         Enjoy::Pages::Page
       end
+
+      def after_initialize
+      end
     end
   end
 end

data/lib/enjoy/pages/models/block.rb

@@ -39,7 +39,13 @@ module Enjoy::Pages
         else
           ret = self.content_html.html_safe
         end
-        ret = content_tag wrapper_tag, ret, class: wrapper_class, id: wrapper_id if use_wrapper
+        if use_wrapper
+          _attrs = {
+            class: wrapper_class,
+            id: wrapper_id
+          }.merge(wrapper_attributes)
+          ret = view.content_tag wrapper_tag, ret, _attrs
+        end
         ret = yield ret if block_given?
         return ret
       end
@@ -67,7 +73,7 @@ module Enjoy::Pages
       end
 
       def nav_options
-        nav_options_default.merge(nav_options_additions)
+        nav_options_default.deep_merge(nav_options_additions)
       end
 
       def nav_options_default
@@ -75,7 +81,8 @@ module Enjoy::Pages
           highlights_on: false,
           link_html: {
             data: {
-              pageblock_selector: self.pageblock_selector
+              pageblock_selector: self.pageblock_selector,
+              history_name: self.name
             }
           }
         }
@@ -84,6 +91,23 @@ module Enjoy::Pages
       def nav_options_additions
         {}
       end
+
+      def wrapper_attributes=(val)
+        if val.is_a? (String)
+          begin
+            begin
+              self[:wrapper_attributes] = JSON.parse(val)
+            rescue
+              self[:wrapper_attributes] = YAML.load(val)
+            end
+          rescue
+          end
+        elsif val.is_a?(Hash)
+          self[:wrapper_attributes] = val
+        else
+          self[:wrapper_attributes] = wrapper_attributes
+        end
+      end
     end
   end
 end

data/lib/enjoy/pages/models/blockset.rb

@@ -12,6 +12,38 @@ module Enjoy::Pages
         manual_slug :name
       end
 
+
+      def render(view, content = "")
+        ret = content
+        if use_wrapper
+          _attrs = {
+            class: wrapper_class,
+            id: wrapper_id
+          }.merge(wrapper_attributes)
+          ret = view.content_tag wrapper_tag, ret, _attrs
+        end
+        ret = yield ret if block_given?
+        return ret
+      end
+
+      # def wrapper_attributes=(val)
+      #   if val.is_a? (String)
+      #     begin
+      #       begin
+      #         self[:wrapper_attributes] = JSON.parse(val)
+      #       rescue
+      #         self[:wrapper_attributes] = YAML.load(val)
+      #       end
+      #     rescue
+      #     end
+      #   elsif val.is_a?(Hash)
+      #     self[:wrapper_attributes] = val
+      #   else
+      #     self[:wrapper_attributes] = wrapper_attributes
+      #   end
+      # end
+
+
     end
   end
 end

data/lib/enjoy/pages/models/mongoid/block.rb

@@ -20,6 +20,7 @@ module Enjoy::Pages
           field :wrapper_tag, type: String, default: ""
           field :wrapper_class, type: String, default: ""
           field :wrapper_id, type: String, default: ""
+          field :wrapper_attributes, type: Hash, default: {}
 
           field :menu_link_content, type: String
           field :show_in_menu, type: Boolean, default: true

data/lib/enjoy/pages/models/mongoid/blockset.rb

@@ -9,6 +9,12 @@ module Enjoy::Pages
 
           embeds_many :blocks, inverse_of: :blockset, class_name: "Enjoy::Pages::Block"
           accepts_nested_attributes_for :blocks, allow_destroy: true
+
+          field :use_wrapper, type: Boolean, default: false
+          field :wrapper_tag, type: String, default: ""
+          field :wrapper_class, type: String, default: ""
+          field :wrapper_id, type: String, default: ""
+          field :wrapper_attributes, type: Hash, default: {}
         end
       end
     end

data/lib/enjoy/pages/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Pages
-    VERSION = "0.4.0.beta3"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_pages
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta3
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: simple-navigation
   requirement: !ruby/object:Gem::Requirement
@@ -152,9 +152,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1