enjoy_cms 0.3.2 → 0.3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33a4e7ad3766cc568450aa9727d67007767e578
-  data.tar.gz: 5b1163592a2342e6909390363095a0cd94766e8a
+  metadata.gz: 354d416d79c06e6aa4f9c6d253612da52463bb6e
+  data.tar.gz: 7043ba2b10c631495778dcd34c393af32591ef30
 SHA512:
-  metadata.gz: 716b95fed34f32026ebe624807e5fca67c89e94dbc58fe4cf46ee1f29cc93576f0cfb63879989216e240073502605df41f2095baeb06aee772747471bda3593a
-  data.tar.gz: 2c89eea1c204394f1bc0321e830bde1936bca3e274fae3c31145799d2deed2b7441641ab490e45fb89fa46a63c948930552ead100ebbee82a3b2bd41b5cb306a
+  metadata.gz: ec5259f872d9eca07687544b85bf60ed5eceb53a0afc98b530f8c94d6978d64fdddf909420eb0c903b81b57bdffc628455bdc37d4ac063fab6cc3899889a5898
+  data.tar.gz: 01b88b44db165280794b8fb991a382df8df0718ac067ddc76a11ffb92d5cb270ac04b6c4655f170232454098c468d699733cbe617d9bb55f58c07cda93b8af5e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.2)
+    enjoy_cms (0.3.2.1)
       ack_rails_admin_jcrop
       addressable
       ckeditor

data/config/initializers/embedded_findable.rb

@@ -0,0 +1,57 @@
+if defined?(Mongoid)
+
+  module Mongoid
+
+    # Helps to override find method in an embedded document.
+    # Usage :
+    #   - add to your model "include Mongoid::EmbeddedFindable"
+    #   - override find method with:
+    #     def self.find(id)
+    #       find_through(Book, 'chapter', id)
+    #     end
+    module EmbeddedFindable
+
+      extend ActiveSupport::Concern
+
+      included do
+
+        # Search an embedded document by id.
+        #
+        # Document is stored within embedding_class collection, and can be accessed through provided relation.
+        # Also supports chained relationships (if the searched document is nested in several embedded documents)
+        #
+        # Example, with a chapter embedded in a book, the book being embedded in a library.
+        # use find_through(Library, "books", book_id) in Book class
+        # and find_through(Library, "books.chapters", chapter_id) in Chapter class
+        def self.find_through(embedding_class, relation, id = nil)
+          return nil if id.nil? || id.blank?
+
+          id = BSON::ObjectId.from_string(id) if id.is_a?(String)
+          relation = relation.to_s unless relation.is_a?(String)
+
+          relation_parts = relation.split('.')
+          parent = embedding_class.send(:all)
+
+          while relation_parts.length > 0
+            item = if parent.is_a?(Mongoid::Criteria) || parent.is_a?(Array)
+                     parent.where("#{relation_parts.join('.')}._id" => id).first
+                   else
+                     parent
+                   end
+            return nil if item.nil?
+            parent = item.send(relation_parts.shift)
+          end
+
+          if parent.is_a?(Mongoid::Criteria) || parent.is_a?(Array)
+            parent.where('_id' => id).first
+          else
+            parent
+          end
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/enjoy/admin/news.rb

@@ -45,7 +45,7 @@ module Enjoy
           end
 
           edit do
-            group :text do
+            group :content do
               active false
               field :content, :enjoy_html
               # field :content_html, :ck_editor

data/lib/enjoy/version.rb

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

data/lib/enjoy_cms.rb

@@ -17,6 +17,7 @@ require 'rails_admin'
 require 'rails_admin_nested_set'
 require 'rails_admin_toggleable'
 # require 'rails_admin_settings'
+require 'rails_admin_sort_embedded'
 
 require 'x-real-ip'
 

data/lib/generators/enjoy/templates/admin.erb

@@ -53,6 +53,12 @@ RailsAdmin.config do |config|
       end
     end
 
+    sort_embedded do
+      visible do
+        ['Enjoy::PageBlockset'].include? bindings[:abstract_model].model_name
+      end
+    end
+
     toggle
     toggle_menu  do
       visible do

data/template.rb

@@ -22,7 +22,7 @@ gem 'sass-rails'
 gem 'compass-rails'
 gem 'compass'
 
-#{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, '~> 0.3.1'
+#{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, '~> 0.3.2'
 
 gem 'devise'
 
@@ -111,67 +111,6 @@ end
 
 create_file 'extra/.gitkeep', ''
 
-if mongoid
-remove_file 'config/initializers/embedded_findable.rb'
-create_file 'config/initializers/embedded_findable.rb' do  <<-TEXT
-module Mongoid
-
-  # Helps to override find method in an embedded document.
-  # Usage :
-  #   - add to your model "include Mongoid::EmbeddedFindable"
-  #   - override find method with:
-  #     def self.find(id)
-  #       find_through(Book, 'chapter', id)
-  #     end
-  module EmbeddedFindable
-
-    extend ActiveSupport::Concern
-
-    included do
-
-      # Search an embedded document by id.
-      #
-      # Document is stored within embedding_class collection, and can be accessed through provided relation.
-      # Also supports chained relationships (if the searched document is nested in several embedded documents)
-      #
-      # Example, with a chapter embedded in a book, the book being embedded in a library.
-      # use find_through(Library, "books", book_id) in Book class
-      # and find_through(Library, "books.chapters", chapter_id) in Chapter class
-      def self.find_through(embedding_class, relation, id = nil)
-        return nil if id.nil? || id.blank?
-
-        id = BSON::ObjectId.from_string(id) if id.is_a?(String)
-        relation = relation.to_s unless relation.is_a?(String)
-
-        relation_parts = relation.split('.')
-        parent = embedding_class.send(:all)
-
-        while relation_parts.length > 0
-          item = if parent.is_a?(Mongoid::Criteria) || parent.is_a?(Array)
-                   parent.where("\#{relation_parts.join('.')}._id" => id).first
-                 else
-                   parent
-                 end
-          return nil if item.nil?
-          parent = item.send(relation_parts.shift)
-        end
-
-        if parent.is_a?(Mongoid::Criteria) || parent.is_a?(Array)
-          parent.where('_id' => id).first
-        else
-          parent
-        end
-      end
-
-    end
-
-  end
-
-end
-TEXT
-end
-end
-
 if mongoid
 remove_file 'config/initializers/cookies_serializer.rb'
 create_file 'config/initializers/cookies_serializer.rb' do  <<-TEXT
@@ -196,8 +135,8 @@ Rails.application.config.session_store :mongoid_store
   end
 end
 
-remove_file 'paperclip_optimizer.rb'
-create_file 'paperclip_optimizer.rb' do <<-TEXT
+remove_file 'config/initializers/paperclip_optimizer.rb'
+create_file 'config/initializers/paperclip_optimizer.rb' do <<-TEXT
 # Set global optimisation options for all Paperclip models
 
 # By default, image_optim enables all the compression binaries it supports and

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.2.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -502,6 +502,7 @@ files:
 - app/views/shared/_obj.html.slim
 - app/views/shared/_og.html.slim
 - app/views/simple_captcha/_simple_captcha.html.slim
+- config/initializers/embedded_findable.rb
 - config/initializers/simple_captcha.rb
 - config/locales/en.enjoy.yml
 - config/locales/en.enjoy_admin.yml