rocket_cms 0.5.0.rc.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7da577b51fe66c871846e58b226479bd09a1f37d
-  data.tar.gz: 0990b9639aaf7b6fe4ef5c8ebe11877af15d19c1
+  metadata.gz: 5b8709251c82acb1bc17445e64b7d6ac54fb4b87
+  data.tar.gz: d6d8ccf7202bd05d40d8312265a82cc0e4867d79
 SHA512:
-  metadata.gz: b78d0a2c66702c223803b6f36b92d644cfdee5c9587bc01e630e60daaeb48beba5cc1be42ae9cac83142226477d57ead33c2cf38e876665959aafd06dd8b0db2
-  data.tar.gz: 0113a511582f28b88ef53436e1368fa9bc7e46592e1acd15a5f1ddf5312fe06e2716972c24c94f2aad00fffd4a8d07f302bd9d894a577b89689373c0745a5ef1
+  metadata.gz: 90ed8de9874f2145c3639afe3080d278cf27643a4bb9b10387adf2e63d3952b3a4211cf00d87b2ee7d9b7c3835a90de55c0543fc4656f14df4b15a3accdbd0b4
+  data.tar.gz: dc6a5e731021e5e57aad14ddf26c635650bd21f603494a566ceb144c165da9e7a2aacc6e1ed77418ed4da24165744bf575d388842423368024795eb6389c63d8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.5.0.rc.5)
+    rocket_cms (0.5.0)
       addressable
       coffee-rails
       devise

data/app/controllers/concerns/rs_menu.rb

@@ -30,7 +30,7 @@ module RsMenu
     Proc.new do |primary|
       SimpleNavigation.config.autogenerate_item_ids = false
       begin
-        items = ::Menu.find(type.to_s).pages.asc(:lft).to_a
+        items = ::Menu.find(type.to_s).pages.enabled.sorted.to_a
         items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }.each do |item|
           render_with_subs(items, primary, item)
         end

data/app/models/concerns/seoable.rb

@@ -16,11 +16,10 @@ module Seoable
 
       field :og_title, type: String, localize: RocketCMS.configuration.localize
       has_mongoid_attached_file :og_image, styles: {thumb: "800x600>"}
-    end
-
-    if RocketCMS.active_record?
+    elsif RocketCMS.active_record?
       has_attached_file :og_image, styles: {thumb: "800x600>"}
     end
+    validates_attachment_content_type :og_image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :image?
   end
 
   def page_title

data/app/views/news/show.html.haml

@@ -1,7 +1,7 @@
 .rs-news-show
   %h1.rs-news-title= @news.name
   .rs-news-date= @news.time.strftime('%Y-%m-%d')
-  .rs-news-text = @news.excerpt
+  .rs-news-text= @news.excerpt
   - unless RocketCMS.configuration.news_image_styles.nil?
     .rs-news-image= image_tag @news.image.url(:full)
   .rs-news-content

data/lib/generators/rocket_cms/templates/migration_pages.rb

@@ -8,7 +8,12 @@ class RocketCmsCreatePages < ActiveRecord::Migration
     add_index :menus, :slug, unique: true
 
     create_table :pages do |t|
-      t.boolean :enabled, default: false
+      t.boolean :enabled, default: true, null: false
+      t.integer :parent_id
+      t.integer :lft
+      t.integer :rgt
+      t.integer :depth 
+
       t.string :slug, null: false
       t.attachment :image
 
@@ -20,6 +25,7 @@ class RocketCmsCreatePages < ActiveRecord::Migration
       t.timestamps
     end
     add_index :pages, :slug, unique: true
+    add_index :pages, [:enabled, :lft]
 
     create_join_table :menus, :pages
 

data/lib/rocket_cms/controllers/contacts.rb

@@ -3,12 +3,12 @@ module RocketCMS
     module Contacts
       extend ActiveSupport::Concern
       def new
-        @contact_message = ContactMessage.new
+        @contact_message = model.new
         after_initialize
       end
 
       def create
-        @contact_message = ContactMessage.new(message_params)
+        @contact_message = model.new(message_params)
         after_initialize
         if RocketCMS.configuration.contacts_captcha
           meth = :save_with_captcha
@@ -34,6 +34,9 @@ module RocketCMS
       def after_create
         # overrideable hook for updating message
       end
+      def model
+        ContactMessage
+      end
       def message_params
         params.require(:contact_message).permit(RocketCMS.configuration.contacts_fields.keys + [:name, :email, :phone, :content, :captcha, :captcha_key])
       end

data/lib/rocket_cms/models/active_record/page.rb

@@ -5,10 +5,14 @@ module RocketCMS
         extend ActiveSupport::Concern
 
         included do
+          acts_as_nested_set
+
           extend FriendlyId
           friendly_id :name, use: [:slugged, :finders]
           has_paper_trail
           validates_lengths_from_database only: [:name, :title, :content, :excerpt, :h1, :keywords, :robots, :og_title, :regexp, :redirect, :fullpath]
+
+          scope :sorted, -> { order(lft: :asc) }
         end
       end
     end

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

@@ -12,7 +12,7 @@ module RocketCMS
           index({enabled: 1, time: 1})
           unless RocketCMS.configuration.news_image_styles.nil?
             has_mongoid_attached_file :image, styles: RocketCMS.configuration.news_image_styles
-            validates_attachment_content_type :image, :content_type => ['image/gif', 'image/jpeg', 'image/jpg', 'image/png'], if: :image?
+            validates_attachment_content_type :image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :image?
           end
 
           field :excerpt, type: String, localize: RocketCMS.configuration.localize

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

@@ -12,6 +12,7 @@ module RocketCMS
           has_and_belongs_to_many :menus, inverse_of: :pages
           acts_as_nested_set
           manual_slug :name
+          scope :sorted, -> { asc(:lft) }
         end
       end
     end

data/lib/rocket_cms/models/page.rb

@@ -13,8 +13,6 @@ module RocketCMS
       end
         
       included do
-        scope :sorted, -> { order_by([:lft, :asc]) }
-        scope :menu, ->(menu_id) { enabled.sorted.where(menu_ids: menu_id) }
         has_and_belongs_to_many :menus, inverse_of: :pages
         before_validation do
           self.fullpath = "/pages/#{slug}" if self.fullpath.blank?

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.5.0.rc.5"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc.5
+  version: 0.5.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -476,9 +476,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2