rocket_cms 0.5.12 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 376c4a888ed2f61a005754d6754f664df0fee369
-  data.tar.gz: 133212b0bfa1b35279265f98a4891ad70c31ce69
+  metadata.gz: d9499c0e7e982e4b9c50d2064f491ff3d06fc07c
+  data.tar.gz: 3d357ed381f1072a05eb5a2c17558690947b4ca9
 SHA512:
-  metadata.gz: a52b3b29affe890f3eb379a71083214e2cb42149ca6684031a47df5cb0bdfb67351a90c0ed244413666a9be27740dbbdd6c7d68843dc31b789cd96363522d22c
-  data.tar.gz: b4702630cb19810726b97e7235c80f02f1986462eab42ffa54ce5b33e77dae4f774f0bd25327f31008fea888e3cd5918b58f8a16b377b1258dfaa841825c3b35
+  metadata.gz: 2b73b7d89b18c299f97f3e66f7dd58a8b65280df3f95e3fa61baf916cefa2c3db3550723866b0cb792c6de6fa8119eab08e6c9bd8b860bc6f7345c0b47973fdf
+  data.tar.gz: 8bd306e7791fca71f0675ab814c00c356d49f479abed35d2c1b6882ee1ec244cbe1477a79fbdd2ff18a21c50768caa824120640e73ec073ec3e4238f2839d96e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.5.12)
+    rocket_cms (0.5.14)
       addressable
       coffee-rails
       devise
