rocket_cms 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3386b1cef9e0a848c0456da4282b0ba545ed1f2f
-  data.tar.gz: 3414be471b1c4daac32b3a4b87b41915a4c4439e
+  metadata.gz: 1fd8732f4dca229aa75b4f558e0a7297ffc30781
+  data.tar.gz: f4e0f081a5a3f0f167fcdb6116542a94a8c6f45d
 SHA512:
-  metadata.gz: 265dd0d16235ed1b4a81e95f9c0fcd8bf0b8b5458358c1da4e4a7382f040e85137cb0cf3f96be7dfe0cc7beebb6ffb079c19f2e5a678a6bd37d6a75b05f8f4b0
-  data.tar.gz: 91328a3a45691b8a6d4cc9cc6a39c6dfc5e612239c37adecc7e1c2d68cd9f5f508759b4dc3afcf2efe66bcbb83be2de65a3176152eb05412e369eb08509c4150
+  metadata.gz: 2efbd88cf8074c11838c243ba5fe9296f9147b4301bbb10df5672b5f6f8b640895de686ff41f1ff7ddd3bb5c9ecb90a1894791353be8256588608920e9936a78
+  data.tar.gz: d8cbcd918a9209975f56a92551863d13c975fcc5cf7958d6dd1fe3f8d3916a38f4e0d8d701cb84e333470c27bf0c9e368d443b3c6a0a631858ec8dcc71e0f36d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.8.11)
+    rocket_cms (0.8.12)
       addressable
       coffee-rails
       devise
@@ -63,7 +63,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    arel (6.0.2)
+    arel (6.0.3)
     bcrypt (3.1.10)
     builder (3.2.2)
     coffee-rails (4.1.0)
@@ -91,7 +91,7 @@ GEM
       orm_adapter (~> 0.5.0)
       rails (~> 4.0)
     glebtv-simple_captcha (0.6.7)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt

data/README.md

@@ -117,6 +117,12 @@ or
 gem 'hstore_translate'
 ```
 
+Add ```rails_admin_mongoid_localize_field``` gem if using MongoDB:
+
+```ruby
+gem 'rails_admin_mongoid_localize_field'
+```
+
 ### Documentation
 
 It's basically Mongoid + Rails Admin + some of our common models and controllers, capistrano config, etc.

data/app/controllers/concerns/rs_localizeable.rb

@@ -13,7 +13,11 @@ module RsLocalizeable
   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])
+    if RocketCMS.mongoid?
+      pages = pages.where(:"name.#{I18n.locale}".exists => true)
+    elsif RocketCMS.active_record?
+      pages = pages.where(["EXIST(name_translations, ?) = TRUE AND name_translations -> ? != ''", I18n.locale, I18n.locale])
+    end
     pages.sorted.to_a
   end
   def nav_get_url(item)

data/app/controllers/concerns/rs_menu.rb

@@ -33,13 +33,16 @@ module RsMenu
       begin
         nav_extra_data_before(type, primary)
         items = nav_get_menu_items(type)
-        items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }.each do |item|
+        items = items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }
+        items.each do |item|
           render_with_subs(items, primary, item)
         end
         nav_extra_data_after(type, primary)
       rescue Exception => exception
         Rails.logger.error exception.message
         Rails.logger.error exception.backtrace.join("\n")
+        puts exception.message
+        puts exception.backtrace.join("\n")
         capture_exception(exception) if respond_to?(:capture_exception)
         items
       end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.8.11"
+  VERSION = "0.8.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler