enjoy_cms 0.2.1 → 0.3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9058168d3e015e9c7618246f623a9c5f2a324be
-  data.tar.gz: 3823a3981ad52b1620ff1e0618acfc3c6ce3ce44
+  metadata.gz: a31b07bd2773130f799f9cece76e6d15c7f74522
+  data.tar.gz: 3a01393c4a260036190025c18413a9f201991d58
 SHA512:
-  metadata.gz: 772b57c08786e0be58c5accbefc841ee8317e9d91349b89aafc73dc4885d9e674cbdc291e9e6175a5d7ae2e5cb09a89ce566c6d28ddb0e5e8669f9182b755e80
-  data.tar.gz: be0678b89c1ae435d21e9d19352ea2d1b7f7d5974defcc4dddb76f9adb6f7aa27f7407258a12e8204d24983d901b96074ea373e16c8ebc224bacdce0131677b8
+  metadata.gz: 6ae824740984bb5108a3a4f9be73e5517b2f4a0022bcb1d70076199292db8872818582b2492c440ec753e7891f10e7ced292fa71568e97cff625b77b0a59a80f
+  data.tar.gz: e6df80fe7c147ee781fa6d9d88d48cdb445aaaaaffac512eb5c1000851e887dc5203ae3d1164a865e9be323106cb50977a05d7c259f3572f6dfb6963de9b9b6b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.2.1)
+    enjoy_cms (0.3.0.2)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -9,13 +9,17 @@ PATH
       devise
       geocoder
       glebtv-simple_captcha
+      image_optim
+      image_optim_pack
       jquery-rails
       kaminari
+      paperclip-optimizer
       rails (= 4.2.4)
       rails_admin
       rails_admin_mongoid_localize_field
       rails_admin_nested_set
       rails_admin_settings
+      rails_admin_sort_embedded
       rails_admin_toggleable
       simple-navigation
       simple_form
@@ -98,8 +102,10 @@ GEM
       warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.6.0)
-    font-awesome-rails (4.5.0.0)
-      railties (>= 3.2, < 5.0)
+    exifr (1.2.4)
+    font-awesome-rails (4.5.0.1)
+      railties (>= 3.2, < 5.1)
+    fspath (2.1.1)
     geocoder (1.3.0)
     glebtv-simple_captcha (0.6.7)
     globalid (0.3.6)
@@ -108,6 +114,17 @@ GEM
       tilt
     htmlentities (4.3.4)
     i18n (0.7.0)
+    image_optim (0.22.0)
+      exifr (~> 1.2, >= 1.2.2)
+      fspath (~> 2.1)
+      image_size (~> 1.3)
+      in_threads (~> 1.3)
+      progress (~> 3.0, >= 3.0.1)
+    image_optim_pack (0.2.1.20160119)
+      fspath (~> 2.1)
+      image_optim (~> 0.19)
+    image_size (1.4.1)
+    in_threads (1.3.1)
     jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -123,6 +140,7 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.99)
+    mimemagic (0.3.0)
     mini_magick (4.4.0)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
@@ -138,6 +156,16 @@ GEM
       mini_portile2 (~> 2.0.0.rc2)
     origin (2.2.0)
     orm_adapter (0.5.0)
+    paperclip (4.3.5)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      cocaine (~> 0.5.5)
+      mime-types
+      mimemagic (= 0.3.0)
+    paperclip-optimizer (2.0.0)
+      image_optim (~> 0.19)
+      paperclip (>= 3.4)
+    progress (3.1.1)
     rack (1.6.4)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)
@@ -185,6 +213,8 @@ GEM
     rails_admin_nested_set (0.4.5)
       rails_admin
     rails_admin_settings (1.1.3)
+    rails_admin_sort_embedded (0.1.4)
+      rails_admin
     rails_admin_toggleable (0.6.0)
       rails_admin
     railties (4.2.4)

data/app/controllers/concerns/enjoy/decorators/contacts.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module Contacts
+    extend ActiveSupport::Concern
+  end
+end

data/app/controllers/concerns/enjoy/decorators/home.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module Home
+    extend ActiveSupport::Concern
+  end
+end

data/app/controllers/concerns/enjoy/decorators/news.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module News
+    extend ActiveSupport::Concern
+  end
+end

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

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module Pages
+    extend ActiveSupport::Concern
+  end
+end

data/app/controllers/concerns/enjoy/decorators/search.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module Search
+    extend ActiveSupport::Concern
+  end
+end

data/app/controllers/enjoy/contacts_controller.rb

@@ -1,5 +1,7 @@
 module Enjoy
   class ContactsController < ApplicationController
     include Enjoy::Controllers::Contacts
+
+    include Enjoy::Decorators::Contacts
   end
 end

data/app/controllers/enjoy/home_controller.rb

@@ -1,6 +1,9 @@
 module Enjoy
   class HomeController < ApplicationController
+
     def index
     end
+
+    include Enjoy::Decorators::Home
   end
 end

data/app/controllers/enjoy/news_controller.rb

@@ -1,5 +1,7 @@
 module Enjoy
   class NewsController < ApplicationController
     include Enjoy::Controllers::News
+
+    include Enjoy::Decorators::News
   end
 end

data/app/controllers/enjoy/pages_controller.rb

@@ -1,5 +1,7 @@
 module Enjoy
   class PagesController < ApplicationController
     include Enjoy::Controllers::Pages
+
+    include Enjoy::Decorators::Pages
   end
 end

data/app/controllers/enjoy/search_controller.rb

@@ -2,5 +2,7 @@
 module Enjoy
   class SearchController < ApplicationController
     include Enjoy::Controllers::Search
+
+    include Enjoy::Decorators::Search
   end
 end

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

