ack_rocket_cms 0.7.4.1 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb751cd827d9540b4607b9541a55463389644be3
-  data.tar.gz: 9951979bcb4420849d5c191ff4a5902da153a603
+  metadata.gz: 557908fc1b5dd12ceb8c379fd207afec464532e9
+  data.tar.gz: cccd441d5f529a2665214556282d0e36f4c56578
 SHA512:
-  metadata.gz: c4737b9ace9b011bb6fae56bfc62731dd386331ab7c8747d30041f1df9fd2bf346e3319c2eeca8815f0dc27c947eb3383df87a3122f4404ced57aa9c5af55f98
-  data.tar.gz: 7112e4a686cf41efc081eb2d13fbe73f39a514e4a00aa001ac97c93eb0a1c2d2d7cf9cacfe0713767c2a53d691c41c9d9c425f9ec50273cdf443a28823939790
+  metadata.gz: 6253ead7989b587f991c532c522b3fe5fe9f7a02f3a635d328b5dba330bfc379252db2b61e4181498fef586e6ce7475f8f64f322b15b4c6997a6458a1a61050d
+  data.tar.gz: b96eb825f88427b488d991079db2e1653e32e1e0d632e960411410e2bb1b4b9ca8f9151b9a42b2f46690e55f1ee1129c8be8d898f858631d53d34e697366121b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.4.1)
+    ack_rocket_cms (0.7.5)
       addressable
       ckeditor
       coffee-rails

data/app/models/embedded_element.rb

@@ -0,0 +1,13 @@
+if RocketCMS.mongoid?
+  class EmbeddedElement
+    include RocketCMS::Models::EmbeddedElement
+    RocketCMS.apply_patches self
+
+    # use it in inherited model
+    #rails_admin &RocketCMS.embedded_image_config
+
+    # use it in rails_admin in parent model for sort
+    # sort_embedded({fields: [:embedded_field_1, :embedded_field_2...]})
+    # or u need to override rails_admin in inherited model to add sort field
+  end
+end

data/app/models/embedded_gallery_image.rb

@@ -1,5 +1,5 @@
 if RocketCMS.mongoid?
-  class EmbeddedGalleryImage
+  class EmbeddedGalleryImage < EmbeddedElement
     include RocketCMS::Models::EmbeddedGalleryImage
     RocketCMS.apply_patches self
 

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

@@ -63,7 +63,7 @@ RailsAdmin.config do |config|
   config.excluded_models = [
       'RailsAdmin::CustomShowInApp', 'HistoryTracker',
       'Ckeditor::Asset', 'Ckeditor::AttachmentFile', 'Ckeditor::Picture',
-      'EmbeddedGalleryImage'
+      'EmbeddedGalleryImage', 'EmbeddedElement'
   ]
 end
 

data/lib/rocket_cms/admin.rb

@@ -74,7 +74,8 @@ module RocketCMS
         end
         RocketCMS.only_patches self, [:show, :export]
         nested_set({
-          max_depth: RocketCMS.configuration.menu_max_depth
+          max_depth: RocketCMS.configuration.menu_max_depth,
+          scopes: []
         })
       }
     end
@@ -164,13 +165,28 @@ module RocketCMS
 
 
 
-    def embedded_image_config
+    def embedded_element_config(navigation_label = I18n.t('rs.cms'), fields = {})
       Proc.new {
+        navigation_label(navigation_label) unless navigation_label.nil?
         field :enabled, :toggle
         field :name, :string
-        field :image
+        fields.each_pair do |name, type|
+          if type.nil?
+            field name
+          else
+            field name, type
+          end
+        end
       }
+    end
 
+    def embedded_image_config
+      RocketCMS.embedded_element_config(
+          nil,
+          {
+              image: nil
+          }
+      )
     end
 
     def gallery_config

data/lib/rocket_cms/models/embedded_element.rb

@@ -0,0 +1,11 @@
+module RocketCMS
+  module Models
+    module EmbeddedElement
+      extend ActiveSupport::Concern
+      include RocketCMS::Model
+      include Enableable
+      include Sortable
+      include RocketCMS.orm_specific('EmbeddedElement')
+    end
+  end
+end

data/lib/rocket_cms/models/mongoid/embedded_element.rb

@@ -0,0 +1,13 @@
+module RocketCMS
+  module Models
+    module Mongoid
+      module EmbeddedElement
+        extend ActiveSupport::Concern
+
+        included do
+          field :name, type: String, localize: RocketCMS.configuration.localize
+        end
+      end
+    end
+  end
+end

data/lib/rocket_cms/models/mongoid/embedded_gallery_image.rb

@@ -8,7 +8,7 @@ module RocketCMS
         included do
           #embedded_in :model # need to override
 
-          field :name, type: String, localize: RocketCMS.configuration.localize
+          include EmbeddedElement
 
           has_mongoid_attached_file :image # need to override
           validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.4.1"
+  VERSION = "0.7.5"
 end

data/lib/rocket_cms.rb

@@ -61,6 +61,8 @@ module RocketCMS
     autoload :News, 'rocket_cms/models/news'
     autoload :ContactMessage, 'rocket_cms/models/contact_message'
 
+    autoload :EmbeddedElement,      'rocket_cms/models/embedded_element'
+
     autoload :EmbeddedGalleryImage, 'rocket_cms/models/embedded_gallery_image'
     autoload :GalleryImage,         'rocket_cms/models/gallery_image'
     autoload :Gallery,              'rocket_cms/models/gallery'
@@ -71,6 +73,8 @@ module RocketCMS
       autoload :News, 'rocket_cms/models/mongoid/news'
       autoload :ContactMessage, 'rocket_cms/models/mongoid/contact_message'
 
+      autoload :EmbeddedElement,      'rocket_cms/models/mongoid/embedded_element'
+
       autoload :EmbeddedGalleryImage, 'rocket_cms/models/mongoid/embedded_gallery_image'
       autoload :GalleryImage,         'rocket_cms/models/mongoid/gallery_image'
       autoload :Gallery,              'rocket_cms/models/mongoid/gallery'

data/template.rb

@@ -592,6 +592,11 @@ sudo /etc/init.d/god_bootup_#{app_name.downcase}
 TEXT
 end
 
+inject_into_file 'config/initializers/assets.rb', before: /\z/ do <<-TEXT
+Rails.application.config.assets.precompile += %w( ckeditor/* )
+TEXT
+end
+
 
 
 if mongoid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.4.1
+  version: 0.7.5
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -412,6 +412,7 @@ files:
 - app/models/concerns/sort_field.rb
 - app/models/concerns/sortable.rb
 - app/models/contact_message.rb
+- app/models/embedded_element.rb
 - app/models/embedded_gallery_image.rb
 - app/models/gallery.rb
 - app/models/gallery_image.rb
@@ -493,11 +494,13 @@ files:
 - lib/rocket_cms/models/active_record/news.rb
 - lib/rocket_cms/models/active_record/page.rb
 - lib/rocket_cms/models/contact_message.rb
+- lib/rocket_cms/models/embedded_element.rb
 - lib/rocket_cms/models/embedded_gallery_image.rb
 - lib/rocket_cms/models/gallery.rb
 - lib/rocket_cms/models/gallery_image.rb
 - lib/rocket_cms/models/menu.rb
 - lib/rocket_cms/models/mongoid/contact_message.rb
+- lib/rocket_cms/models/mongoid/embedded_element.rb
 - lib/rocket_cms/models/mongoid/embedded_gallery_image.rb
 - lib/rocket_cms/models/mongoid/gallery.rb
 - lib/rocket_cms/models/mongoid/gallery_image.rb