ack_rocket_cms 0.7.6.3 → 0.7.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e69afd162ed33c6b8c2ea80bdd95656841f1afb2
-  data.tar.gz: 6eee9dab90b8d4f07848662b365efb1a8bd5485f
+  metadata.gz: 7f5c8755a70408ccb0e2018b820542c22e65ddf6
+  data.tar.gz: 6cc2ed7e328c4b1af1f5a65fe98139bd85a06083
 SHA512:
-  metadata.gz: 41960cb78465c72fd0c5abefd59eb14d24a7954940a77d96ced5efdaa5c1bf6781c56404b46c7c9dbf92675e61bdab65d95c29e4306c1686d13bb8bb472c3fa6
-  data.tar.gz: 1c28fd5d081b98d08ae631702ffb22e0c113cbc7d06e653c47e4b74cab7b4f7fd855da5187d6273ec35d54b3e178862725a14e7801531d0df66b74d3dd155be1
+  metadata.gz: e76306c0c338b37f418859629dd85599b8f33fc90c3783f07ab19029649b2a12ccf4254219c5175d9634bf9c11acc5960b035e842c2124383c25b2034f1c91d1
+  data.tar.gz: 51dd6019831bd6d4478470d211bde3eb818e41b497bc8b11030aa5f988bb79b3f8d88a97bbffb8467771a061ea1d50e1e8228c2c51c23b080f675ab23cf19cb6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.6.3)
+    ack_rocket_cms (0.7.6.4)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -30,7 +30,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ack_rails_admin_jcrop (0.0.2)
+    ack_rails_admin_jcrop (0.0.4)
       mini_magick
       rails (>= 3.0.0)
       rails_admin (>= 0.3.0)
@@ -72,7 +72,7 @@ GEM
     addressable (2.3.8)
     arel (6.0.0)
     bcrypt (3.1.10)
-    bson (2.3.0)
+    bson (3.0.4)
     builder (3.2.2)
     ckeditor (4.1.2)
       cocaine
@@ -89,7 +89,7 @@ GEM
       execjs
     coffee-script-source (1.9.1.1)
     connection_pool (2.2.0)
-    devise (3.4.1)
+    devise (3.5.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -114,7 +114,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    json (1.8.2)
+    json (1.8.3)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -122,17 +122,17 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.5)
-    mini_magick (4.2.4)
+    mime-types (2.6.1)
+    mini_magick (4.2.7)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.7.0)
     mongoid (4.0.2)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.4)
-      bson (~> 2.2)
+    moped (2.0.5)
+      bson (~> 3.0.4)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
     nested_form (0.3.2)
@@ -200,7 +200,7 @@ GEM
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     safe_yaml (1.0.4)
-    sass (3.4.13)
+    sass (3.4.14)
     sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -217,7 +217,7 @@ GEM
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (3.1.0)
+    sprockets (3.2.0)
       rack (~> 1.0)
     sprockets-rails (2.3.1)
       actionpack (>= 3.0)

data/app/assets/stylesheets/{rocket_cms.css.sass → rocket_cms.sass}

@@ -2,5 +2,4 @@
 
 html
   -moz-font-smoothing: antialiased
-  -webkit-font-smoothing: antialiased
-
+  -webkit-font-smoothing: antialiased

data/app/assets/stylesheets/rocket_cms/{flash.css.sass → flash.sass}

@@ -1,5 +1,3 @@
-
-
 .flash
   margin: 0 auto
   padding: 10px 0
