rocket_cms 0.2.12 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6e0d9e9cf984eb0984a927670f1c3c2ca7b87f5
-  data.tar.gz: 0a5566b70c90065d2c04cc7f0971061cb92d3121
+  metadata.gz: 7d4d75cd01fdb13e91150906f4a31ed2a5a60782
+  data.tar.gz: 5b07cbc29d48f200fca79622a227416c2a1300dd
 SHA512:
-  metadata.gz: 579da554c8ff0286e4c7d251491787cab81f1ec262755a2cb6cc077e709c8d1e0b69983d175e71fc4edada269e557a5bd6febadf6acd99f0717be1f05107412c
-  data.tar.gz: 11ab1d599ee2af09fa11ca16c5dc57d1222ebcd08f3149ed211c88e2374f2eabb48b3942766b8e5fa8845f00a85306fbf16b74c9b8a7abf9f26e219b2124b237
+  metadata.gz: 908ab06ef43903eb537029ec3d3ffb5f869ec5722bda85d4250a476d489fe38adf47ecd1b2613db26ceed99e7bdd5745646696428270914f1a66188335546de9
+  data.tar.gz: 730acde6e1c246f2db8994c6245a1d2d8ed32b85caf097fef23265e89447d0a3b13c5f3bfe936d498fa5055c443cf83bfd78b5f9761e4ac60078dd06ccc500e1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.2.12)
+    rocket_cms (0.3.2)
       addressable
       coffee-rails
       devise
@@ -13,13 +13,13 @@ PATH
       htmlentities
       jquery-rails
       kaminari
-      mongoid (~> 4.0.0.beta1)
-      mongoid-audit
+      mongoid (~> 4.0.0)
+      mongoid-audit (~> 1.0.0.alpha.1)
       mongoid_slug
-      rails (~> 4.1.4)
+      rails (>= 4.1.0, < 5.0.0)
       rails_admin
       rails_admin_nested_set
-      rails_admin_settings
+      rails_admin_settings (~> 0.8.0)
       rails_admin_toggleable
       sanitize
       simple-navigation
@@ -35,27 +35,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.4)
-      actionpack (= 4.1.4)
-      actionview (= 4.1.4)
+    actionmailer (4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
       mail (~> 2.5.4)
-    actionpack (4.1.4)
-      actionview (= 4.1.4)
-      activesupport (= 4.1.4)
+    actionpack (4.1.5)
+      actionview (= 4.1.5)
+      activesupport (= 4.1.5)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.4)
-      activesupport (= 4.1.4)
+    actionview (4.1.5)
+      activesupport (= 4.1.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.4)
-      activesupport (= 4.1.4)
+    activemodel (4.1.5)
+      activesupport (= 4.1.5)
       builder (~> 3.1)
-    activerecord (4.1.4)
-      activemodel (= 4.1.4)
-      activesupport (= 4.1.4)
+    activerecord (4.1.5)
+      activemodel (= 4.1.5)
+      activesupport (= 4.1.5)
       arel (~> 5.0.0)
-    activesupport (4.1.4)
+    activesupport (4.1.5)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -79,7 +79,7 @@ GEM
     coffee-script-source (1.7.1)
     connection_pool (2.0.0)
     crass (0.2.1)
-    devise (3.2.4)
+    devise (3.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -90,8 +90,8 @@ GEM
     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)
+    geocoder (1.2.4)
+    glebtv-ckeditor (4.4.3.2)
       mime-types
       orm_adapter (~> 0.5.0)
       rails (~> 4.0)
@@ -101,6 +101,8 @@ GEM
     glebtv-mongoid_nested_set (0.4.3)
       mongoid (>= 3.1.0, < 4.1)
     glebtv-simple_captcha (0.6.3)
+    glebtv_mongoid_userstamp (0.4.1)
+      mongoid (~> 4.0.0.beta1)
     haml (4.0.5)
       tilt
     hike (1.2.3)
@@ -127,10 +129,16 @@ GEM
       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-audit (1.0.0.alpha.2)
+      activesupport
+      glebtv_mongoid_userstamp
+      kaminari
+      mongoid (~> 4.0.0)
+      mongoid-history (~> 0.4.4)
+    mongoid-history (0.4.4)
+      activesupport
+      easy_diff
+      mongoid (>= 3.0)
     mongoid_slug (3.2.1)
       mongoid (> 3.0)
       stringex (~> 2.0)
@@ -154,24 +162,22 @@ GEM
       mime-types
     polyglot (0.3.5)
     rack (1.5.2)
-    rack-pjax (0.7.0)
+    rack-pjax (0.8.0)
       nokogiri (~> 1.5)
-      rack (~> 1.3)
+      rack (~> 1.1)
     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)
+    rails (4.1.5)
+      actionmailer (= 4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
+      activemodel (= 4.1.5)
+      activerecord (= 4.1.5)
+      activesupport (= 4.1.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.4)
+      railties (= 4.1.5)
       sprockets-rails (~> 2.0)
-    rails-observers (0.1.2)
-      activemodel (~> 4.0)
-    rails_admin (0.6.2)
+    rails_admin (0.6.3)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0)
@@ -186,12 +192,12 @@ GEM
       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_settings (0.8.0)
