rocket_cms 0.12.0 → 0.12.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 96d05f1668f0160be639e9006e63405191cb11df
4
- data.tar.gz: 83ab11d81d1b6b8958cddcac380bdb6d6923d2c0
3
+ metadata.gz: a004908635e7d54467b015f017e5e03242abd1ae
4
+ data.tar.gz: 8cb80dbc52fd4f3dff0a973f432e80bebd7601d3
5
5
  SHA512:
6
- metadata.gz: bcd63b72b84f50e9d295a4ac7b6ebbf73863edfe65d68c24edba61cb4d6bcfdddfe7117faaf143ce3daead6b75ecc95753d4e3e7c1774d49676d6a4a671a4fae
7
- data.tar.gz: ff4885df2239a4dde419961ffcae04e179a58e64fa9f867d5c797e83b6549a8ad9228fa0456058e6c8c5143481c28977aa55e6f8cd2d83f35a28e41704f523d5
6
+ metadata.gz: 1c8ab54c03d3c4406979187908a97f4b42b695378737c6c60d7079ff6d63eaa7f8106bed40561f7d99031b4532e3e31b2ca8f6c47366a7be3f56216ac82e3997
7
+ data.tar.gz: 9b85d985870c23b1c5a7a29c056e3bbdf5cfc932cb13c4a5f9f83bf3d00432677a28055708507f7b85db103a849dc20c881d3843618f774fa31d9221de45513e
data/Gemfile.lock CHANGED
@@ -1,10 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rocket_cms (0.12.0)
4
+ rocket_cms (0.12.1)
5
5
  addressable
6
6
  coffee-rails
7
7
  jquery-rails
8
+ kaminari
8
9
  rails (>= 4.1.0, < 5.1)
9
10
  smart_excerpt
10
11
  stringex
@@ -72,6 +73,9 @@ GEM
72
73
  railties (>= 4.2.0)
73
74
  thor (>= 0.14, < 2.0)
74
75
  json (1.8.3)
76
+ kaminari (0.16.3)
77
+ actionpack (>= 3.0.0)
78
+ activesupport (>= 3.0.0)
75
79
  loofah (2.0.3)
76
80
  nokogiri (>= 1.5.9)
77
81
  mail (2.6.4)
@@ -140,4 +144,4 @@ DEPENDENCIES
140
144
  rocket_cms!
141
145
 
142
146
  BUNDLED WITH
143
- 1.12.3
147
+ 1.12.5
@@ -6,6 +6,8 @@ end
6
6
  class ContactMessage
7
7
  include RocketCMS::Models::ContactMessage
8
8
  RocketCMS.apply_patches self
9
- rails_admin &RocketCMS.contact_message_config
9
+ if respond_to?(:rails_admin)
10
+ rails_admin &RocketCMS.contact_message_config
11
+ end
10
12
  end
11
13
 
data/app/models/menu.rb CHANGED
@@ -6,6 +6,9 @@ end
6
6
  class Menu
7
7
  include RocketCMS::Models::Menu
8
8
  RocketCMS.apply_patches self
9
- rails_admin &RocketCMS.menu_config
9
+
10
+ if respond_to?(:rails_admin)
11
+ rails_admin &RocketCMS.menu_config
12
+ end
10
13
  end
11
14
 
data/app/models/news.rb CHANGED
@@ -6,5 +6,8 @@ end
6
6
  class News
7
7
  include RocketCMS::Models::News
8
8
  RocketCMS.apply_patches self
9
- rails_admin &RocketCMS.news_config
9
+
10
+ if respond_to?(:rails_admin)
11
+ rails_admin &RocketCMS.news_config
12
+ end
10
13
  end
data/app/models/page.rb CHANGED
@@ -6,5 +6,8 @@ end
6
6
  class Page
7
7
  include RocketCMS::Models::Page
8
8
  RocketCMS.apply_patches self
