ack_rocket_cms 0.7.2.4 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce2df31034d42e0b58755c489694203da0eb5639
-  data.tar.gz: 219d49e526e2453ff5ea1e9e0000d5b0988e21e3
+  metadata.gz: 0cc38c3d9b0add3ff8ce4705b457fbbe27c622c3
+  data.tar.gz: 5b4a80cce1c8603faa19171be9613bc8582f5342
 SHA512:
-  metadata.gz: 5f22e992c385bc334cb275f58064e946b33bb6b47e27b26d2e7fb382712cc69b19fed70aa68baa59ed96d38aabb77f4099994881ff51e9309a5b486b4064cd77
-  data.tar.gz: 6d33eeced920b6ea0d17556775ca83315e4eaa9f7bd88f8f10ebc8f7e0df3ea981d38c964e0b18b93e29e7fc3b74ce120096096786e653754d2dfb00f06bbe9e
+  metadata.gz: 07d9c27dd6f796317a2e4a3dd671bbc40bcd67f113f283c8db2e29f0530c07816c98f7411b230fc441d8f75f8bef80c07daa28e7e04e2842d676c22abcdf81e7
+  data.tar.gz: 512331b81ea64b126a25d6c6ebc41f86eee7ac2dc079d1e352b288fee9571c1a6fdba32a78b8790adf11afea284b490b46bbf1e0eaf97fa90a28b8cc4e1ac485

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.2.4)
+    ack_rocket_cms (0.7.3)
       addressable
       ckeditor
       coffee-rails
