rocket_cms 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95971eec71ab1ccd3dde678684018ba68aeb7a46
-  data.tar.gz: 057425d0d665bf2e6168e652de3e14be7671f09f
+  metadata.gz: c6e0d9e9cf984eb0984a927670f1c3c2ca7b87f5
+  data.tar.gz: 0a5566b70c90065d2c04cc7f0971061cb92d3121
 SHA512:
-  metadata.gz: c33fef7e1df446f2f5d728c097187fc74cc963b024d3d2625dd6e15472f661f00bf083e81f3ca32862b4278c76a85ea510f625c993e573c758b65c2faffc59fc
-  data.tar.gz: d91076a1b71e42e2148c8028774097e9c2f1c51a7b274fe8e00ee4eecea1d2bc269eb5bcbea0f655938095eeef51e0f70a00a808f33c49cf3855e27a118f3737
+  metadata.gz: 579da554c8ff0286e4c7d251491787cab81f1ec262755a2cb6cc077e709c8d1e0b69983d175e71fc4edada269e557a5bd6febadf6acd99f0717be1f05107412c
+  data.tar.gz: 11ab1d599ee2af09fa11ca16c5dc57d1222ebcd08f3149ed211c88e2374f2eabb48b3942766b8e5fa8845f00a85306fbf16b74c9b8a7abf9f26e219b2124b237

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile.lock

