ack_rocket_cms 0.8.2 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e33e7acc64054a4dd51d9937ebe3d041f6feabd
-  data.tar.gz: ea547035e193c9a8e691588f3304787191aa790a
+  metadata.gz: 5e35b8bd53dfff5fe5474dbf033c3ac8a2830cf7
+  data.tar.gz: f6d188b33c9618a88a7b5737a0ab4811ff42027e
 SHA512:
-  metadata.gz: 90706ad746c30a490c29e78ee23f5219ae7cb8ab283e222aad489f416385c15970f037eb24fca56cb368f0316ea8a1ed0597e61b4ebea0e06f4988990303563f
-  data.tar.gz: 7768a9ebaabb4120f7bbff96d0e4e15560e36c7fff30aa4a123af590585ef8aa84f3829372520ab20278b1da55f4b4ae38457ea93043e02f506d7aba52cbf903
+  metadata.gz: 5283a162baddab8afb493637a3e62b668c52a921278c01ecd0ecb63290e1d256cb38cb478fccaceef2a5526aef8a1f970c35e532edc106b044e1245204e0207b
+  data.tar.gz: 036880209f68f49eb5785af5ad8eb83f36f9a969a0915c2e544591fe4af2e90bb4a7010e89df3e9ec1f7de91f93c076577b2507f692c2f518fb182a330cc7049

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.8.2)
+    ack_rocket_cms (0.9)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -34,36 +34,36 @@ GEM
       mini_magick
       rails (>= 3.0.0)
       rails_admin (>= 0.3.0)
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
       globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
       arel (~> 6.0)
-    activesupport (4.2.3)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -72,9 +72,9 @@ GEM
     addressable (2.3.8)
     arel (6.0.3)
     bcrypt (3.1.10)
-    bson (3.2.1)
+    bson (3.2.6)
     builder (3.2.2)
-    ckeditor (4.1.3)
+    ckeditor (4.1.4)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
@@ -88,7 +88,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1.1)
-    connection_pool (2.2.0)
     devise (3.5.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -97,10 +96,10 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.5.2)
+    execjs (2.6.0)
     font-awesome-rails (4.4.0.0)
       railties (>= 3.2, < 5.0)
-    geocoder (1.2.9)
+    geocoder (1.2.11)
     glebtv-simple_captcha (0.6.7)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
@@ -108,7 +107,7 @@ GEM
       tilt
     htmlentities (4.3.4)
     i18n (0.7.0)
-    jquery-rails (4.0.4)
+    jquery-rails (4.0.5)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -118,27 +117,24 @@ GEM
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    mini_magick (4.2.10)
+    mime-types (2.6.2)
+    mini_magick (4.3.6)
     mini_portile (0.6.2)
-    minitest (5.8.0)
-    mongoid (4.0.2)
+    minitest (5.8.1)
+    mongo (2.1.1)
+      bson (~> 3.0)
+    mongoid (5.0.0)
       activemodel (~> 4.0)
-      moped (~> 2.0.0)
+      mongo (~> 2.1)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.6)
-      bson (~> 3.0)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
     nested_form (0.3.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    optionable (0.2.0)
     origin (2.1.1)
     orm_adapter (0.5.0)
     rack (1.6.4)
@@ -147,26 +143,26 @@ GEM
       rack (~> 1.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    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)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
+      railties (= 4.2.4)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    rails_admin (0.6.8)
+    rails_admin (0.7.0)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0, < 5)
@@ -190,9 +186,9 @@ GEM
     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)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -200,16 +196,16 @@ GEM
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     safe_yaml (1.0.4)
-    sass (3.4.16)
-    sass-rails (5.0.3)
+    sass (3.4.19)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     simple-navigation (4.0.3)
       activesupport (>= 2.3.2)
-    simple_form (3.1.0)
+    simple_form (3.2.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
     sitemap_generator (5.1.0)
@@ -217,16 +213,16 @@ GEM
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (3.2.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.2)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     stringex (2.5.2)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.1)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
@@ -248,4 +244,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.10.2
+   1.10.6

data/app/controllers/concerns/rs_errors.rb

@@ -84,7 +84,7 @@ module RsErrors
   end
 
   def render_error(code = 500)
-    render template: "errors/error_#{code}", formats: [:html], handlers: [:haml, :slim], layout: RocketCMS.config.error_layout, status: code
+    render template: "errors/error_#{code}", formats: [:html], handlers: [:slim], layout: RocketCMS.config.error_layout, status: code
   end
 
   def rails_admin?

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?
@@ -32,10 +32,10 @@ module RsMenu
       SimpleNavigation.config.autogenerate_item_ids = false
       begin
         nav_extra_data_before(type, primary)
-        items = nav_get_menu_items(type)
-        items = items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }
+        all_items = nav_get_menu_items(type)
+        items = all_items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }
         items.each do |item|
-          render_with_subs(items, primary, item)
+          render_with_subs(all_items, primary, item)
         end
         nav_extra_data_after(type, primary)
       rescue Exception => exception
@@ -62,4 +62,3 @@ module RsMenu
     # override for additional config or items
   end
 end
-

data/lib/rocket_cms/admin.rb

@@ -19,7 +19,7 @@ module RocketCMS
         end
       }
     end
-    
+
     def seo_config(is_active = true)
       Proc.new {
         if respond_to?(:active)
@@ -51,7 +51,7 @@ module RocketCMS
         end
       end
     end
-    
+
     def page_config(fields = {})
       Proc.new {
         RocketCMS.apply_patches self
@@ -124,7 +124,7 @@ module RocketCMS
         end
       }
     end
-    
+
     def menu_config
       Proc.new {
         navigation_label 'CMS'
@@ -140,11 +140,11 @@ module RocketCMS
         end
       }
     end
-    
+
     def contact_message_config
       Proc.new {
         navigation_label I18n.t('rs.settings')
-        field :created_at do
+        field :c_at do
           read_only true
         end
         field :name
@@ -152,12 +152,21 @@ module RocketCMS
         field :email
         field :phone
 
-        RocketCMS.apply_patches self
-        RocketCMS.only_patches self, [:show, :list, :edit, :export]
+        RocketCMS.config.contacts_fields.each_pair do |fn, ft|
+          next if ft.nil?
+          if ft.is_a?(Array)
+            field fn, ft[1].to_sym
+          else
+            field fn
+          end
+        end
 
         if block_given?
           yield
         end
+
+        RocketCMS.apply_patches self
+        RocketCMS.only_patches self, [:show, :list, :edit, :export]
       }
     end
 

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

@@ -17,6 +17,13 @@ module RocketCMS
 
           scope :sorted, -> { order_by([:lft, :asc]) }
           scope :menu, ->(menu_id) { enabled.sorted.where(menu_ids: menu_id) }
+
+          def page_h1
+            _ret = h1
+            _ret = name   if _ret.blank?
+            _ret = title  if _ret.blank?
+            _ret
+          end
         end
       end
     end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.8.2"
+  VERSION = "0.9"
 end

data/template.rb

@@ -14,7 +14,7 @@ remove_file 'Gemfile'
 create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.3'
+gem 'rails', '4.2.4'
 #{if mongoid then "gem 'mongoid', '~> 4.0.0'" else "gem 'pg'" end}
 
 # gem 'sass'
@@ -56,6 +56,8 @@ group :development do
 
   gem 'favicon_maker', '0.3'
   gem 'favicon_maker_rails'
+
+  gem 'rails_email_preview', '~> 0.2.29'
 end
 
 group :test do
@@ -105,6 +107,78 @@ end
 
 create_file 'extra/.gitkeep', ''
 
+generate 'rails_email_preview:install'
+remove_file 'app/mailer_previews/contact_mailer_preview.rb'
+create_file 'app/mailer_previews/contact_mailer_preview.rb' do <<-TEXT
+class ContactMailerPreview
+  def new_message_email
+    ContactMailer.new_message_email(ContactMessage.all.to_a.sample)
+  end
+end
+TEXT
+end
+
+if mongoid
+remove_file 'config/initializers/embedded_findable.rb'
+create_file 'config/initializers/embedded_findable.rb' do  <<-TEXT
+module Mongoid
+
+  # Helps to override find method in an embedded document.
+  # Usage :
+  #   - add to your model "include Mongoid::EmbeddedFindable"
+  #   - override find method with:
+  #     def self.find(id)
+  #       find_through(Book, 'chapter', id)
+  #     end
+  module EmbeddedFindable
+
+    extend ActiveSupport::Concern
+
+    included do
+
+      # Search an embedded document by id.
+      #
+      # Document is stored within embedding_class collection, and can be accessed through provided relation.
+      # Also supports chained relationships (if the searched document is nested in several embedded documents)
+      #
+      # Example, with a chapter embedded in a book, the book being embedded in a library.
+      # use find_through(Library, "books", book_id) in Book class
+      # and find_through(Library, "books.chapters", chapter_id) in Chapter class
+      def self.find_through(embedding_class, relation, id = nil)
+        return nil if id.nil? || id.blank?
+
+        id = BSON::ObjectId.from_string(id) if id.is_a?(String)
+        relation = relation.to_s unless relation.is_a?(String)
+
+        relation_parts = relation.split('.')
+        parent = embedding_class.send(:all)
+
+        while relation_parts.length > 0
+          item = if parent.is_a?(Mongoid::Criteria) || parent.is_a?(Array)
+                   parent.where("#{relation_parts.join('.')}._id" => id).first
+                 else
+                   parent
+                 end
+          return nil if item.nil?
+          parent = item.send(relation_parts.shift)
+        end
+
+        if parent.is_a?(Mongoid::Criteria) || parent.is_a?(Array)
+          parent.where('_id' => id).first
+        else
+          parent
+        end
+      end
+
+    end
+
+  end
+
+end
+TEXT
+end
+end
+
 if mongoid
 remove_file 'config/initializers/cookies_serializer.rb'
 create_file 'config/initializers/cookies_serializer.rb' do  <<-TEXT
@@ -145,7 +219,7 @@ end
 
 create_file 'README.md', "## #{app_name}\nProject generated by RocketCMS\nORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}\n\n"
 
-create_file '.ruby-version', "2.2.2\n"
+create_file '.ruby-version', "2.2.3\n"
 create_file '.ruby-gemset', "#{app_name}\n"
 
 run 'bundle install --without production'
@@ -424,7 +498,7 @@ body.rails_admin .modal
   margin: 0 auto !important
   .modal-dialog
     width: 990px !important
-  
+
 input[type=checkbox]
   width: 30px !important
 
@@ -633,4 +707,3 @@ end
 git :init
 git add: "."
 git commit: %Q{ -m 'Initial commit' }
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: '0.9'
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -566,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use ack_rocket_cms_mongoid or ack_rocket_cms_activerecord