@@ -92,7 +92,7 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.3.0)
+    execjs (2.4.0)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     geocoder (1.2.7)
@@ -130,7 +130,7 @@ GEM
       bson (~> 2.2)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     nested_form (0.3.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
@@ -160,7 +160,7 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
     rails_admin (0.6.6)
       builder (~> 3.1)
@@ -224,7 +224,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
     stringex (2.5.2)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     turbolinks (2.5.3)
       coffee-rails

data/app/controllers/concerns/rs_errors.rb

@@ -46,7 +46,8 @@ module RsErrors
     capture_exception(exception) if defined?(Raven)
     begin
       if rails_admin_controller?
-        return render text: 'Внутренняя ошибка'
+        render text: 'Внутренняя ошибка', status: 500
+        return
       end
     rescue
     end

data/app/models/concerns/sort_field.rb

@@ -6,11 +6,14 @@ module SortField
       prefix = "#{prefix}_" unless prefix == ''
 
       if RocketCMS.mongoid?
-        field "#{prefix}sort".to_sym, type: Integer
-        scope "#{prefix}sorted".to_sym, -> { asc("#{prefix}sort".to_sym) }
+        field "#{prefix}order".to_sym, type: Integer
+        alias_method "#{prefix}sort", "#{prefix}order"
+        scope "#{prefix}ordered".to_sym,  -> { asc("#{prefix}order".to_sym) }
+        scope "#{prefix}sorted".to_sym,   -> { asc("#{prefix}order".to_sym) }
       end
       if RocketCMS.active_record?
-        scope "#{prefix}sorted".to_sym, -> { order("#{prefix}sort".to_sym => :asc) }
+        scope "#{prefix}ordered".to_sym,  -> { order("#{prefix}order".to_sym => :asc) }
+        scope "#{prefix}sorted".to_sym,   -> { order("#{prefix}order".to_sym => :asc) }
       end
     end
   end

data/app/models/embedded_gallery_image.rb

@@ -0,0 +1,13 @@
+if RocketCMS.mongoid?
+  class EmbeddedGalleryImage
+    include RocketCMS::Models::EmbeddedGalleryImage
+    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/gallery.rb

@@ -0,0 +1,8 @@
+if RocketCMS.mongoid?
+  class Gallery
+    include RocketCMS::Models::Gallery
+    RocketCMS.apply_patches self
+
+    rails_admin &RocketCMS.gallery_config
+  end
+end

data/app/models/gallery_image.rb

@@ -0,0 +1,8 @@
+if RocketCMS.mongoid?
+  class GalleryImage
+    include RocketCMS::Models::GalleryImage
+    RocketCMS.apply_patches self
+
+    rails_admin &RocketCMS.image_config
+  end
+end

data/app/views/shared/_obj.html.haml

@@ -5,11 +5,12 @@
     - if obj.content.blank?
       - unless @seo_page.nil?
         = raw @seo_page.page_content
-        = render 'shared/admin_link', obj: @seo_page
     - else
       = raw obj.content
-    - if !obj.nil? && (@seo_page.nil? || obj.id != @seo_page.id || obj.class.name != @seo_page.class.name)
+    - if !obj.nil?
       = render 'shared/admin_link', obj: obj
+    - if !@seo_page.nil? && (@seo_page.id != obj.id || @seo_page.class.name != obj.class.name)
+      = render 'shared/admin_link', obj: @seo_page
 
   - content_for :meta do
     = render 'shared/meta', obj: obj

data/config/locales/en.rs.yml

@@ -1,5 +1,6 @@
 en:
   rs:
+    gallery: "Gallery"
     cms: "CMS"
     menu: "Menu"
     settings: 'Settings'

data/config/locales/ru.models.yml

@@ -43,6 +43,10 @@ ru:
       page: Страница
       contact_message: Сообщение
       news: Новость
+
+      gallery: Фотогалерея
+      gallery_image: Фото в фотогалерее
+      embeddede_gallery_image: Фото в фотогалерее
     attributes:
       user:
         email: E-mail
@@ -72,6 +76,10 @@ ru:
         email: Ваш е-мейл
         phone: Ваш телефон
         content: Ваше сообщение
+      gallery:
+      gallery_image:
+       gallery: Фотогалерея
+      embeddede_gallery_image:
     errors:
       models:
         contact_message:

data/config/locales/ru.rs.yml

@@ -1,5 +1,6 @@
 ru:
   rs:
+    gallery: "Галерея"
     cms: "CMS"
     menu: "Меню"
     settings: 'Настройки'

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

@@ -4,7 +4,8 @@ class Ability
   def initialize(user)
     if !user.nil? and (user.admin? or user.manager?)
       can :read, :all
-      can :manage, :all
+      can :access, :rails_admin   # grant access to rails_admin
+      can :dashboard              # grant access to the dashboard
       if user.admin?
         admin_ui(user)
       elsif user.manager?
@@ -14,13 +15,10 @@ class Ability
   end
 
   def admin_ui(user)
-    can :access, :rails_admin   # grant access to rails_admin
-    can :dashboard              # grant access to the dashboard
+    can :manage, :all
   end
 
   def manager_ui(user)
-    can :access, :rails_admin   # grant access to rails_admin
-    can :dashboard              # grant access to the dashboard
     cannot :manage, Menu
     cannot [:edit, :destroy, :new, :create], User
     can :edit, user

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

@@ -17,7 +17,7 @@ RailsAdmin.config do |config|
   config.authorize_with :cancan
 <% if RocketCMS.mongoid? %>
   ## == MongoidAudit
-  #config.audit_with :mongoid_audit, 'HistoryTracker'
+  config.audit_with :mongoid_audit, 'HistoryTracker'
 <% elsif RocketCMS.active_record? %>
   config.audit_with :paper_trail, 'User', 'PaperTrail::Version'
 <% end %>
@@ -42,13 +42,14 @@ RailsAdmin.config do |config|
 
     nested_set do
       visible do
-        ['Page'].include? bindings[:abstract_model].model_name
+        ['Page', 'Gallery', 'GalleryImage'].include? bindings[:abstract_model].model_name
       end
     end
     
     custom_show_in_app do
       visible do
-        ['Page', 'News'].include? bindings[:abstract_model].model_name
+        #temporary
+        false #['Page', 'News'].include? bindings[:abstract_model].model_name
       end
     end
     
@@ -62,6 +63,7 @@ RailsAdmin.config do |config|
   config.excluded_models = [
       'RailsAdmin::CustomShowInApp', 'HistoryTracker',
       'Ckeditor::Asset', 'Ckeditor::AttachmentFile', 'Ckeditor::Picture',
+      'EmbeddedGalleryImage'
   ]
 end
 

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

@@ -6,7 +6,7 @@ class Dl < Cloner::Base
       File.expand_path("../../../config/environment", __FILE__)
     end
     def ssh_host
-      '<%= domain %>.ru'
+      '<%= domain %>'
     end
     def ssh_user
       '<%= app_name.downcase %>'
@@ -15,7 +15,7 @@ class Dl < Cloner::Base
       '<%= tmp_path %>'
     end
     def remote_app_path
-      '<%= deploy_to %>'
+      '<%= deploy_to %>/current'
     end
   end
 

data/lib/rocket_cms.rb

@@ -61,11 +61,19 @@ module RocketCMS
     autoload :News, 'rocket_cms/models/news'
     autoload :ContactMessage, 'rocket_cms/models/contact_message'
 
+    autoload :EmbeddedGalleryImage, 'rocket_cms/models/embedded_gallery_image'
+    autoload :GalleryImage,         'rocket_cms/models/gallery_image'
+    autoload :Gallery,              'rocket_cms/models/gallery'
+
     module Mongoid
       autoload :Menu, 'rocket_cms/models/mongoid/menu'
       autoload :Page, 'rocket_cms/models/mongoid/page'
       autoload :News, 'rocket_cms/models/mongoid/news'
       autoload :ContactMessage, 'rocket_cms/models/mongoid/contact_message'
+
+      autoload :EmbeddedGalleryImage, 'rocket_cms/models/mongoid/embedded_gallery_image'
+      autoload :GalleryImage,         'rocket_cms/models/mongoid/gallery_image'
+      autoload :Gallery,              'rocket_cms/models/mongoid/gallery'
     end
 
     module ActiveRecord

data/lib/rocket_cms/admin.rb

@@ -161,5 +161,49 @@ module RocketCMS
         field :sitemap_priority
       }
     end
+
+
+
+    def embedded_image_config
+      Proc.new {
+        field :enabled, :toggle
+        field :name, :string
+        field :image
+      }
+
+    end
+
+    def gallery_config
+      Proc.new {
+        navigation_label I18n.t('rs.gallery')
+        field :enabled, :toggle
+
+        field :name, :string
+        field :slugs, :enum do
+          enum_method do
+            :slugs
+          end
+          visible do
+            bindings[:view].current_user.admin?
+          end
+          multiple do
+            true
+          end
+        end
+        field :text_slug
+
+        field :image
+      }
+    end
+
+    def image_config
+      Proc.new {
+        navigation_label I18n.t('rs.gallery')
+        field :enabled, :toggle
+        field :gallery
+        field :name, :string
+        field :image
+      }
+    end
   end
 end

data/lib/rocket_cms/models/embedded_gallery_image.rb

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

data/lib/rocket_cms/models/gallery.rb

@@ -0,0 +1,17 @@
+module RocketCMS
+  module Models
+    module Gallery
+      extend ActiveSupport::Concern
+      include RocketCMS::Model
+      include Enableable
+      include ManualSlug
+      include SitemapData
+      include RocketCMS.orm_specific('Gallery')
+
+      included do
+        has_many :gallery_images
+        field :name, type: String, localize: RocketCMS.configuration.localize
+      end
+    end
+  end
+end

data/lib/rocket_cms/models/gallery_image.rb

@@ -0,0 +1,15 @@
+module RocketCMS
+  module Models
+    module GalleryImage
+      extend ActiveSupport::Concern
+      include RocketCMS::Model
+      include Enableable
+      include RocketCMS.orm_specific('GalleryImage')
+
+      included do
+        belongs_to :gallery
+        field :name, type: String
+      end
+    end
+  end
+end

data/lib/rocket_cms/models/menu.rb

@@ -4,12 +4,12 @@ module RocketCMS
       extend ActiveSupport::Concern
       include RocketCMS::Model
       include Enableable
-      include RocketCMS.orm_specific('Menu')
       include ManualSlug
+      include RocketCMS.orm_specific('Menu')
 
       included do
 
-        field :name, type: String, localize: true
+        field :name, type: String, localize: RocketCMS.configuration.localize
         manual_slug :name
         
         after_save do

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

@@ -0,0 +1,27 @@
+module RocketCMS
+  module Models
+    module Mongoid
+      module EmbeddedGalleryImage
+        extend ActiveSupport::Concern
+        include ::Mongoid::Paperclip
+
+        included do
+          #embedded_in :model # need to override
+
+          field :name, type: String
+
+          has_mongoid_attached_file :image # need to override
+          validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
+
+          def image_file_name=(val)
+            val = val.to_s
+            return if val.blank?
+            extension = File.extname(val)[1..-1]
+            file_name = val[0..val.size-extension.size-1]
+            self[:image_file_name] = "#{file_name.filename_to_slug}.#{extension.filename_to_slug}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module RocketCMS
+  module Models
+    module Mongoid
+      module Gallery
+        extend ActiveSupport::Concern
+        include ::Mongoid::Paperclip
+
+        included do
+          manual_slug :name
+
+          acts_as_nested_set
+          scope :sorted, -> { order_by([:lft, :asc]) }
+
+          has_mongoid_attached_file :image # need to override
+          validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
+
+          def image_file_name=(val)
+            val = val.to_s
+            return if val.blank?
+            extension = File.extname(val)[1..-1]
+            file_name = val[0..val.size-extension.size-1]
+            self[:image_file_name] = "#{file_name.filename_to_slug}.#{extension.filename_to_slug}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module RocketCMS
+  module Models
+    module Mongoid
+      module GalleryImage
+        extend ActiveSupport::Concern
+        include ::Mongoid::Paperclip
+
+        included do
+          acts_as_nested_set
+          scope :sorted, -> { order_by([:lft, :asc]) }
+
+          has_mongoid_attached_file :image # need to override
+          validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
+
+          def image_file_name=(val)
+            val = val.to_s
+            return if val.blank?
+            extension = File.extname(val)[1..-1]
+            file_name = val[0..val.size-extension.size-1]
+            self[:image_file_name] = "#{file_name.filename_to_slug}.#{extension.filename_to_slug}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rocket_cms/models/news.rb

@@ -5,9 +5,9 @@ module RocketCMS
       include RocketCMS::Model
       include Seoable
       include Enableable
-      include RocketCMS.orm_specific('News')
       include ManualSlug
       include SitemapData
+      include RocketCMS.orm_specific('News')
 
       if RocketCMS.configuration.search_enabled
         include RocketCMS::ElasticSearch

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.2.4"
+  VERSION = "0.7.3"
 end

data/template.rb

@@ -78,8 +78,6 @@ group :production do
   gem "god"
 end
 
-gem "rails_admin_sort_embedded"
-
 TEXT
 end
 
@@ -96,6 +94,8 @@ create_file '.gitignore' do <<-TEXT
 /.bundle
 /log/*.log
 /tmp/*
+/public/assets
+/public/ckeditor
 TEXT
 end
 
@@ -360,6 +360,8 @@ if Rails.env.development?
     end
   end
 end
+
+Rack::Utils.multipart_part_limit = 0
 TEXT
 end
 
@@ -370,12 +372,13 @@ create_file 'app/assets/stylesheets/rails_admin/custom/theming.css.sass' do <<-T
 .input-small
   width: 150px
 
-input[type=text]
-  width: 380px !important
-input.ra-filtering-select-input[type=text]
-  width: 180px !important
-input.hasDatepicker
-  width: 180px !important
+.container-fluid
+  input[type=text]
+    width: 380px !important
+  input.ra-filtering-select-input[type=text]
+    width: 180px !important
+  input.hasDatepicker
+    width: 180px !important
 
 .sidebar-nav
   a
@@ -413,10 +416,6 @@ input.hasDatepicker
   right: 0
   left: auto
 
-.modal
-  width: 800px !important
-
-
 body.rails_admin .modal
   margin: 0 auto !important
   .modal-dialog
@@ -448,6 +447,18 @@ body.rails_admin
 .content > .alert
   margin-top: 20px
 
+.badge-important
+  background: red
+.badge-success
+  background: green
+
+.sidebar-nav i
+  margin-right: 5px
+
+body.rails_admin .table td.paperclip_type, body.rails_admin .table td.carrierwave_type,
+ img
+  max-width: 150px
+  max-height: 100px
 TEXT
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.2.4
+  version: 0.7.3
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -412,6 +412,9 @@ files:
 - app/models/concerns/sort_field.rb
 - app/models/concerns/sortable.rb
 - app/models/contact_message.rb
+- app/models/embedded_gallery_image.rb
+- app/models/gallery.rb
+- app/models/gallery_image.rb
 - app/models/menu.rb
 - app/models/news.rb
 - app/models/page.rb
@@ -490,8 +493,14 @@ 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_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_gallery_image.rb
+- lib/rocket_cms/models/mongoid/gallery.rb
+- lib/rocket_cms/models/mongoid/gallery_image.rb
 - lib/rocket_cms/models/mongoid/menu.rb
 - lib/rocket_cms/models/mongoid/news.rb
 - lib/rocket_cms/models/mongoid/page.rb