enjoy_cms 0.3.2.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 354d416d79c06e6aa4f9c6d253612da52463bb6e
-  data.tar.gz: 7043ba2b10c631495778dcd34c393af32591ef30
+  metadata.gz: 8a343ff214ab5a895ad91cf3eb897a3692420bef
+  data.tar.gz: e0d4ebd8b92e5182325c8dc2c0373c8517f8dfc3
 SHA512:
-  metadata.gz: ec5259f872d9eca07687544b85bf60ed5eceb53a0afc98b530f8c94d6978d64fdddf909420eb0c903b81b57bdffc628455bdc37d4ac063fab6cc3899889a5898
-  data.tar.gz: 01b88b44db165280794b8fb991a382df8df0718ac067ddc76a11ffb92d5cb270ac04b6c4655f170232454098c468d699733cbe617d9bb55f58c07cda93b8af5e
+  metadata.gz: 9f444d9a1b1e6c99a0de9d94e6d826ceaa73d48ab658a22dc8b17d2e23a9895a690353fa6c8a36e958433c22f294177d3ad31198f7943b34588fe341e829dd8e
+  data.tar.gz: f53e6b513f7a9004ddda3fcbda789827ed922f67b1da1cc39e1083daf282986d69dbad1a92c5ebd2abdf00dce77ee73771d3c7e5621dc4a83667fc04bc6c9073

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.2.1)
+    enjoy_cms (0.3.3)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -183,7 +183,7 @@ GEM
       mongoid (>= 3.0)
       rails (>= 3.0)
       rails_admin (>= 0.5)
-    rails_admin_nested_set (0.4.5)
+    rails_admin_nested_set (0.5.0)
       rails_admin
     rails_admin_settings (1.1.3)
     rails_admin_sort_embedded (0.1.4)
