ack_rocket_cms 0.7.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f562bee2585c443d8d86188edf4930f31dcc9d1e
-  data.tar.gz: 29510850bf9dd6b7bd79bde2e653c37d9aeb6ed8
+  metadata.gz: 2b4be58e811a9fe7a30b6ae6c5dc4afcf8fb4224
+  data.tar.gz: 539440be1663279ea0e98d7698b1212fef5066e2
 SHA512:
-  metadata.gz: 48a915514b32c086f6e77ee06d4b614bbe7ee2ad317efd7ddb691702263b26efbd06ed06cc75e6fb42cb9119e83263062c6486ff6048923f4f4961c64fe21811
-  data.tar.gz: b4b15b2b11b2f39c611fa76d3447fcfa2cbf60740b017747b59504b8efaed1baf726b6036e15ec16b2154657afdd089a958230ff634e20757057e221fc732b59
+  metadata.gz: 5698b19ec72e2357d9d4a1eea81bc1c2e90fcb694e93495c3b866a37e9948d1537286fe934183e497882066e40dbed58ac1bc1f58855559d40d81d90595a845d
+  data.tar.gz: 0c8816d2f174cc7453a2401c132da4f8cd81c396d245c1d9ae54741aa260156ec1824bc7db8fe3b23c5da44fae0c5bd1298dd7a98f3576fd02330a00f2f3116d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.7.1)
+    ack_rocket_cms (0.8.0)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -30,49 +30,49 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ack_rails_admin_jcrop (0.0.5)
+    ack_rails_admin_jcrop (0.0.6)
       mini_magick
       rails (>= 3.0.0)
       rails_admin (>= 0.3.0)
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    arel (6.0.0)
+    arel (6.0.2)
     bcrypt (3.1.10)
-    bson (3.1.0)
+    bson (3.1.2)
     builder (3.2.2)
     ckeditor (4.1.2)
       cocaine
@@ -106,9 +106,9 @@ GEM
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
-    htmlentities (4.3.3)
+    htmlentities (4.3.4)
     i18n (0.7.0)
-    jquery-rails (4.0.3)
+    jquery-rails (4.0.4)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -141,22 +141,22 @@ GEM
     optionable (0.2.0)
     origin (2.1.1)
     orm_adapter (0.5.0)
