ack_rocket_cms 0.7.2.1 → 0.7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71cf0a840e9fc4d90edd0b8e308078414d68d866
-  data.tar.gz: 38d6511abca3082f32617f41a1c7a7fe7125a969
+  metadata.gz: 2f39cfacc357ca647734190fedd1794b32d728dc
+  data.tar.gz: e073a68790d363d36b7ef180b79f1ce998ba6e1c
 SHA512:
-  metadata.gz: ad84e1aae5374151b462a1cb293289219ca036d2974f4bc4a9281f05fa3329249ea217d77d04bcd746353e1127737b31c400b41d969acf6a11ae5cd335fe93ee
-  data.tar.gz: 5c06f4eeed839d11ef4d98b076ab62f6b6d8ceb86c1166a746b2df5aa14d5dc2485a7abd4fc74f714b9f602c636f73972075b339133dfea453511bd73a013a24
+  metadata.gz: cd57575bbb83c2207cbbb0202284c9ee9dd28e3402160f21f46f85be82a373cda6102d4058036e9c67716231859985de6c96649b39556eeed95aa757b4a6ec7e
+  data.tar.gz: a29f0e643d30da6c23f5a8667bf02ec0c327533c38a9003b8cbd4a64b0e6e845a6cc33aa01b9ef9118182c7a199e33b01edd4baa7f880356c83f0918fb7773c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.2.1)
+    ack_rocket_cms (0.7.2.2)
       addressable
       coffee-rails
       devise
@@ -75,7 +75,7 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.0)
+    coffee-script-source (1.9.1)
     connection_pool (2.1.1)
     devise (3.4.1)
       bcrypt (~> 3.0)
@@ -89,7 +89,7 @@ GEM
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     geocoder (1.2.7)
-    glebtv-ckeditor (4.4.6)
+    glebtv-ckeditor (4.4.7)
       mime-types
       orm_adapter (~> 0.5.0)
       rails (~> 4.0)
@@ -118,12 +118,12 @@ GEM
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.5.1)
-    mongoid (4.0.1)
+    mongoid (4.0.2)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.3)
+    moped (2.0.4)
       bson (~> 2.2)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
@@ -193,7 +193,7 @@ GEM
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     safe_yaml (1.0.4)
-    sass (3.4.11)
+    sass (3.4.12)
     sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)

data/README.md

@@ -2,7 +2,7 @@
 
 rails_admin + mongoid/activerecord + elasticsearch CMS
 
-Very opinionated and tuned for our needs.
+Very opinionated and tuned for my needs.
 
 Sorry, no documentation or examples are availiable yet. Stay tuned
 
@@ -13,13 +13,13 @@ any time!**
 
 Add this line to your application's Gemfile:
 
-    gem 'rocket_cms_mongoid', github: "ack43/rocket_cms", branch: :master
+    gem 'ack_rocket_cms_mongoid'
 
 or:
 
-    gem 'rocket_cms_activerecord', github: "ack43/rocket_cms", branch: :master
+    gem 'ack_rocket_cms_activerecord'
 
-*Only PostgreSQL is tested or supported for AR. Others will probably work, but untested.*
+*Only PostgreSQL is tested or supported for AR(from root repo). Others will probably work, but untested.*
 
 And then execute:
 
@@ -27,7 +27,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install rocket_cms
+    $ gem install ack_rocket_cms
 
 For activerecord, generate migrations and run them
 
@@ -60,7 +60,7 @@ generator creates a new RVM gemset, so after cd'ing to app dir, you should run `
 
 ### Documentation
 
-It's basically Mongoid + Rails Admin + some of our common models and controllers, capistrano config, etc.
+It's basically Mongoid + Rails Admin + some of my common models and controllers, capistrano config (from root repo), etc.
 
 See their documentation for more info
 

data/app/controllers/concerns/rs_pages.rb

@@ -38,4 +38,31 @@ module RsPages
     page
   end
 
+
+  def find_seo_page_with_redirect(path)
+    do_redirect = false
+    if path[0] != '/'
+      path = '/' + path
+    end
+    if path.length > 1 && path[-1] == '/'
+      path = path[0..-2]
+      do_redirect = true
+    end
+
+    page = Page.enabled.any_of({fullpath: path}, {redirect: path}).first
+    if page.nil?
+      do_redirect = true
+      spath = path.chomp(File.extname(path))
+      if spath != path
+        page = Page.enabled.any_of({fullpath: spath}, {redirect: spath}).first
+      end
+    end
+    if !page.nil? && do_redirect
+      redirect_to path, status: :moved_permanently
+    end
+
+    page
+
+  end
+
 end

data/config/locales/ru.models.yml

@@ -46,6 +46,9 @@ ru:
     attributes:
       user:
         email: E-mail
+        name: ФИО
+        login: Логин
+        roles: "Права доступа"
         old_password: Текущий пароль
         password: Пароль
         password_confirmation: Подтвердите пароль

data/lib/rocket_cms/admin.rb

@@ -121,6 +121,19 @@ module RocketCMS
           field :image
         end
         field :excerpt
+        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
+
         RocketCMS.apply_patches self
 
         edit do

data/lib/rocket_cms/controllers/news.rb

@@ -13,6 +13,11 @@ module RocketCMS
 
       def show
         @news = model.after_now.find(params[:id])
+
+        if @news and @news.text_slug != params[:id]
+          redirect_to @news, status_code: 301
+          return true
+        end
       end
       
       private

data/lib/rocket_cms/controllers/pages.rb

@@ -4,13 +4,13 @@ module RocketCMS
       extend ActiveSupport::Concern
       def show
         if @seo_page.nil? || !@seo_page.persisted?
-          unless params[:id].blank?
-            @seo_page = Page.enabled.find(params[:id])
+          if !params[:id].blank? or !params[:slug].blank?
+            @seo_page = Page.enabled.find(params[:id] || params[:slug])
           end
         end
         if @seo_page.nil?
           render_404
-          return
+          return true
         end
       end
     end

data/lib/rocket_cms/models/menu.rb

@@ -21,7 +21,6 @@ module RocketCMS
 
         has_and_belongs_to_many :pages, inverse_of: :menus
         alias_method :items, :pages
-        manual_slug :name
       end
     end
   end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.2.1"
+  VERSION = "0.7.2.2"
 end

data/template.rb

@@ -206,7 +206,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
 
   field :name,    type: String
   field :login,   type: String
-  field :roles,   type: Array
+  field :roles,   type: Array, default: []
 
   before_save do
     self.roles.reject! { |r| r.blank? }
@@ -342,7 +342,7 @@ admin_pw = SecureRandom.urlsafe_base64(6)
 create_file 'db/seeds.rb' do <<-TEXT
 admin_pw = "#{admin_pw}"
 User.destroy_all
-User.create!(email: 'admin@#{app_name.dasherize.downcase}.ru', password: admin_pw, password_confirmation: admin_pw)
+User.create!(email: 'admin@#{app_name.dasherize.downcase}.ru', password: admin_pw, password_confirmation: admin_pw, roles: ["admin"])
 TEXT
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.2.1
+  version: 0.7.2.2
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler