rocket_cms 0.8.0.pre.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c435abf4bab646d020c211fe4908bd8e871f7fe0
-  data.tar.gz: 1715732d78ec2450a345858277dd34bed2e2093d
+  metadata.gz: bde856fee99a7ce815e3452f2df4d3db50795fdc
+  data.tar.gz: dded2bab36ed3115148be3ff23f77ed94bc96cdb
 SHA512:
-  metadata.gz: d350328115337170dbca7a427df2af03ab6fa48995c627b527434191327c21597c59c4ce82a192f79033c228c0f74576625af3bcffc9817a0a95fe464f15aced
-  data.tar.gz: b6c3936de5887a928ad02b041c8906cf102aae3611480a6f191c4e8e6f63ca5412e72ecd025e21ac87e0be80231036ac4c1b0a17250cf93725ae619541c8562d
+  metadata.gz: 879158b201d8da62949347753f70e88f998b16dbf6240202806068738527742da297a58085562e10dec6d462971f435fc3e81c52e6552b7f57486298aaf19b0d
+  data.tar.gz: b6a0bc88d9b26853a62f961b8cb43ad2cd63ae332f12a087df95c3ab4abf7a67cdce071586b1881b7ad901adcb04239a0fef9cf902c845816e3d62cf03dfa96b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.8.0.pre.6)
+    rocket_cms (0.8.0)
       addressable
       coffee-rails
       devise
@@ -160,7 +160,7 @@ GEM
       sass-rails (>= 4.0, < 6)
     rails_admin_nested_set (0.4.2)
       rails_admin (~> 0.6.6)
-    rails_admin_settings (1.0.0)
+    rails_admin_settings (1.0.1)
     rails_admin_toggleable (0.5.0)
       rails_admin (~> 0.6.6)
     railties (4.2.3)

data/app/controllers/concerns/rs_menu.rb

@@ -19,7 +19,7 @@ module RsMenu
   end
   
   def navigation_item(primary, item, block=nil)
-    url = item.redirect.blank? ? item.fullpath : item.redirect
+    url = nav_get_url(item)
     if block.nil?
       primary.item(item.slug, item.name, url, item.nav_options)
     else
@@ -46,10 +46,12 @@ module RsMenu
     end
   end
 
+  def nav_get_url(item)
+    item.redirect.blank? ? item.fullpath : item.redirect
+  end
   def nav_get_menu_items(type)
     ::Menu.find(type.to_s).pages.enabled.sorted.to_a
   end
-
   def nav_extra_data_before(type, primary)
     # override for additional config or items
   end

data/app/controllers/concerns/rs_pages.rb

@@ -22,8 +22,12 @@ module RsPages
       path = path[0..-2]
       do_redirect = true
     end
-
     page = Page.enabled.where(fullpath: path).first
+
+    if page.nil? && !params[:slug].blank?
+      page = Page.enabled.where(fullpath: "/" + params[:slug]).first
+    end
+
     if page.nil?
       do_redirect = true
       spath = path.chomp(File.extname(path))
@@ -31,6 +35,7 @@ module RsPages
         page = Page.enabled.where(fullpath: spath).first
       end
     end
+
     if !page.nil? && do_redirect
       redirect_to path, status: :moved_permanently
     end

data/app/models/concerns/seoable.rb

@@ -6,11 +6,13 @@ module Seoable
   if Seo.table_exists?
     included do
       has_one :seo, as: :seoable, autosave: true
-      after_create :create_seo
       accepts_nested_attributes_for :seo
       delegate *FIELDS, to: :seo
       delegate *(FIELDS.map {|f| "#{f}=".to_sym }), to: :seo
-
+      alias seo_without_build seo
+      def seo
+        seo_without_build || build_seo
+      end
       if RocketCMS.config.localize
         delegate *(LOCALIZED_FIELDS.map {|f| "#{f}_translations".to_sym }), to: :seo
         delegate *(LOCALIZED_FIELDS.map {|f| "#{f}_translations=".to_sym }), to: :seo

data/lib/rocket_cms/models/page.rb

@@ -53,10 +53,14 @@ module RocketCMS
           url.match(clean_regexp)
         end
       end
-      
+
+      def regexp_prefix
+        ""
+      end
+
       def clean_regexp
         if regexp.blank?
-          /^#{Regexp.escape(fullpath)}$/
+          /^#{regexp_prefix}#{Regexp.escape(fullpath)}$/
         else
           begin
             /#{regexp}/

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.8.0.pre.6"
+  VERSION = "0.8.0"
 end

data/template.rb

@@ -301,10 +301,7 @@ create_file 'app/assets/stylesheets/rails_admin/custom/theming.css.sass' do <<-T
     font-size: 20px
 
 .remove_nested_fields
-  display: block !important
-  z-index: 5
-  right: 0
-  left: auto
+  opacity: 1 !important
 
 .model-dialog
   width: 800px !important

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre.6
+  version: 0.8.0
 platform: ruby
 authors:
 - glebtv
@@ -494,9 +494,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5