@@ -220,7 +220,7 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.3)
+    sprockets-rails (3.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

data/app/helpers/enjoy/gzip_helper.rb

@@ -1,7 +1,7 @@
 module Enjoy::GzipHelper
   def gzip_javascript_include_tag(*sources)
     # Grab the asset html include tag
-    tag = javascript_include_tag *sources
+    tag = javascript_include_tag(*sources)
 
     # If we are in production and the requesting client accepts gzip encoding, swap for the gzip asset
     if Rails.env.production? && request.accept_encoding =~ /gzip/i
@@ -14,7 +14,7 @@ module Enjoy::GzipHelper
 
   def gzip_stylesheet_link_tag(*sources)
     # Grab the asset html include tag
-    tag = stylesheet_link_tag *sources
+    tag = stylesheet_link_tag(*sources)
 
     # If we are in production and the requesting client accepts gzip encoding, swap for the gzip asset
     if Rails.env.production? && request.accept_encoding =~ /gzip/i

data/app/models/concerns/enjoy/hash_field.rb

@@ -0,0 +1,36 @@
+if Enjoy.mongoid?
+  module Enjoy::HashField
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def enjoy_cms_hash_field(name, opts = {})
+        field "#{name}_hash", opts
+
+        class_eval <<-EVAL
+          def #{name}_str=(val)
+            begin
+              self.#{name}_hash = JSON.parse(val)
+            rescue
+              self[:#{name}_str] = val
+            end
+          end
+          def #{name}_str
+            self[:#{name}_str] ||= self.#{name}.to_json
+          end
+          def #{name}
+            self.#{name}_hash
+          end
+
+          validate do
+            if self.#{name}_str != self.#{name}.to_json
+              self.errors.add(:#{name}, "Неверный формат данных")
+            else
+              self.remove_attribute :#{name}_str
+            end
+            true
+          end
+        EVAL
+      end
+    end
+  end
+end

data/app/models/concerns/enjoy/mappable.rb

@@ -4,7 +4,7 @@ module Enjoy::Mappable
   included do
 
     if Enjoy.mongoid?
-      include Geocoder::Model::Mongoid
+      include ::Geocoder::Model::Mongoid
       field :coordinates, type: Array
       field :address, type: String
 

data/app/views/layouts/application.html.slim

@@ -8,10 +8,10 @@ html lang="ru"
     = csrf_meta_tags
     = render partial: "blocks/favicon"
     
-    = stylesheet_link_tag "application", media: "all", async: true
-    = javascript_include_tag "application", async: true
+    = stylesheet_link_tag "application", media: "all", async: Rails.env == "production"
+    = javascript_include_tag "application", async: Rails.env == "production"
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: true
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: Rails.env == "production"
       
   body
     #root

data/app/views/rails_admin/main/_enjoy_hash.html.slim

@@ -0,0 +1 @@
+= form.text_area field.string_method, rows: 10, cols: 80, class: 'form-control'

data/lib/enjoy/admin/contact_message.rb

@@ -21,17 +21,8 @@ module Enjoy
             end
           end
 
-          fields.each_pair do |name, type|
-            if type.nil?
-              field name
-            else
-              if type.is_a?(Array)
-                field name, type[0], &type[1]
-              else
-                field name, type
-              end
-            end
-          end
+
+          Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           if block_given?
             yield self

data/lib/enjoy/admin/embedded_element.rb

@@ -7,17 +7,7 @@ module Enjoy
           field :enabled, :toggle
           field :name, :string
 
-          fields.each_pair do |name, type|
-            if type.nil?
-              field name
-            else
-              if type.is_a?(Array)
-                field name, type[0], &type[1]
-              else
-                field name, type
-              end
-            end
-          end
+          Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           if block_given?
             yield self

data/lib/enjoy/admin/embedded_gallery_image.rb

@@ -6,7 +6,25 @@ module Enjoy
           jcrop_options :image_jcrop_options
         end
 
-        fields.reverse_merge!({image: [:jcrop, jcrop_proc]})
+        if fields
+          if fields.is_a?(Hash)
+            fields.reverse_merge!({image: [:jcrop, jcrop_proc]})
+          else
+            finded = false
+            fields.each { |g|
+              finded = !!g[:fields][:image] unless finded
+            }
+            unless finded
+              fields << {
+                name: :image,
+                fields: {
+                  image: [:jcrop, jcrop_proc]
+                }
+              }
+            end
+          end
+        end
+        
         if block_given?
           Enjoy::Admin::EmbeddedElement.config(nil, fields) do |config|
             yield config

data/lib/enjoy/admin/gallery.rb

@@ -27,17 +27,7 @@ module Enjoy
             jcrop_options :image_jcrop_options
           end
 
-          fields.each_pair do |name, type|
-            if type.nil?
-              field name
-            else
-              if type.is_a?(Array)
-                field name, type[0], &type[1]
-              else
-                field name, type
-              end
-            end
-          end
+          Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           if block_given?
             yield self

data/lib/enjoy/admin/gallery_image.rb

@@ -12,14 +12,8 @@ module Enjoy
           field :image, :jcrop do
             jcrop_options :image_jcrop_options
           end
-          
-          fields.each_pair do |name, type|
-            if type.nil?
-              field name
-            else
-              field name, type
-            end
-          end
+
+          Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           if block_given?
             yield self

data/lib/enjoy/admin/menu.rb

@@ -9,17 +9,7 @@ module Enjoy
           field :text_slug
           field :name
 
-          fields.each_pair do |name, type|
-            if type.nil?
-              field name
-            else
-              if type.is_a?(Array)
-                field name, type[0], &type[1]
-              else
-                field name, type
-              end
-            end
-          end
+          Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           if block_given?
             yield self

data/lib/enjoy/admin/news.rb

@@ -51,17 +51,8 @@ module Enjoy
               # field :content_html, :ck_editor
               # field :content_clear, :toggle
             end
-            fields.each_pair do |name, type|
-              if type.nil?
-                field name
-              else
-                if type.is_a?(Array)
-                  field name, type[0], &type[1]
-                else
-                  field name, type
-                end
-              end
-            end
+
+            Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
             group :seo do
               active false

data/lib/enjoy/admin/page.rb

@@ -47,17 +47,9 @@ module Enjoy
               end
               field :text_slug
             end
-            fields.each_pair do |name, type|
-              if type.nil?
-                field name
-              else
-                if type.is_a?(Array)
-                  field name, type[0], &type[1]
-                else
-                  field name, type
-                end
-              end
-            end
+
+            Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
+            
             group :seo do
               active false
               field :seo do

data/lib/enjoy/admin/page_block.rb

@@ -14,17 +14,7 @@ module Enjoy
           # field :content_html, :ck_editor
           # field :content_clear, :toggle
 
-          fields.each_pair do |name, type|
-            if type.nil?
-              field name
-            else
-              if type.is_a?(Array)
-                field name, type[0], &type[1]
-              else
-                field name, type
-              end
-            end
-          end
+          Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           # field :blocksets do
           #   read_only true

data/lib/enjoy/admin/page_blockset.rb

@@ -11,17 +11,7 @@ module Enjoy
 
           field :blocks
 
-          fields.each_pair do |name, type|
-            if type.nil?
-              field name
-            else
-              if type.is_a?(Array)
-                field name, type[0], &type[1]
-              else
-                field name, type
-              end
-            end
-          end
+          Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           # field :blocks do
           #   read_only true

data/lib/enjoy/admin/seo.rb

@@ -19,17 +19,7 @@ module Enjoy
             jcrop_options :og_image_jcrop_options
           end
 
-          fields.each_pair do |name, type|
-            if type.nil?
-              field name
-            else
-              if type.is_a?(Array)
-                field name, type[0], &type[1]
-              else
-                field name, type
-              end
-            end
-          end
+          Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           if block_given?
             yield self

data/lib/enjoy/admin/sitemap_data.rb

@@ -17,17 +17,7 @@ module Enjoy
           end
           field :sitemap_priority
 
-          fields.each_pair do |name, type|
-            if type.nil?
-              field name
-            else
-              if type.is_a?(Array)
-                field name, type[0], &type[1]
-              else
-                field name, type
-              end
-            end
-          end
+          Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           if block_given?
             yield self

data/lib/enjoy/configuration.rb

@@ -28,8 +28,6 @@ module Enjoy
     attr_accessor :contacts_message_required
     attr_accessor :contacts_captcha_error_message
 
-    attr_accessor :separate_seo_table
-
     attr_accessor :localize
 
     attr_accessor :recreate_contact_message_action
@@ -61,8 +59,6 @@ module Enjoy
 
       @localize = false
 
-      @separate_seo_table = false
-
       @routes_config = {
         use_contacts_path: true,
         use_search_path: true,

data/lib/enjoy/rails_admin_enjoy_hash.rb

@@ -0,0 +1,25 @@
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class EnjoyHash < RailsAdmin::Config::Fields::Types::Text
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types::register(self)
+          include RailsAdmin::Engine.routes.url_helpers
+
+          register_instance_option :string_method do
+            "#{name}_str"
+          end
+
+          register_instance_option :allowed_methods do
+            [string_method]
+          end
+
+          register_instance_option :partial do
+            :enjoy_hash
+          end
+        end
+      end
+    end
+  end
+end

data/lib/enjoy/rails_admin_group_patch.rb

@@ -0,0 +1,38 @@
+module Enjoy::RailsAdminGroupPatch
+  class << self
+    def enjoy_cms_group(config, fields = {})
+      return unless fields
+
+      if fields.is_a?(Array)
+        fields.each do |_group|
+          config.group _group[:name] do
+            active (_group[:active] || false)
+            _group[:fields].each_pair do |name, type|
+              if type.nil?
+                field name
+              else
+                if type.is_a?(Array)
+                  field name, type[0], &type[1]
+                else
+                  field name, type
+                end
+              end
+            end
+          end
+        end
+      else
+        fields.each_pair do |name, type|
+          if type.nil?
+            config.field name
+          else
+            if type.is_a?(Array)
+              config.field name, type[0], &type[1]
+            else
+              config.field name, type
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.2.1"
+  VERSION = "0.3.3"
 end

data/lib/enjoy_cms.rb

@@ -9,6 +9,8 @@ require 'devise'
 require 'simple_form'
 require 'enjoy/simple_form_patch'
 
+require 'geocoder'
+
 require 'glebtv-simple_captcha'
 require 'validates_email_format_of'
 require 'smart_excerpt'
@@ -35,6 +37,8 @@ require 'enjoy/elastic_search'
 require 'enjoy/model'
 require 'enjoy/rails_admin_menu'
 require 'enjoy/rails_admin_enjoy_html'
+require 'enjoy/rails_admin_enjoy_hash'
+require 'enjoy/rails_admin_group_patch'
 require 'enjoy/engine'
 require 'enjoy/controller'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.2.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -448,6 +448,7 @@ files:
 - app/models/concerns/enjoy/decorators/sitemap_data.rb
 - app/models/concerns/enjoy/enableable.rb
 - app/models/concerns/enjoy/geocodeable.rb
+- app/models/concerns/enjoy/hash_field.rb
 - app/models/concerns/enjoy/html_field.rb
 - app/models/concerns/enjoy/mappable.rb
 - app/models/concerns/enjoy/model_localizeable.rb
@@ -492,6 +493,7 @@ files:
 - app/views/errors/error_500.html.slim
 - app/views/layouts/application.html.slim
 - app/views/rails_admin/main/_check_boxes.html.slim
+- app/views/rails_admin/main/_enjoy_hash.html.slim
 - app/views/rails_admin/main/_enjoy_html.html.slim
 - app/views/rails_admin/main/_enum_check_boxes.html.slim
 - app/views/rails_admin/main/_enum_radio_buttons.html.slim
@@ -572,7 +574,9 @@ files:
 - lib/enjoy/models/page_blockset.rb
 - lib/enjoy/models/seo.rb
 - lib/enjoy/models/sitemap_data.rb
+- lib/enjoy/rails_admin_enjoy_hash.rb
 - lib/enjoy/rails_admin_enjoy_html.rb
+- lib/enjoy/rails_admin_group_patch.rb
 - lib/enjoy/rails_admin_menu.rb
 - lib/enjoy/simple_form_patch.rb
 - lib/enjoy/tasks.rb