rocket_cms 0.22.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a015d259e8213f893cbc9ead86d8c40daaf219f5f8898fed47ce9996a569be
-  data.tar.gz: f734d4c06c3fd966c0da6b87a1f248d1bded1e5ddbb0b49ee84c6729e7532df1
+  metadata.gz: c1894ec7ce4982aaecafca136f56bb70f222e6492dd169e3523a1e680b164c3b
+  data.tar.gz: ebb5e94cc9650abc145efb4b7dc91a7a595d6be8eb95d77cd441703ace6afaf8
 SHA512:
-  metadata.gz: 89cb22c073968737c13f9eaefd854f46e4c4dc865a50760ef27097fcba7ab3ad527367cdc8c25a70512a6cfa4aedd36393c75cb63e6148220b57b055b49e5776
-  data.tar.gz: 9347fa73bc25e59a80d08bc244976c6de5b54e38792e25155a590ff1bbde62a0e48eb7451af482d437321b56785084d7b490dcf88fdcb2940afad6e8c5b9f913
+  metadata.gz: d7bb26a2b581544dcfde6483e5243543fb517a80cdb24367a8d84538b5b5776105ddcd84fe4f576df3a64f766bf499903dfa090eb22d6cdadbf9ea636041273c
+  data.tar.gz: cd9d53504099abe24d90c33aeaab2033c497c2613f4a7c58adae0b01e6fd499ed62516c66b4293237721d08cd3777a65790002d10ac79140ab68778ec1c889ce

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.22.0)
+    rocket_cms (0.24.0)
       addressable
       coffee-rails
       jquery-rails
       kaminari
       manual_slug
-      rails (>= 4.1.0, < 6.0)
+      rails (>= 5.1, < 5.3)
       smart_excerpt
       stringex
       thor
@@ -16,39 +16,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.4)
-      actionpack (= 5.1.4)
+    actioncable (5.1.5)
+      actionpack (= 5.1.5)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
+    actionmailer (5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.4)
-      actionview (= 5.1.4)
-      activesupport (= 5.1.4)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.4)
-      activesupport (= 5.1.4)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.4)
-      activesupport (= 5.1.4)
+    activejob (5.1.5)
+      activesupport (= 5.1.5)
       globalid (>= 0.3.6)
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
+    activerecord (5.1.5)
+      activemodel (= 5.1.5)
+      activesupport (= 5.1.5)
       arel (~> 8.0)
-    activesupport (5.1.4)
+    activesupport (5.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -66,12 +66,12 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
     crass (1.0.3)
-    erubi (1.7.0)
+    erubi (1.7.1)
     execjs (2.7.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (0.9.3)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
@@ -89,48 +89,48 @@ GEM
       activerecord
       kaminari-core (= 1.1.1)
     kaminari-core (1.1.1)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
-    manual_slug (0.1.0)
+    manual_slug (0.4.0)
       activesupport
     method_source (0.9.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    nio4r (2.2.0)
+    nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-    public_suffix (3.0.1)
-    rack (2.0.3)
-    rack-test (0.8.2)
+    public_suffix (3.0.2)
+    rack (2.0.4)
+    rack-test (0.8.3)
       rack (>= 1.0, < 3)
-    rails (5.1.4)
-      actioncable (= 5.1.4)
-      actionmailer (= 5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
-      activemodel (= 5.1.4)
-      activerecord (= 5.1.4)
-      activesupport (= 5.1.4)
+    rails (5.1.5)
+      actioncable (= 5.1.5)
+      actionmailer (= 5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
+      activemodel (= 5.1.5)
+      activerecord (= 5.1.5)
+      activesupport (= 5.1.5)
       bundler (>= 1.3.0)
-      railties (= 5.1.4)
+      railties (= 5.1.5)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.1.4)
-      actionpack (= 5.1.4)
-      activesupport (= 5.1.4)
+    railties (5.1.5)
+      actionpack (= 5.1.5)
+      activesupport (= 5.1.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
+    rake (12.3.1)
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
@@ -141,10 +141,10 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stringex (2.8.2)
+    stringex (2.8.4)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)
       i18n

data/app/controllers/concerns/rs_errors.rb

@@ -4,7 +4,7 @@ module RsErrors
     if Rails.env.production? || Rails.env.staging?
       rescue_from Exception, with: :render_500
       rescue_from ActionController::RoutingError, with: :render_404
-      rescue_from ActionController::UnknownController, with: :render_404
+      #rescue_from ActionController::UnknownController, with: :render_404
       rescue_from ActionController::MissingFile, with: :render_404
       if RocketCMS.mongoid?
         rescue_from Mongoid::Errors::DocumentNotFound, with: :render_404

data/app/controllers/concerns/rs_menu.rb

@@ -17,7 +17,7 @@ module RsMenu
     cr = item.clean_regexp
     navigation_item(primary, item, block)
   end
-  
+
   def navigation_item(primary, item, block=nil)
     url = nav_get_url(item)
     if block.nil?
@@ -29,7 +29,10 @@ module RsMenu
 
   def navigation(type)
     Proc.new do |primary|
-      SimpleNavigation.config.autogenerate_item_ids = false
+      if defined?(SimpleNavigation)
+        SimpleNavigation.config.autogenerate_item_ids = false
+      end
+
       begin
         nav_extra_data_before(type, primary)
         items = nav_get_menu_items(type).select { |i| !i.name.blank? && i.enabled }

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

@@ -1,2 +1,2 @@
 - values = form.object.class.send(field.method_name).values.map { |v| [t("enumerize.#{form.object.class.name.underscore}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v] }
-= form.collection_check_boxes field.method_name, values, :last, :first, {}, {} { |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.haml

@@ -1,2 +1,2 @@
 - values = form.object.class.send(field.method_name).values.map { |v| [t("enumerize.#{form.object.class.name.underscore}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v] }
-= form.collection_radio_buttons field.method_name, values, :last, :first, {}, {} { |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/lib/rocket_cms/models/contact_message.rb

@@ -7,7 +7,7 @@ module RocketCMS
 
       included do
         apply_simple_captcha if respond_to?(:apply_simple_captcha)
-        validates_email_format_of :email, unless: 'email.blank?'
+        validates_email_format_of :email, unless: -> { email.blank? }
         if RocketCMS.config.contacts_message_required
           validates_presence_of :content
         end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.22.0"
+  VERSION = "0.24.0"
 end

data/rocket_cms.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'rails', '>= 4.1.0', '< 6.0'
-
+  spec.add_dependency 'rails', '>= 5.1', '< 5.3'
   spec.add_dependency 'jquery-rails'
   spec.add_dependency 'coffee-rails'
   #spec.add_dependency 'turbolinks'
@@ -32,5 +31,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'smart_excerpt'
   spec.add_dependency 'manual_slug'
-
 end

data/template.rb

@@ -41,7 +41,6 @@ gem 'cancancan'
 gem 'cloner'
 gem 'puma'
 
-gem 'x-real-ip'
 gem 'sentry-raven'
 
 gem 'uglifier'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.24.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -352,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use rocket_cms_mongoid or rocket_cms_activerecord