@@ -27,27 +27,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
+    actionmailer (4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
+    actionpack (4.1.7)
+      actionview (= 4.1.7)
+      activesupport (= 4.1.7)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
+    actionview (4.1.7)
+      activesupport (= 4.1.7)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+    activemodel (4.1.7)
+      activesupport (= 4.1.7)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
+    activerecord (4.1.7)
+      activemodel (= 4.1.7)
+      activesupport (= 4.1.7)
       arel (~> 5.0.0)
-    activesupport (4.1.6)
+    activesupport (4.1.7)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -64,7 +64,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    devise (3.4.0)
+    devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -75,7 +75,7 @@ GEM
     execjs (2.2.2)
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    geocoder (1.2.5)
+    geocoder (1.2.6)
     glebtv-ckeditor (4.4.3.4)
       mime-types
       orm_adapter (~> 0.5.0)
@@ -95,15 +95,15 @@ GEM
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
+    mini_portile (0.6.1)
+    minitest (5.4.3)
     multi_json (1.10.1)
     nested_form (0.3.2)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
     rack (1.5.2)
     rack-pjax (0.8.0)
@@ -111,15 +111,15 @@ GEM
       rack (~> 1.1)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
+    rails (4.1.7)
+      actionmailer (= 4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
+      activemodel (= 4.1.7)
+      activerecord (= 4.1.7)
+      activesupport (= 4.1.7)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
+      railties (= 4.1.7)
       sprockets-rails (~> 2.0)
     rails_admin (0.6.5)
       builder (~> 3.1)
@@ -135,20 +135,20 @@ GEM
       remotipart (~> 1.0)
       safe_yaml (~> 1.0)
       sass-rails (~> 4.0)
-    rails_admin_nested_set (0.3.6)
+    rails_admin_nested_set (0.3.8)
     rails_admin_settings (0.9.0.pre.6)
     rails_admin_toggleable (0.4.1)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
+    railties (4.1.7)
+      actionpack (= 4.1.7)
+      activesupport (= 4.1.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
     remotipart (1.2.1)
-    responders (1.1.1)
+    responders (1.1.2)
       railties (>= 3.2, < 4.2)
     safe_yaml (1.0.4)
-    sass (3.4.6)
+    sass (3.4.8)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
@@ -163,7 +163,7 @@ GEM
     smart_excerpt (0.1.4)
       activesupport
       htmlentities
-    sprockets (2.12.2)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -176,7 +176,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    turbolinks (2.4.0)
+    turbolinks (2.5.2)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

data/app/models/concerns/manual_slug.rb

@@ -0,0 +1,9 @@
+module ManualSlug
+  extend ActiveSupport::Concern
+  if RocketCMS.mongoid?
+    include ManualSlug::Mongoid
+  else
+    include ManualSlug::ActiveRecord
+  end
+end
+

data/app/models/concerns/manual_slug/active_record.rb

@@ -0,0 +1,21 @@
+module ManualSlug::ActiveRecord
+  extend ActiveSupport::Concern
+
+  included do
+    extend FriendlyId
+  end
+
+  def text_slug
+    slug
+  end
+  def text_slug=(s)
+    self.slug = s
+  end
+
+  module ClassMethods
+    def manual_slug(field, options = {}, callback = true)
+      friendly_id field, use: [:slugged, :finders]
+    end
+  end
+end
+

data/app/models/concerns/manual_slug/mongoid.rb

@@ -0,0 +1,39 @@
+module ManualSlug::Mongoid
+  extend ActiveSupport::Concern
+  include Mongoid::Slug
+
+  def text_slug
+    self._slugs.empty? ? '' : self._slugs.last
+  end
+  def text_slug=(slug)
+    if slug.blank?
+      self._slugs = []
+    else
+      self._slugs.delete(slug)
+      self._slugs << slug
+    end
+  end
+
+  module ClassMethods
+    def manual_slug(field, options = {}, callback = true)
+      options.merge!(permanent: true, history: true)
+      slug field, options
+
+      # we will create slugs manually when needed
+      skip_callback :create, :before, :build_slug
+
+      before_validation do
+        self._slugs = self._slugs.map{ |s| s.strip }.select {|s| !s.blank? }
+
+        if self._slugs.empty?
+          self.build_slug
+        end
+
+        true
+      end if callback
+    end
+  end
+
+end
+
+

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

@@ -4,8 +4,6 @@ module RocketCMS
       module Menu
         extend ActiveSupport::Concern
         included do
-          extend FriendlyId
-          friendly_id :report_slug, use: [:slugged, :finders]
           has_paper_trail
           validates_lengths_from_database
         end

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

@@ -4,13 +4,10 @@ module RocketCMS
       module News
         extend ActiveSupport::Concern
         included do
-          extend FriendlyId
-
           unless RocketCMS.configuration.news_image_styles.nil?
             has_attached_file :image, styles: RocketCMS.configuration.news_image_styles
             validates_attachment_content_type :image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :image?
           end
-          friendly_id :report_slug, use: [:slugged, :finders]
 
           has_paper_trail
 

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

@@ -6,12 +6,8 @@ module RocketCMS
 
         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

data/lib/rocket_cms/models/menu.rb

@@ -5,6 +5,7 @@ module RocketCMS
       include RocketCMS::Model
       include Enableable
       include RocketCMS.orm_specific('Menu')
+      include ManualSlug
       included do
         after_save do
           Rails.cache.delete 'menus'
@@ -13,6 +14,7 @@ module RocketCMS
           Rails.cache.delete 'menus'
         end
         has_and_belongs_to_many :pages, inverse_of: :menus
+        manual_slug :name
       end
     end
   end

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

@@ -3,10 +3,8 @@ module RocketCMS
     module Mongoid
       module Menu
         extend ActiveSupport::Concern
-        include ManualSlug
         included do
           field :name, type: String
-          manual_slug :name
         end
       end
     end

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

@@ -6,7 +6,6 @@ module RocketCMS
         unless RocketCMS.configuration.news_image_styles.nil?
           include ::Mongoid::Paperclip
         end
-        include ManualSlug
         included do
           field :time, type: Time
           index({enabled: 1, time: 1})
@@ -17,7 +16,6 @@ module RocketCMS
 
           field :excerpt, type: String, localize: RocketCMS.configuration.localize
           field :content, type: String, localize: RocketCMS.configuration.localize
-          manual_slug :report_slug
 
           scope :after_now, -> { where(:time.lt => Time.now) }
           scope :by_date, -> { desc(:time) }

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

@@ -3,7 +3,6 @@ module RocketCMS
     module Mongoid
       module Page
         extend ActiveSupport::Concern
-        include ManualSlug
         included do
           field :regexp, type: String
           field :redirect, type: String
@@ -11,7 +10,6 @@ module RocketCMS
           field :fullpath, type: String
           has_and_belongs_to_many :menus, inverse_of: :pages
           acts_as_nested_set
-          manual_slug :name
           scope :sorted, -> { asc(:lft) }
         end
       end

data/lib/rocket_cms/models/news.rb

@@ -6,6 +6,7 @@ module RocketCMS
       include Seoable
       include Enableable
       include RocketCMS.orm_specific('News')
+      include ManualSlug
 
       if RocketCMS.configuration.search_enabled
         include RocketCMS::ElasticSearch
@@ -21,6 +22,8 @@ module RocketCMS
           paginates_per RocketCMS.configuration.news_per_page
         end
         smart_excerpt :excerpt, :content, RocketCMS.configuration.news_excerpt
+        manual_slug :report_slug
+
         RocketCMS.apply_patches self
       end
 

data/lib/rocket_cms/models/page.rb

@@ -5,6 +5,7 @@ module RocketCMS
       include RocketCMS::Model
       include Enableable
       include Seoable
+      include ManualSlug
 
       include RocketCMS.orm_specific('Page')
 
@@ -19,6 +20,7 @@ module RocketCMS
         end
         validates_uniqueness_of :fullpath
         validates_presence_of :name
+        manual_slug :name
       end
 
       def get_fullpath

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.5.12"
+  VERSION = "0.5.14"
 end

data/template.rb

@@ -196,7 +196,7 @@ Rails.application.routes.draw do
   mount RailsAdmin::Engine => '/admin', as: 'rails_admin'
   mount Ckeditor::Engine => '/ckeditor'
 
-  get 'contacts' => 'contacts#index', as: :contacts
+  get 'contacts' => 'contacts#new', as: :contacts
   post 'contacts' => 'contacts#create', as: :create_contacts
   get 'contacts/sent' => 'contacts#sent', as: :contacts_sent
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.14
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -370,6 +370,9 @@ files:
 - app/models/concerns/boolean_field.rb
 - app/models/concerns/enableable.rb
 - app/models/concerns/geocodeable.rb
+- app/models/concerns/manual_slug.rb
+- app/models/concerns/manual_slug/active_record.rb
+- app/models/concerns/manual_slug/mongoid.rb
 - app/models/concerns/mappable.rb
 - app/models/concerns/seoable.rb
 - app/models/concerns/sort_field.rb