9
- rails_admin &RocketCMS.page_config
9
+
10
+ if respond_to?(:rails_admin)
11
+ rails_admin &RocketCMS.page_config
12
+ end
10
13
  end
data/app/models/seo.rb CHANGED
@@ -6,11 +6,14 @@ end
6
6
  class Seo
7
7
  include RocketCMS::Models::Seo
8
8
  RocketCMS.apply_patches self
9
- rails_admin &RocketCMS.seo_config
10
9
  belongs_to :seoable, polymorphic: true
11
10
 
12
11
  def self.separate_table?
13
12
  (RocketCMS.mongoid? && RocketCMS.config.separate_seo_table) || (RocketCMS.active_record? && Seo.table_exists?)
14
13
  end
14
+
15
+ if respond_to?(:rails_admin)
16
+ rails_admin &RocketCMS.seo_config
17
+ end
15
18
  end
16
19
 
data/lib/rocket_cms.rb CHANGED
@@ -18,7 +18,9 @@ require 'rocket_cms/patch'
18
18
  require 'rocket_cms/admin'
19
19
  require 'rocket_cms/search'
20
20
  require 'rocket_cms/model'
21
- require 'rocket_cms/rails_admin_menu'
21
+ if defined?(RailsAdmin)
22
+ require 'rocket_cms/rails_admin_menu'
23
+ end
22
24
  require 'rocket_cms/engine'
23
25
  require 'rocket_cms/controller'
24
26
 
@@ -27,6 +29,9 @@ module RocketCMS
27
29
  def mongoid?
28
30
  RocketCMS.orm == :mongoid
29
31
  end
32
+ def full?
33
+ !RocketCMS.light?
34
+ end
30
35
  def active_record?
31
36
  RocketCMS.orm == :active_record
32
37
  end
@@ -15,7 +15,9 @@ module RocketCMS
15
15
  end
16
16
 
17
17
  include SmartExcerpt
18
- include SimpleCaptcha::ModelHelpers
18
+ if defined?(SimpleCaptcha)
19
+ include SimpleCaptcha::ModelHelpers
20
+ end
19
21
 
20
22
  if RocketCMS.mongoid? && defined?(Trackable)
21
23
  include Trackable
@@ -6,7 +6,7 @@ module RocketCMS
6
6
  include RocketCMS.orm_specific('ContactMessage')
7
7
 
8
8
  included do
9
- apply_simple_captcha
9
+ apply_simple_captcha if respond_to?(:apply_simple_captcha)
10
10
  validates_email_format_of :email, unless: 'email.blank?'
11
11
  if RocketCMS.config.contacts_message_required
12
12
  validates_presence_of :content
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.12.0"
2
+ VERSION = "0.12.1"
3
3
  end
data/rocket_cms.gemspec CHANGED
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
28
28
  spec.add_dependency 'validates_email_format_of'
29
29
  spec.add_dependency 'addressable'
30
30
  spec.add_dependency 'stringex'
31
+ spec.add_dependency 'kaminari'
31
32
  spec.add_dependency 'thor'
32
33
  spec.add_dependency 'smart_excerpt'
33
34
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rocket_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.0
4
+ version: 0.12.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
@@ -142,6 +142,20 @@ dependencies:
142
142
  - - ">="
143
143
  - !ruby/object:Gem::Version
144
144
  version: '0'
145
+ - !ruby/object:Gem::Dependency
146
+ name: kaminari
147
+ requirement: !ruby/object:Gem::Requirement
148
+ requirements:
149
+ - - ">="
150
+ - !ruby/object:Gem::Version
151
+ version: '0'
152
+ type: :runtime
153
+ prerelease: false
154
+ version_requirements: !ruby/object:Gem::Requirement
155
+ requirements:
156
+ - - ">="
157
+ - !ruby/object:Gem::Version
158
+ version: '0'
145
159
  - !ruby/object:Gem::Dependency
146
160
  name: thor
147
161
  requirement: !ruby/object:Gem::Requirement