-    rack (1.6.1)
+    rack (1.6.4)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)
       rack (~> 1.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -185,14 +185,14 @@ GEM
       mongoid (>= 3.0)
       rails (>= 3.0)
       rails_admin (>= 0.5)
-    rails_admin_nested_set (0.4.2)
-      rails_admin (~> 0.6.6)
-    rails_admin_settings (1.0.0)
-    rails_admin_toggleable (0.5.0)
-      rails_admin (~> 0.6.6)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails_admin_nested_set (0.4.4)
+      rails_admin
+    rails_admin_settings (1.0.1)
+    rails_admin_toggleable (0.5.1)
+      rails_admin
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -200,7 +200,7 @@ GEM
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     safe_yaml (1.0.4)
-    sass (3.4.14)
+    sass (3.4.16)
     sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -219,7 +219,7 @@ GEM
       htmlentities
     sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

data/README.md

@@ -1,13 +1,10 @@
 # RocketCMS
 
-rails_admin + mongoid/activerecord + elasticsearch CMS
+Rails + RailsAdmin + Mongoid/PostgreSQL + Elasticsearch CMS
 
 Very opinionated and tuned for my needs.
 
-Sorry, no documentation or examples are availiable yet. Stay tuned
-
-**Before 1.0 API and class names should be considered unstable and can change at
-any time!**
+**Before 1.0 API and class names should be considered unstable and can change at any time!**
 
 ## Installation
 
@@ -58,6 +55,68 @@ for ActiveRecord:
 
 generator creates a new RVM gemset, so after cd'ing to app dir, you should run `bundle install` again if you use rvm.
 
+### Localization
+
+All models included in the gem support localization via either [hstore_translate](https://github.com/Leadformance/hstore_translate) or built-in Mongoid localize: true option.
+
+You can get a nice admin UI for editing locales by adding [rails_admin_hstore_translate](https://github.com/glebtv/rails_admin_hstore_translate) or [rails_admin_mongoid_localize_field](https://github.com/sudosu/rails_admin_mongoid_localize_field)
+
+Add to: ```app/models/page.rb```
+
+```ruby
+class Page < ActiveRecord::Base
+  include RocketCMS::Models::Page
+  RocketCMS.apply_patches self
+  rails_admin &RocketCMS.page_config
+
+  def regexp_prefix
+    "(?:\/ru|\/en)?"
+  end
+end
+```
+
+Wrap your routes with locale scope:
+
+```ruby
+scope "(:locale)", locale: /en|ru/ do
+  get 'contacts' => 'contacts#new', as: :contacts
+  post 'contacts' => 'contacts#create', as: :create_contacts
+end
+```
+
+Add to application_controller.rb:
+
+```ruby
+class ApplicationController < ActionController::Base
+  include RocketCMS::Controller
+  include RsLocalizeable
+end
+```
+
+Enable localization in RocketCMS:
+
+```ruby
+RocketCMS.configure do |rc|
+  rc.news_image_styles = {small: '107x126#'}
+  rc.contacts_captcha = true
+  rc.contacts_message_required = true
+  ...
+  rc.localize = true
+end
+```
+
+Add ```rails_admin_hstore_translate``` or ```hstore_translate``` gem if using PostgreSQL:
+
+```ruby
+gem 'rails_admin_hstore_translate'
+```
+
+or
+
+```ruby
+gem 'hstore_translate'
+```
+
 ### Documentation
 
 It's basically Mongoid + Rails Admin + some of my common models and controllers, capistrano config (from root repo), etc.

data/app/assets/javascripts/{rocket_cms.js.coffee → rocket_cms.coffee}

@@ -4,7 +4,4 @@
 #= require head.load.js
 #= require rocket_cms/map
 #= require rocket_cms/flash
-#= require jquery.placeholder.js
 
-$(document).on 'page:change', ->
-  $('input, textarea').placeholder()

data/app/controllers/concerns/rs_errors.rb

@@ -43,7 +43,7 @@ module RsErrors
     end
   end
 
-  protected
+  private
   def render_404(exception = nil)
     Rails.logger.error "__________________________"
     Rails.logger.error "Error 404"
@@ -71,16 +71,20 @@ module RsErrors
     Rails.logger.error "__________________________"
     begin
       if rails_admin?
-        render text: t('rs.errors.internal_error'), status: 500
+        render text: t('rs.errors.internal_error', klass: exception.class.name, message: exception.message), status: 500
         return
       end
-    rescue
+    rescue Exception => e
+      puts "error while rendering rails admin exception"
+      puts e.class.name
+      puts e.message
+      puts e.backtrace.join("\n")
     end
     render_error(500)
   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.config.error_layout, status: code
   end
 
   def rails_admin?

data/app/controllers/concerns/rs_localizeable.rb

@@ -0,0 +1,26 @@
+module RsLocalizeable
+  extend ActiveSupport::Concern
+  included do
+    before_filter do
+      I18n.locale = params[:locale] || I18n.default_locale
+      Settings.ns_default = "main_#{I18n.locale}"
+      Settings.ns_fallback = "main"
+    end
+  end
+  private
+  def default_url_options(options={})
+    {locale: params[:locale]}
+  end
+  def nav_get_menu_items(type)
+    pages = ::Menu.find(type.to_s).pages.enabled
+    pages = pages.where(["EXIST(name_translations, ?) = TRUE AND name_translations -> ? != ''", I18n.locale, I18n.locale])
+    pages.sorted.to_a
+  end
+  def nav_get_url(item)
+    (params[:locale].blank? ? "" : "/#{params[:locale]}") + (item.redirect.blank? ? item.fullpath : item.redirect)
+  end
+  def find_seo_extra(path)
+    Page.enabled.where(fullpath: path.gsub(/(\/ru|\/en)/, "")).first
+  end
+end
+

data/app/controllers/concerns/rs_menu.rb

@@ -4,6 +4,7 @@ module RsMenu
     helper_method :navigation
   end
 
+  private
   def render_with_subs(items, primary, item)
     subs = items.select { |i| i.parent_id == item.id && !i.name.blank? && i.enabled }
     if subs.empty?
@@ -18,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
@@ -31,7 +32,7 @@ module RsMenu
       SimpleNavigation.config.autogenerate_item_ids = false
       begin
         nav_extra_data_before(type, primary)
-        items = ::Menu.find(type.to_s).pages.enabled.sorted.to_a
+        items = nav_get_menu_items(type)
         items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }.each do |item|
           render_with_subs(items, primary, item) if primary
         end
@@ -45,6 +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

@@ -5,7 +5,6 @@ module RsPages
   end
 
   private
-
   def find_page
     return if rails_admin?
     @seo_page = find_seo_page request.path
@@ -23,8 +22,16 @@ 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?
+      page = find_seo_extra(path)
+    end
+
     if page.nil?
       do_redirect = true
       spath = path.chomp(File.extname(path))
@@ -32,6 +39,7 @@ module RsPages
         page = Page.enabled.where(fullpath: spath).first
       end
     end
+
     if !page.nil? && do_redirect
       redirect_to path, status: :moved_permanently
     end
@@ -39,7 +47,6 @@ module RsPages
     page
   end
 
-
   def find_seo_page_with_redirect(path)
     do_redirect = false
     if path[0] != '/'
@@ -65,6 +72,10 @@ module RsPages
     page
 
   end
+  
+  def find_seo_extra(path)
+    nil
+  end
 
   def rails_admin?
     self.is_a?(RailsAdmin::ApplicationController) || self.is_a?(RailsAdmin::MainController)

data/app/helpers/gzip_helper.rb

@@ -0,0 +1,27 @@
+module GzipHelper
+  def gzip_javascript_include_tag(*sources)
+    # Grab the asset html include tag
+    tag = javascript_include_tag *sources
+
+    # If we are in production and the requesting client accepts gzip encoding, swap for the gzip asset
+    if Rails.env.production? && request.accept_encoding =~ /gzip/i
+      tag = tag.gsub(/\.js/i, ".js.gz")
+    end
+
+    # Return the asset whether or not it was modified
+    tag.html_safe
+  end
+
+  def gzip_stylesheet_link_tag(*sources)
+    # Grab the asset html include tag
+    tag = stylesheet_link_tag *sources
+
+    # If we are in production and the requesting client accepts gzip encoding, swap for the gzip asset
+    if Rails.env.production? && request.accept_encoding =~ /gzip/i
+      tag = tag.gsub(/\.css/i, ".css.gz")
+    end
+
+    # Return the asset whether or not it was modified
+    tag.html_safe
+  end
+end