@@ -0,0 +1,259 @@
+PATH
+  remote: .
+  specs:
+    rocket_cms (0.2.12)
+      addressable
+      coffee-rails
+      devise
+      geocoder
+      glebtv-ckeditor
+      glebtv-mongoid-paperclip
+      glebtv-mongoid_nested_set
+      glebtv-simple_captcha
+      htmlentities
+      jquery-rails
+      kaminari
+      mongoid (~> 4.0.0.beta1)
+      mongoid-audit
+      mongoid_slug
+      rails (~> 4.1.4)
+      rails_admin
+      rails_admin_nested_set
+      rails_admin_settings
+      rails_admin_toggleable
+      sanitize
+      simple-navigation
+      simple_form
+      sitemap_generator
+      thor
+      turbolinks
+      uglifier
+      unicorn
+      validates_email_format_of
+      x-real-ip
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      mail (~> 2.5.4)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
+      arel (~> 5.0.0)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    arel (5.0.1.20140414130214)
+    bcrypt (3.1.7)
+    bson (2.3.0)
+    builder (3.2.2)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.4)
+      climate_control (>= 0.0.3, < 1.0)
+    coffee-rails (4.0.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.1)
+    connection_pool (2.0.0)
+    crass (0.2.1)
+    devise (3.2.4)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
+    easy_diff (0.0.3)
+    erubis (2.7.0)
+    execjs (2.2.1)
+    font-awesome-rails (4.1.0.0)
+      railties (>= 3.2, < 5.0)
+    geocoder (1.2.3)
+    glebtv-ckeditor (4.4.3.0)
+      mime-types
+      orm_adapter (~> 0.5.0)
+      rails (~> 4.0)
+    glebtv-mongoid-paperclip (0.2.4)
+      mongoid (>= 3.0, < 5.0)
+      paperclip (>= 2.3.6)
+    glebtv-mongoid_nested_set (0.4.3)
+      mongoid (>= 3.1.0, < 4.1)
+    glebtv-simple_captcha (0.6.3)
+    haml (4.0.5)
+      tilt
+    hike (1.2.3)
+    htmlentities (4.3.2)
+    i18n (0.6.11)
+    jquery-rails (3.1.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.2.1)
+      railties (>= 3.2.16)
+    json (1.8.1)
+    kaminari (0.16.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    kgio (2.9.2)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    minitest (5.4.0)
+    mongoid (4.0.0)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    mongoid-audit (0.3.2)
+      easy_diff (~> 0.0.2)
+      mongoid (~> 4.0.0.alpha1)
+      rails-observers (~> 0.1.2)
+    mongoid_slug (3.2.1)
+      mongoid (> 3.0)
+      stringex (~> 2.0)
+    moped (2.0.0)
+      bson (~> 2.2)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    multi_json (1.10.1)
+    nested_form (0.3.2)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    nokogumbo (1.1.9)
+      nokogiri
+    optionable (0.2.0)
+    origin (2.1.1)
+    orm_adapter (0.5.0)
+    paperclip (4.2.0)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
+      mime-types
+    polyglot (0.3.5)
+    rack (1.5.2)
+    rack-pjax (0.7.0)
+      nokogiri (~> 1.5)
+      rack (~> 1.3)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.1.4)
+      actionmailer (= 4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      activemodel (= 4.1.4)
+      activerecord (= 4.1.4)
+      activesupport (= 4.1.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.4)
+      sprockets-rails (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
+    rails_admin (0.6.2)
+      builder (~> 3.1)
+      coffee-rails (~> 4.0)
+      font-awesome-rails (>= 3.0)
+      haml (~> 4.0)
+      jquery-rails (~> 3.0)
+      jquery-ui-rails (~> 4.0)
+      kaminari (~> 0.14)
+      nested_form (~> 0.3)
+      rack-pjax (~> 0.7)
+      rails (~> 4.0)
+      remotipart (~> 1.0)
+      safe_yaml (~> 1.0)
+      sass-rails (~> 4.0)
+    rails_admin_nested_set (0.3.6)
+    rails_admin_settings (0.7.8)
+      mongoid (>= 3.1)
+    rails_admin_toggleable (0.4.1)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    raindrops (0.13.0)
+    rake (10.3.2)
+    remotipart (1.2.1)
+    rpatricia (1.0.1)
+    safe_yaml (1.0.3)
+    sanitize (3.0.0)
+      crass (~> 0.2.0)
+      nokogiri (>= 1.4.4)
+      nokogumbo (= 1.1.9)
+    sass (3.3.11)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
+      sass (>= 3.1.10)
+      sprockets-rails (~> 2.0.0)
+    simple-navigation (3.13.0)
+      activesupport (>= 2.3.2)
+    simple_form (3.0.2)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
+    sitemap_generator (5.0.4)
+      builder
+    sprockets (2.12.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    stringex (2.5.2)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    turbolinks (2.2.2)
+      coffee-rails
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+    uglifier (2.5.3)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    unicorn (4.8.3)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
+    validates_email_format_of (1.5.3)
+    warden (1.2.3)
+      rack (>= 1.0)
+    x-real-ip (0.1.2)
+      activesupport
+      rack
+      rpatricia (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  rake
+  rocket_cms!

data/app/views/shared/_obj.html.haml

@@ -1,6 +1,6 @@
 - unless obj.nil?
   .text_content
-    - unless obj.h1.blank?
+    - if (!defined?(h1) || h1) && !obj.h1.blank?
       %h1= obj.h1
     - if obj.content.blank?
       - unless @seo_page.nil?

data/lib/rocket_cms/engine.rb

@@ -1,4 +1,46 @@
 module RocketCMS
   class Engine < ::Rails::Engine
+    rake_tasks do
+      require File.expand_path('../tasks', __FILE__)
+    end
+
+    initializer "rocket_cms.ckeditor" do
+      if Object.const_defined?("Ckeditor")
+        Ckeditor.setup do |config|
+          require "ckeditor/orm/mongoid"
+        end
+      end
+    end
+
+    initializer "rocket_cms.email_defaults" do
+      # Write default email settings to DB so they can be changed.
+      Settings.default_email_from(default: 'noreply@rscx.ru')
+      Settings.form_email(default: 'glebtv@ya.ru')
+      Settings.email_topic(default: 'с сайта')
+    end
+
+    initializer 'rocket_cms.mongoid-audit' do
+      Mongoid::Audit.tracker_class_name = :history_tracker
+      Mongoid::Audit.current_user_method = :current_user
+      Mongoid::Audit.modifier_class_name = "User"
+      require_dependency 'history_tracker.rb' if Rails.env.development?
+    end
+
+    initializer 'rocket_cms.paperclip' do
+      require 'paperclip/style'
+      module ::Paperclip
+        class Style
+          alias_method :processor_options_without_auto_orient, :processor_options
+          def processor_options
+            processor_options_without_auto_orient.merge(auto_orient: false)
+          end
+        end
+      end
+    end
+
+    config.after_initialize do
+      # trigger autoload so models are registered in Mongoid::Elasticearch
+      RocketCMS.configuration.search_models.map(&:constantize)
+    end
   end
 end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCms
-  VERSION = "0.2.10"
+  VERSION = "0.2.12"
 end

data/lib/rocket_cms.rb

@@ -44,7 +44,6 @@ require 'rocket_cms/elastic_search' # FTS, optional
 require 'rocket_cms/model'
 require 'rocket_cms/rails_admin_menu'
 require 'rocket_cms/engine'
-require 'rocket_cms/railtie'
 require 'rocket_cms/controller'
 
 module RocketCMS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -457,6 +457,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -554,7 +555,6 @@ files:
 - lib/rocket_cms/models/page.rb
 - lib/rocket_cms/patch.rb
 - lib/rocket_cms/rails_admin_menu.rb
-- lib/rocket_cms/railtie.rb
 - lib/rocket_cms/tasks.rb
 - lib/rocket_cms/version.rb
 - lib/smart_excerpt.rb

data/lib/rocket_cms/railtie.rb

@@ -1,39 +0,0 @@
-module RocketCMS
-  class Railtie < Rails::Railtie
-    rake_tasks do
-      require File.expand_path('../tasks', __FILE__)
-    end
-
-    initializer "rocket_cms.ckeditor" do
-      if Object.const_defined?("Ckeditor")
-        Ckeditor.setup do |config|
-          require "ckeditor/orm/mongoid"
-        end
-      end
-    end
-
-    initializer 'rocket_cms.mongoid-audit' do
-      Mongoid::Audit.tracker_class_name = :history_tracker
-      Mongoid::Audit.current_user_method = :current_user
-      Mongoid::Audit.modifier_class_name = "User"
-      require_dependency 'history_tracker.rb' if Rails.env.development?
-    end
-
-    initializer 'rocket_cms.paperclip' do
-      require 'paperclip/style'
-      module ::Paperclip
-        class Style
-          alias_method :processor_options_without_auto_orient, :processor_options
-          def processor_options
-            processor_options_without_auto_orient.merge(auto_orient: false)
-          end
-        end
-      end
-    end
-
-    config.after_initialize do
-      # trigger autoload so models are registered in Mongoid::Elasticearch
-      RocketCMS.configuration.search_models.map(&:constantize)
-    end
-  end
-end