+      mongoid (>= 3.0, < 4.1)
     rails_admin_toggleable (0.4.1)
-    railties (4.1.4)
-      actionpack (= 4.1.4)
-      activesupport (= 4.1.4)
+    railties (4.1.5)
+      actionpack (= 4.1.5)
+      activesupport (= 4.1.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -203,7 +209,7 @@ GEM
       crass (~> 0.2.0)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.1.9)
-    sass (3.3.11)
+    sass (3.4.0)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
@@ -213,7 +219,7 @@ GEM
     simple_form (3.0.2)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    sitemap_generator (5.0.4)
+    sitemap_generator (5.0.5)
       builder
     sprockets (2.12.1)
       hike (~> 1.2)
@@ -231,9 +237,9 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.2.2)
+    turbolinks (2.2.3)
       coffee-rails
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.3)
       execjs (>= 0.3.0)

data/lib/generators/rocket_cms/templates/admin.erb

@@ -1,5 +1,7 @@
 require 'rails_admin/custom_show_in_app'
 
+RailsAdminSettings.track_history!
+
 RailsAdmin.config do |config|
   ## == Devise ==
   # this is required if not using cancan

data/lib/rocket_cms/engine.rb

@@ -19,13 +19,6 @@ module RocketCMS
       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
@@ -44,3 +37,4 @@ module RocketCMS
     end
   end
 end
+

data/lib/rocket_cms/model.rb

@@ -5,12 +5,15 @@ module RocketCMS
       include Mongoid::Document
       include Mongoid::Timestamps::Short
       include ActiveModel::ForbiddenAttributesProtection
-      include Trackable
       include BooleanField
       include SortField
       include Mongoid::Paperclip
       include SmartExcerpt
       include SimpleCaptcha::ModelHelpers
+
+      if defined?(Trackable)
+        include Trackable
+      end
     end
   end
 end

data/lib/rocket_cms/version.rb

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

data/lib/rocket_cms.rb

@@ -26,7 +26,6 @@ require 'rails_admin_toggleable'
 require 'glebtv-ckeditor'
 require 'rails_admin_settings'
 require 'mongoid-audit'
-require 'history_tracker' # audit model
 
 require 'mongoid_slug'
 

data/rocket_cms.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   
-  spec.add_dependency 'rails', '~> 4.1.4'
-  spec.add_dependency 'mongoid', '~> 4.0.0.beta1'
+  spec.add_dependency 'rails', [">= 4.1.0", "< 5.0.0"]
+  spec.add_dependency 'mongoid', '~> 4.0.0'
   spec.add_dependency 'jquery-rails'
   spec.add_dependency 'glebtv-mongoid_nested_set'
   spec.add_dependency 'simple_form'
@@ -38,9 +38,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails_admin_nested_set'
   spec.add_dependency 'rails_admin_toggleable'
   spec.add_dependency 'glebtv-ckeditor'
-  spec.add_dependency 'rails_admin_settings'
+  spec.add_dependency 'rails_admin_settings', '~> 0.8.0'
   spec.add_dependency 'geocoder'
-  spec.add_dependency 'mongoid-audit'
+  spec.add_dependency 'mongoid-audit', '~> 1.0.0.alpha.1'
   spec.add_dependency 'mongoid_slug'
   spec.add_dependency 'simple-navigation'
   spec.add_dependency 'unicorn'
@@ -51,3 +51,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'uglifier'
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.2
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,30 +42,36 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -280,16 +286,16 @@ dependencies:
   name: rails_admin_settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
@@ -308,16 +314,16 @@ dependencies:
   name: mongoid-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.alpha.1
 - !ruby/object:Gem::Dependency
   name: mongoid_slug
   requirement: !ruby/object:Gem::Requirement
@@ -490,7 +496,6 @@ files:
 - app/models/concerns/seoable.rb
 - app/models/concerns/sort_field.rb
 - app/models/concerns/sortable.rb
-- app/models/concerns/trackable.rb
 - app/models/contact_message.rb
 - app/models/menu.rb
 - app/models/news.rb
@@ -536,7 +541,6 @@ files:
 - lib/generators/rocket_cms/templates/ability.erb
 - lib/generators/rocket_cms/templates/admin.erb
 - lib/generators/rocket_cms/utils.rb
-- lib/history_tracker.rb
 - lib/rails_admin/custom_show_in_app.rb
 - lib/rocket_cms.rb
 - lib/rocket_cms/admin.rb

data/app/models/concerns/trackable.rb

@@ -1,8 +0,0 @@
-module Trackable
-  extend ActiveSupport::Concern
-  include Mongoid::Audit::Trackable
-  included do
-    track_history track_create: true, track_destroy: true
-  end
-end
-

data/lib/history_tracker.rb

@@ -1,4 +0,0 @@
-# app/models/history_tracker.rb
-class HistoryTracker
-  include Mongoid::Audit::Tracker
-end