@@ -0,0 +1,23 @@
+if Enjoy.mongoid?
+  module Enjoy::HtmlField
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def enjoy_cms_html_field(name, opts = {})
+        clear_by_default = opts.delete(:clear_by_default)
+        clear_by_default = false unless clear_by_default == true
+        
+        field "#{name}_html", opts
+        field "#{name}_clear", type: Boolean, default: clear_by_default
+
+        class_eval <<-EVAL
+          def #{name}
+            self.#{name}_html ||= ""
+            return self.#{name}_html unless self.#{name}_clear
+            Rails::Html::FullSanitizer.new.sanitize(self.#{name}_html.strip)
+          end
+        EVAL
+      end
+    end
+  end
+end

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

@@ -12,6 +12,13 @@ if Enjoy.mongoid?
           jcrop_options = opts.delete(:jcrop_options)
         end
 
+        opts[:processors] ||= []
+        opts[:processors] << :paperclip_optimizer
+        opts[:processors].flatten!
+        opts[:processors].uniq!
+
+        opts[:convert_options] = {all: "-quality 75 -strip"} if opts[:convert_options].blank?
+
         has_mongoid_attached_file name, opts
         validates_attachment name, content_type: content_type unless content_type.blank?
         class_eval <<-EVAL
@@ -23,6 +30,12 @@ if Enjoy.mongoid?
             file_name = val[0..val.size-extension.size-1]
             self[:#{name}_file_name] = "\#{file_name.filename_to_slug}.\#{extension.filename_to_slug}"
           end
+
+          before_#{name}_post_process do
+            p_o = self.#{name}.processors.delete :paperclip_optimizer
+            self.#{name}.processors << p_o if p_o
+            true
+          end
         EVAL
         if jcrop_options
           class_eval <<-EVAL

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

@@ -0,0 +1,16 @@
+module Enjoy::RailsAdminPatch
+  extend ActiveSupport::Concern
+
+  def rails_admin_model
+    self.class.to_param.gsub("::", "~").underscore
+  end
+
+  module ClassMethods
+    def rails_admin_add_fields
+      {}
+    end
+
+    def rails_admin_add_config(config)
+    end
+  end
+end

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

@@ -24,4 +24,4 @@
       controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }.sort_by {|a| [selected_ids.index(a[1]) || selected_ids.size, i+=1] }
     end
 
-  = form.collection_check_boxes field.method_name, collection, :last, :fienjoyt, {}, {} { |i| i.label( class: 'checkbox' ) { i.check_box + i.text } }
+  = form.collection_check_boxes field.method_name, collection, :last, :first, {}, {} { |i| i.label( class: 'checkbox' ) { i.check_box + i.text } }

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

@@ -0,0 +1,13 @@
+ruby:
+  js_data = {
+    jspath: field.location ? field.location : field.base_location + "ckeditor.js",
+    base_location: field.base_location,
+    options: {
+      customConfig: field.config_js ? field.config_js : field.base_location + "config.js"
+    }
+  }
+= form.text_area "#{field.method_name}_html", field.html_attributes.reverse_merge(data: { richtext: 'ckeditor', options: js_data.to_json }).reverse_merge({ value: field.form_value[:html] })
+
+label{style='display: block;'}
+  span{style='float: left'}= form.send field.boolean_view_helper, "#{field.method_name}_clear", field.html_attributes.reverse_merge({ value: field.form_value[:clear], checked: field.form_value[:clear].in?([true, '1']), required: field.required, class: "form-control"})
+  div{style='margin-left: 35px; line-height: 40px;'} Убирать теги

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

@@ -2,4 +2,4 @@
   values = form.object.class.send(field.method_name).values.map { |v|
     [t("enumerize.#{form.object.class.name.downcase}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v]
   }
-= form.collection_check_boxes field.method_name, values, :last, :fienjoyt, {}, {} { |i| i.label( class: 'checkbox' ) { i.check_box + i.text } }
+= form.collection_check_boxes field.method_name, values, :last, :first, {}, {} { |i| i.label( class: 'checkbox' ) { i.check_box + i.text } }

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

@@ -2,4 +2,4 @@
   values = form.object.class.send(field.method_name).values.map { |v|
     [t("enumerize.#{form.object.class.name.downcase}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v]
   }
-= form.collection_radio_buttons field.method_name, values, :last, :fienjoyt, {}, {} { |i| i.label(class: 'radio') { i.radio_button + i.text } }
+= form.collection_radio_buttons field.method_name, values, :last, :first, {}, {} { |i| i.label(class: 'radio') { i.radio_button + i.text } }

data/config/initializers/simple_captcha.rb

@@ -21,7 +21,7 @@ SimpleCaptcha.setup do |sc|
   sc.length = 4
   sc.charset = "1234567890"
 
-  sc.add_image_style("enjoy_cms_style", ["-alpha set", "-fill '#ffffff'", "-background 'transparent'", "-size 200x50", "xc:transparent"])
+  sc.add_image_style("enjoy_cms_style", ["-alpha set", "-fill 'red'", "-background 'transparent'", "-size 200x50", "xc:transparent"])
 
   sc.image_style = 'enjoy_cms_style'
 

data/enjoy_cms.gemspec

@@ -50,4 +50,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'stringex'
   spec.add_dependency 'thor'
   spec.add_dependency 'smart_excerpt'
+
+
+  spec.add_dependency 'rails_admin_sort_embedded'
+  spec.add_dependency 'image_optim'
+  spec.add_dependency 'image_optim_pack'
+  spec.add_dependency 'paperclip-optimizer'
 end

data/lib/enjoy/admin/news.rb

@@ -18,7 +18,7 @@ module Enjoy
               jcrop_options :image_jcrop_options
             end
           end
-          field :excerpt, :ck_editor
+          field :excerpt, :enjoy_html
           field :slugs, :enum do
             enum_method do
               :slugs
@@ -37,7 +37,7 @@ module Enjoy
           end
 
           edit do
-            field :content, :ck_editor
+            field :content, :enjoy_html
             fields.each_pair do |name, type|
               if type.nil?
                 field name

data/lib/enjoy/admin/page.rb

@@ -18,11 +18,11 @@ module Enjoy
             field :redirect
             field :slug
           end
-          
+
           edit do
             field :name
-            field :excerpt, :ck_editor
-            field :content, :ck_editor
+            field :excerpt, :enjoy_html
+            field :content, :enjoy_html
 
             group :menu do
               label I18n.t('enjoy.menu')

data/lib/enjoy/model.rb

@@ -21,7 +21,8 @@ module Enjoy
       if Enjoy.mongoid? && defined?(Trackable)
         include Trackable
       end
-    end
 
+      include Enjoy::RailsAdminPatch
+    end
   end
 end

data/lib/enjoy/models/contact_message.rb

@@ -25,15 +25,6 @@ module Enjoy
         end
       end
 
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
-
       def send_emails?
         true
       end

data/lib/enjoy/models/embedded_element.rb

@@ -7,15 +7,6 @@ module Enjoy
       include Enjoy::Sortable
 
       include Enjoy.orm_specific('EmbeddedElement')
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

data/lib/enjoy/models/embedded_gallery_image.rb

@@ -11,15 +11,6 @@ module Enjoy
       included do
         validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

data/lib/enjoy/models/gallery.rb

@@ -16,15 +16,6 @@ module Enjoy
 
         validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

data/lib/enjoy/models/gallery_image.rb

@@ -14,15 +14,6 @@ module Enjoy
 
         validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

data/lib/enjoy/models/menu.rb

@@ -9,8 +9,6 @@ module Enjoy
       include Enjoy.orm_specific('Menu')
 
       included do
-
-        field :name, type: String
         manual_slug :name
 
         after_save do
@@ -20,15 +18,6 @@ module Enjoy
           Rails.cache.delete 'menus'
         end
       end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

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

@@ -9,13 +9,19 @@ module Enjoy
 
           enjoy_cms_mongoid_attached_file(:image,
                     styles: lambda { |attachment| attachment.instance.image_styles },
+                    convert_options: lambda { |attachment| attachment.instance.image_convert_options },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
 
+
         def image_styles
           {}
         end
+        def image_convert_options
+          {}
+        end
+
       end
     end
   end

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

@@ -14,6 +14,7 @@ module Enjoy
 
           enjoy_cms_mongoid_attached_file(:image,
                     styles: lambda { |attachment| attachment.instance.image_styles },
+                    convert_options: lambda { |attachment| attachment.instance.image_convert_options },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
@@ -21,6 +22,10 @@ module Enjoy
         def image_styles
           {}
         end
+        def image_convert_options
+          {}
+        end
+
       end
     end
   end

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

@@ -12,6 +12,7 @@ module Enjoy
 
           enjoy_cms_mongoid_attached_file(:image,
                     styles: lambda { |attachment| attachment.instance.image_styles },
+                    convert_options: lambda { |attachment| attachment.instance.image_convert_options },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
@@ -19,6 +20,9 @@ module Enjoy
         def image_styles
           {}
         end
+        def image_convert_options
+          {}
+        end
       end
     end
   end

data/lib/enjoy/models/mongoid/news.rb

@@ -7,20 +7,23 @@ module Enjoy
           include Enjoy::MongoidPaperclip
         end
 
+        include Enjoy::HtmlField
+
         included do
           field :name, type: String, localize: Enjoy.config.localize, default: ""
-          
+
           field :time, type: Time
           index({enabled: 1, time: 1})
           unless Enjoy.config.news_image_styles.nil?
             enjoy_cms_mongoid_attached_file(:image,
                       styles: Enjoy.configuration.news_image_styles,
+                      convert_options: Enjoy.configuration.news_image_convert_options,
                       content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
             )
           end
 
-          field :excerpt, type: String, localize: Enjoy.configuration.localize, default: ""
-          field :content, type: String, localize: Enjoy.configuration.localize, default: ""
+          enjoy_cms_html_field :excerpt, type: String, localize: Enjoy.configuration.localize, default: ""
+          enjoy_cms_html_field :content, type: String, localize: Enjoy.configuration.localize, default: ""
 
           scope :after_now, -> { where(:time.lt => Time.now) }
           scope :by_date, -> { desc(:time) }

data/lib/enjoy/models/mongoid/page.rb

@@ -4,13 +4,15 @@ module Enjoy
       module Page
         extend ActiveSupport::Concern
 
+        include Enjoy::HtmlField
+
         included do
           field :name, type: String, localize: Enjoy.config.localize, default: ""
 
           field :regexp, type: String, default: ""
           field :redirect, type: String, default: ""
-          field :excerpt, type: String, localize: Enjoy.config.localize, default: ""
-          field :content, type: String, localize: Enjoy.config.localize, default: ""
+          enjoy_cms_html_field :excerpt, type: String, localize: Enjoy.config.localize, default: ""
+          enjoy_cms_html_field :content, type: String, localize: Enjoy.config.localize, default: ""
           field :fullpath, type: String, default: ""
 
           has_and_belongs_to_many :menus, inverse_of: :pages, class_name: "Enjoy::Menu"

data/lib/enjoy/models/mongoid/seo.rb

@@ -16,16 +16,19 @@ module Enjoy
 
           field :og_title, type: String, localize: Enjoy.config.localize
           enjoy_cms_mongoid_attached_file(:og_image,
-                    styles: og_image_styles,
+                    styles: lambda { |attachment| attachment.instance.og_image_styles },
+                    convert_options: lambda { |attachment| attachment.instance.og_image_convert_options },
                     content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
           )
         end
 
-        module ClassMethods
-          def og_image_styles
-            {thumb: "800x600>"}
-          end
+        def og_image_styles
+          {thumb: "800x600>"}
         end
+        def og_image_convert_options
+          {}
+        end
+        
       end
     end
   end

data/lib/enjoy/models/news.rb

@@ -36,15 +36,6 @@ module Enjoy
         manual_slug :report_slug
       end
 
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
-
       def report_slug
         if time.blank?
           name

data/lib/enjoy/models/page.rb

@@ -23,15 +23,6 @@ module Enjoy
         end
       end
 
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
-
       def page_h1
         _ret = seo ? seo.h1 : nil
         _ret = name   if _ret.blank?

data/lib/enjoy/models/seo.rb

@@ -12,15 +12,6 @@ module Enjoy
 
         validates_attachment_content_type :og_image, content_type: /\Aimage\/.*\Z/, if: :og_image?
       end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

data/lib/enjoy/models/sitemap_data.rb

@@ -12,15 +12,6 @@ module Enjoy
       included do
         belongs_to :sitemap_data_field, polymorphic: true
       end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

data/lib/enjoy/rails_admin_enjoy_html.rb

@@ -0,0 +1,40 @@
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class EnjoyHtml < RailsAdmin::Config::Fields::Types::CKEditor
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types::register(self)
+          include RailsAdmin::Engine.routes.url_helpers
+
+          register_instance_option :pretty_value do
+            bindings[:object].send(name + "_html")
+          end
+
+          register_instance_option :form_value do
+            {
+              html: bindings[:object].send("#{name}_html"),
+              clear: bindings[:object].send("#{name}_clear")
+            }
+          end
+
+          register_instance_option :formatted_value do
+            pretty_value
+          end
+
+          register_instance_option :export_value do
+            pretty_value
+          end
+
+          register_instance_option :boolean_view_helper do
+            :check_box
+          end
+
+          register_instance_option :partial do
+            :enjoy_html
+          end
+        end
+      end
+    end
+  end
+end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.2.1"
+  VERSION = "0.3.0.2"
 end

data/lib/enjoy_cms.rb

@@ -29,10 +29,13 @@ require 'turbolinks'
 require 'simple-navigation'
 require 'ack_rails_admin_jcrop'
 
+require 'paperclip-optimizer'
+
 require 'enjoy/configuration'
 require 'enjoy/elastic_search'
 require 'enjoy/model'
 require 'enjoy/rails_admin_menu'
+require 'enjoy/rails_admin_enjoy_html'
 require 'enjoy/engine'
 require 'enjoy/controller'
 

data/template.rb

@@ -15,14 +15,14 @@ create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
 
 gem 'rails', '4.2.4' #'~> 5.0.0.beta1'
-#{if mongoid then "gem 'mongoid', '~> 5.0.0'" else "gem 'pg'" end}
+#{if mongoid then "gem 'mongoid'" else "gem 'pg'" end}
 
-gem 'sass', '~> 3.4.0'
+gem 'sass'
 gem 'sass-rails'
-gem 'compass-rails', '~> 2.0.0'
-gem 'compass', '~> 1.0.0'
+gem 'compass-rails'
+gem 'compass'
 
-#{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, '~> 0.2.0.beta', git: 'https://github.com/enjoycreative/enjoy_cms'
+#{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, '~> 0.3.0'
 
 gem 'devise'
 
@@ -34,7 +34,8 @@ gem 'cloner'
 gem 'unicorn'
 gem 'x-real-ip'
 
-gem 'sentry-raven'
+#temp
+#gem 'sentry-raven'
 
 group :development do
   gem 'better_errors'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0.2
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -374,6 +374,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails_admin_sort_embedded
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_optim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_optim_pack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: paperclip-optimizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'EnjoyCMS '
 email:
 - dev@enjoycreate.ru
@@ -399,6 +455,11 @@ files:
 - app/assets/stylesheets/enjoy_cms/flash.sass
 - app/assets/stylesheets/enjoy_cms/normalize.scss
 - app/assets/stylesheets/enjoy_cms/powered.sass
+- app/controllers/concerns/enjoy/decorators/contacts.rb
+- app/controllers/concerns/enjoy/decorators/home.rb
+- app/controllers/concerns/enjoy/decorators/news.rb
+- app/controllers/concerns/enjoy/decorators/pages.rb
+- app/controllers/concerns/enjoy/decorators/search.rb
 - app/controllers/concerns/enjoy/errors.rb
 - app/controllers/concerns/enjoy/fancybox.rb
 - app/controllers/concerns/enjoy/localizeable.rb
@@ -426,9 +487,11 @@ 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/html_field.rb
 - app/models/concerns/enjoy/mappable.rb
 - app/models/concerns/enjoy/model_localizeable.rb
 - app/models/concerns/enjoy/mongoid_paperclip.rb
+- app/models/concerns/enjoy/rails_admin_patch.rb
 - app/models/concerns/enjoy/seoable.rb
 - app/models/concerns/enjoy/sitemap_data_field.rb
 - app/models/concerns/enjoy/sort_field.rb
@@ -466,6 +529,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_html.html.slim
 - app/views/rails_admin/main/_enum_check_boxes.html.slim
 - app/views/rails_admin/main/_enum_radio_buttons.html.slim
 - app/views/rails_admin/main/_form_raw.html.slim
@@ -538,6 +602,7 @@ files:
 - lib/enjoy/models/page.rb
 - lib/enjoy/models/seo.rb
 - lib/enjoy/models/sitemap_data.rb
+- lib/enjoy/rails_admin_enjoy_html.rb
 - lib/enjoy/rails_admin_menu.rb
 - lib/enjoy/simple_form_patch.rb
 - lib/enjoy/tasks.rb