@@ -62,5 +60,4 @@
     +background(linear-gradient(top, #f0565b, #e83639))
     text-shadow: 0px 1px #d71012
     a.close_flash
-      color: #782124
-
+      color: #782124

data/app/controllers/concerns/rs_errors.rb

@@ -17,6 +17,16 @@ module RsErrors
 
     if defined?(CanCan)
       rescue_from CanCan::AccessDenied do |exception|
+        Rails.logger.error "__________________________"
+        Rails.logger.error "Error 403"
+        Rails.logger.error (params ? params.inspect : "no params data")
+        Rails.logger.error (current_user ? current_user.inspect : "no current_user")
+        unless exception.nil?
+          Rails.logger.error exception.message
+          Rails.logger.error exception.backtrace.join("\n")
+          capture_exception(exception) if defined?(Raven)
+        end
+        Rails.logger.error "__________________________"
         if !user_signed_in?
           #scope = rails_admin? ? main_app : self
           #redirect_to scope.new_user_session_path, alert: "Необходимо авторизоваться"
@@ -30,20 +40,30 @@ module RsErrors
 
   protected
   def render_404(exception = nil)
-    Rails.logger.error "404: #{request.url}"
+    Rails.logger.error "__________________________"
+    Rails.logger.error "Error 404"
+    Rails.logger.error (params ? params.inspect : "no params data")
+    Rails.logger.error (current_user ? current_user.inspect : "no current_user")
     unless exception.nil?
       Rails.logger.error exception.message
       Rails.logger.error exception.backtrace.join("\n")
       capture_exception(exception) if defined?(Raven)
     end
+    Rails.logger.error "__________________________"
     render_error(404)
   end
 
-  def render_500(exception)
-    Rails.logger.error "500: #{request.url}"
-    Rails.logger.error exception.message
-    Rails.logger.error exception.backtrace.join("\n")
-    capture_exception(exception) if defined?(Raven)
+  def render_500(exception = nil)
+    Rails.logger.error "__________________________"
+    Rails.logger.error "Error 500"
+    Rails.logger.error (params ? params.inspect : "no params data")
+    Rails.logger.error (current_user ? current_user.inspect : "no current_user")
+    unless exception.nil?
+      Rails.logger.error exception.message
+      Rails.logger.error exception.backtrace.join("\n")
+      capture_exception(exception) if defined?(Raven)
+    end
+    Rails.logger.error "__________________________"
     begin
       if rails_admin_controller?
         render text: 'Внутренняя ошибка', status: 500
@@ -55,7 +75,7 @@ module RsErrors
   end
 
   def render_error(code = 500)
-    render template: "errors/error_#{code}", formats: [:html], handlers: [:haml, :slim], layout: RocketCMS.configuration.error_layout, status: code
+      render template: "errors/error_#{code}", formats: [:html], handlers: [:haml, :slim], layout: RocketCMS.configuration.error_layout, status: code
   end
 
   def rails_admin?

data/app/models/concerns/seoable.rb

@@ -33,6 +33,10 @@ module Seoable
   def self.admin
     RocketCMS.seo_config
   end
+
+  def og_image_jcrop_options
+    {aspectRation: 800.0/600.0}
+  end
   
   # deprecated
   def self.seo_config

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

@@ -4,10 +4,10 @@ module RocketCMS
       module ContactMessage
         extend ActiveSupport::Concern
         included do
-          field :name, type: String
-          field :email, type: String
-          field :phone, type: String
-          field :content, type: String
+          field :name, type: String, default: ""
+          field :email, type: String, default: ""
+          field :phone, type: String, default: ""
+          field :content, type: String, default: ""
           RocketCMS.configuration.contacts_fields.each_pair do |fn, ft|
             next if ft.nil?
             field fn, type: ft

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

@@ -5,7 +5,7 @@ module RocketCMS
         extend ActiveSupport::Concern
 
         included do
-          field :name, type: String, localize: RocketCMS.configuration.localize
+          field :name, type: String, localize: RocketCMS.configuration.localize, default: ""
         end
       end
     end

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

@@ -14,8 +14,9 @@ module RocketCMS
           validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
 
           def image_file_name=(val)
+            return self[:image_file_name] = ""  if val == ""
+            return self[:image_file_name] = nil if val == nil
             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}"

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

@@ -15,8 +15,9 @@ module RocketCMS
           validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
 
           def image_file_name=(val)
+            return self[:image_file_name] = ""  if val == ""
+            return self[:image_file_name] = nil if val == nil
             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}"

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

@@ -13,8 +13,9 @@ module RocketCMS
           validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
 
           def image_file_name=(val)
+            return self[:image_file_name] = ""  if val == ""
+            return self[:image_file_name] = nil if val == nil
             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}"

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

@@ -4,7 +4,7 @@ module RocketCMS
       module Menu
         extend ActiveSupport::Concern
         included do
-          field :name, type: String
+          field :name, type: String, default: ""
         end
       end
     end

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

@@ -12,10 +12,19 @@ module RocketCMS
           unless RocketCMS.configuration.news_image_styles.nil?
             has_mongoid_attached_file :image, styles: RocketCMS.configuration.news_image_styles
             validates_attachment_content_type :image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :image?
+
+            def image_file_name=(val)
+              return self[:image_file_name] = ""  if val == ""
+              return self[:image_file_name] = nil if val == nil
+              val = val.to_s
+              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
 
-          field :excerpt, type: String, localize: RocketCMS.configuration.localize
-          field :content, type: String, localize: RocketCMS.configuration.localize
+          field :excerpt, type: String, localize: RocketCMS.configuration.localize, default: ""
+          field :content, type: String, localize: RocketCMS.configuration.localize, default: ""
 
           scope :after_now, -> { where(:time.lt => Time.now) }
           scope :by_date, -> { desc(:time) }

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

@@ -4,11 +4,11 @@ module RocketCMS
       module Page
         extend ActiveSupport::Concern
         included do
-          field :regexp, type: String
-          field :redirect, type: String
-          field :excerpt, type: String, localize: RocketCMS.configuration.localize
-          field :content, type: String, localize: RocketCMS.configuration.localize
-          field :fullpath, type: String
+          field :regexp, type: String, default: ""
+          field :redirect, type: String, default: ""
+          field :excerpt, type: String, localize: RocketCMS.configuration.localize, default: ""
+          field :content, type: String, localize: RocketCMS.configuration.localize, default: ""
+          field :fullpath, type: String, default: ""
           has_and_belongs_to_many :menus, inverse_of: :pages
           acts_as_nested_set
 

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.6.3"
+  VERSION = "0.7.6.4"
 end

data/template.rb

@@ -52,6 +52,9 @@ group :development do
   gem 'hipchat'
   # gem 'coffee-rails-source-maps'
   # gem 'compass-rails-source-maps'
+
+  gem 'favicon_maker', '0.3'
+  gem 'favicon_maker_rails'
 end
 
 group :test do
@@ -368,7 +371,7 @@ Rack::Utils.multipart_part_limit = 0
 TEXT
 end
 
-create_file 'app/assets/stylesheets/rails_admin/custom/theming.css.sass' do <<-TEXT
+create_file 'app/assets/stylesheets/rails_admin/custom/theming.sass' do <<-TEXT
 .navbar-brand
   margin-left: 0 !important
 
@@ -458,7 +461,7 @@ body.rails_admin
 .sidebar-nav i
   margin-right: 5px
 
-body.rails_admin .table td.paperclip_type, body.rails_admin .table td.carrierwave_type
+body.rails_admin .table td.paperclip_type, body.rails_admin .table td.carrierwave_type, body.rails_admin .table td.jcrop_type
   img
     max-width: 150px
     max-height: 100px
@@ -468,6 +471,7 @@ end
 remove_file 'public/robots.txt'
 create_file 'public/robots.txt' do <<-TEXT
 User-Agent: *
+Allow: /
 Disallow: /admin
 Sitemap: /sitemap.xml.gz
 TEXT

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.6.3
+  version: 0.7.6.4
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -404,9 +404,9 @@ files:
 - app/assets/javascripts/rocket_cms.js.coffee
 - app/assets/javascripts/rocket_cms/flash.js.coffee
 - app/assets/javascripts/rocket_cms/map.js.coffee
-- app/assets/stylesheets/rocket_cms.css.sass
-- app/assets/stylesheets/rocket_cms/flash.css.sass
-- app/assets/stylesheets/rocket_cms/normalize.css.scss
+- app/assets/stylesheets/rocket_cms.sass
+- app/assets/stylesheets/rocket_cms/flash.sass
+- app/assets/stylesheets/rocket_cms/normalize.scss
 - app/controllers/concerns/no_cache.rb
 - app/controllers/concerns/rs_errors.rb
 - app/controllers/concerns/rs_menu.rb