ack_rocket_cms 0.7.2.2 → 0.7.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f39cfacc357ca647734190fedd1794b32d728dc
-  data.tar.gz: e073a68790d363d36b7ef180b79f1ce998ba6e1c
+  metadata.gz: ed3237374d796ae783eaff50bb9ff41d2ab6586a
+  data.tar.gz: b3e115e147295f5262507d789e7159843aeb2833
 SHA512:
-  metadata.gz: cd57575bbb83c2207cbbb0202284c9ee9dd28e3402160f21f46f85be82a373cda6102d4058036e9c67716231859985de6c96649b39556eeed95aa757b4a6ec7e
-  data.tar.gz: a29f0e643d30da6c23f5a8667bf02ec0c327533c38a9003b8cbd4a64b0e6e845a6cc33aa01b9ef9118182c7a199e33b01edd4baa7f880356c83f0918fb7773c9
+  metadata.gz: 5312faddd8307cb31366534ba6cfb91d4642ae71b702db65f8cb4ee1a6fe34e721b489c4bc7d357ebeac901ba044df9e8f9d2b212d86a48dec94780dc5cb9b9d
+  data.tar.gz: 830167be96753beb0a4f7c5bfd6923a206f4bffcfe991376a88e7b76b169b5f0c9777abd50d1ddc59e13491dc6e831c2d65bad96b8c41ae044362a03608f1e21

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.2.2)
+    ack_rocket_cms (0.7.2.3)
       addressable
       coffee-rails
       devise
@@ -193,7 +193,7 @@ GEM
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     safe_yaml (1.0.4)
-    sass (3.4.12)
+    sass (3.4.13)
     sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -231,7 +231,7 @@ GEM
       i18n
     warden (1.2.3)
       rack (>= 1.0)
-    x-real-ip (0.2.0)
+    x-real-ip (0.2.1)
       activesupport
       rack
 

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

@@ -1,6 +1,17 @@
-- unless !obj.respond_to?(:keywords) || obj.keywords.blank?
+- if obj.respond_to?(:keywords) and !obj.keywords.blank?
   %meta{name: "keywords", content: obj.keywords}/
-- unless !obj.respond_to?(:description) || obj.description.blank?
+- else
+  - if alt_obj and alt_obj.respond_to?(:keywords) and !alt_obj.keywords.blank?
+    %meta{name: "keywords", content: alt_obj.keywords}/
+
+- if obj.respond_to?(:description) and !obj.description.blank?
   %meta{name: "description", content: obj.description}/
-- unless !obj.respond_to?(:robots) || obj.robots.blank?
+- else
+  - if alt_obj and alt_obj.respond_to?(:description) and !alt_obj.description.blank?
+    %meta{name: "description", content: alt_obj.description}/
+
+- if obj.respond_to?(:robots) and !obj.robots.blank?
   %meta{name: "robots", content: obj.robots}/
+- else
+  - if alt_obj and alt_obj.respond_to?(:robots) and !alt_obj.robots.blank?
+    %meta{name: "robots", content: alt_obj.robots}/

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

@@ -3,6 +3,7 @@ module RocketCMS
     module Mongoid
       module News
         extend ActiveSupport::Concern
+        include FilenameToSlug
         unless RocketCMS.configuration.news_image_styles.nil?
           include ::Mongoid::Paperclip
         end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.2.2"
+  VERSION = "0.7.2.3"
 end

data/template.rb

@@ -237,13 +237,13 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
     edit do
       field :email, :string do
         visible do
-          bindings[:view].current_user.admin?
+          bindings[:controller].current_user.admin?
         end
       end
       field :name, :string
       field :login, :string do
         visible do
-          bindings[:view].current_user.admin?
+          bindings[:controller].current_user.admin?
         end
       end
       field :roles, :enum do
@@ -256,18 +256,18 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
         end
 
         visible do
-          bindings[:view].current_user.admin?
+          bindings[:controller].current_user.admin?
         end
       end
 
       field :password do
         visible do
-          bindings[:view].current_user.admin? or bindings[:view].current_user == bindings[:object]
+          bindings[:controller].current_user.admin? or bindings[:controller].current_user == bindings[:object]
         end
       end
       field :password_confirmation do
         visible do
-          bindings[:view].current_user.admin? or bindings[:view].current_user == bindings[:object]
+          bindings[:controller].current_user.admin? or bindings[:controller].current_user == bindings[:object]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.2.2
+  version: 0.7.2.3
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler