trusty-cms 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4491805dd46ed2c03f57d0644c0eb7e1400e681
-  data.tar.gz: c0c1882ff16848f24053ab3d0d9ca0ed5b3d4b63
+  metadata.gz: 079b1b5601ad895b9a70dbe63fcd8b4cb5ec8cef
+  data.tar.gz: c494cd3eae5ecc44678b70b699bb0eb78a546e1b
 SHA512:
-  metadata.gz: c27e7016b1cd41dbb135577ad9057af5e14801dee5bc4b6d1c08aec8a4be3cd72e519554f8afb4079d7b2d5d3057f2a96eb8737a8d9b3904e420eaa546ec521b
-  data.tar.gz: 7089cb29b4d16ee3b0265dc3dd5c1ea96ae9243f2134fed2efd996ce0fa2934d4b8502f92c8b65127f45b6e5bbba14356c34850a0e98f0d1896b478e67b0b639
+  metadata.gz: b7fc84ccdc1bbf657111f33ed17ba3a687cfe0922bd1c46ce2af8c3201af2051852c8a72c189bffa0f5f36ee8894aec29e4a95268467174f66055cdab9cb4f2d
+  data.tar.gz: 7c1822cf7448a33477e9e9edda2cab6bc78d1420beeade56b266a3da335568715e02b9fdd62ca9b5c9805c839d5bc78ec6d88d918449e83aa6798ffb13d698bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (2.0.23)
+    trusty-cms (2.0.24)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -66,19 +66,19 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts_as_tree (2.5.0)
+    acts_as_tree (2.6.0)
       activerecord (>= 3.0.0)
     addressable (2.4.0)
     arel (6.0.3)
     builder (3.2.2)
-    byebug (9.0.5)
+    byebug (9.0.6)
     capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.6)
+    chunky_png (1.3.7)
     ckeditor (4.1.6)
       cocaine
       orm_adapter (~> 0.5.0)
@@ -155,14 +155,12 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
     multi_json (1.12.1)
     mysql2 (0.4.4)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
-    pkg-config (1.1.7)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -234,7 +232,7 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
-    ruby_parser (3.8.2)
+    ruby_parser (3.8.3)
       sexp_processor (~> 4.1)
     sass (3.4.22)
     sass-rails (5.0.6)
@@ -280,7 +278,7 @@ GEM
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.1.0)
+    will_paginate (3.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

data/app/controllers/admin/pages_controller.rb

@@ -1,6 +1,7 @@
 class Admin::PagesController < Admin::ResourceController
   before_filter :initialize_meta_rows_and_buttons, :only => [:new, :edit, :create, :update]
   before_filter :count_deleted_pages, :only => [:destroy]
+  rescue_from ActiveRecord::RecordInvalid, :with => :validation_error
 
   class PreviewStop < ActiveRecord::Rollback
     def message
@@ -45,6 +46,12 @@ class Admin::PagesController < Admin::ResourceController
 
 
   private
+
+    def validation_error(e)
+      flash[:error] = e.message
+      render :new
+    end
+
     def assign_page_attributes
       if params[:page_id].blank?
         self.model.slug = '/'

data/app/controllers/application_controller.rb

@@ -42,15 +42,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def rescue_action_in_public(exception)
-    case exception
-      when ActiveRecord::RecordNotFound, ActionController::UnknownController, ActionController::UnknownAction, ActionController::RoutingError
-        render :template => "site/not_found", :status => 404
-      else
-        super
-    end
-  end
-
   private
 
     def set_mailer

data/app/helpers/admin/node_helper.rb

@@ -53,26 +53,6 @@ module Admin::NodeHelper
     show_all? || expanded_rows.include?(@current_node.id)
   end
 
-  def padding_left(level)
-    (level * 23) + 9
-  end
-
-  def children_class
-    unless @current_node.children.empty?
-      if expanded
-        " children_visible"
-      else
-        " children_hidden"
-      end
-    else
-      " no_children"
-    end
-  end
-
-  def virtual_class
-    @current_node.virtual? ? " virtual": ""
-  end
-
   def expander(level)
     unless @current_node.children.empty? or level == 0
       image((expanded ? "collapse" : "expand"),

data/app/helpers/admin/pages_helper.rb

@@ -14,10 +14,6 @@ module Admin::PagesHelper
     !!(@page.errors[:slug] or @page.errors[:breadcrumb])
   end
 
-  def default_filter_name
-    @page.parts.empty? ? "" : @page.parts[0].filter_id
-  end
-
   def status_to_display
     @page.status_id = 100 if @page.status_id == 90
     @display_status = Status.selectable.map{ |s| [I18n.translate(s.name.downcase), s.id] }

data/app/helpers/application_helper.rb

@@ -70,14 +70,6 @@ module ApplicationHelper
     uri.path.gsub(%r{/+}, '/').gsub(%r{/$}, '')
   end
 
-  def nav_link_to(name, options)
-    if current_url?(options)
-      %{<strong>#{ link_to translate_with_default(name), options }</strong>}
-    else
-      link_to translate_with_default(name), options
-    end
-  end
-
   def admin?
     current_user and current_user.admin?
   end
@@ -106,16 +98,6 @@ module ApplicationHelper
     I18n.localize(time, :format => :timestamp)
   end
 
-  def meta_visible(symbol)
-    v = case symbol
-    when :meta_more
-      not meta_errors?
-    when :meta, :meta_less
-      meta_errors?
-    end
-    v ? {} : {:style => "display: none"}
-  end
-
   def meta_errors?
     false
   end
@@ -128,18 +110,10 @@ module ApplicationHelper
     image_tag(append_image_extension("admin/#{name}"), options)
   end
 
-  def image_submit(name, options = {})
-    image_submit_tag(append_image_extension("admin/#{name}"), options)
-  end
-
   def admin
     TrustyCms::AdminUI.instance
   end
 
-  def filter_options_for_select(selected=nil)
-    options_for_select([[t('select.none'), '']] + TextFilter.descendants_names, selected)
-  end
-
   def body_classes
     @body_classes ||= []
   end
@@ -183,7 +157,7 @@ module ApplicationHelper
 
     # Default image url to be used when no gravatar is found
     # or when an image exceeds the rating parameter.
-    local_avatar_url = "/images/admin/avatar_#{([options[:size].to_i] * 2).join('x')}.png"
+    local_avatar_url = "/assets/admin/avatar_#{([options[:size].to_i] * 2).join('x')}.png"
     default_avatar_url = "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}#{local_avatar_url}"
     options[:default] ||= default_avatar_url
 

data/app/models/page.rb

@@ -30,6 +30,8 @@ class Page < ActiveRecord::Base
 
   validate :valid_class_name
 
+  default_scope { order('position ASC') }
+
   include TrustyCms::Taggable
   include StandardTags
   include DeprecatedTags
@@ -223,10 +225,6 @@ class Page < ActiveRecord::Base
     true
   end
 
-  def to_xml(options={}, &block)
-    super(options.reverse_merge(:include => :parts), &block)
-  end
-
   def default_child
     self.class.default_child
   end
@@ -347,10 +345,6 @@ class Page < ActiveRecord::Base
       end
     end
 
-    def attributes_protected_by_default
-      super - [self.class.inheritance_column]
-    end
-
     def update_virtual
       unless self.class == Page.descendant_class(class_name)
         self.virtual = Page.descendant_class(class_name).new.virtual?

data/app/models/page_context.rb

@@ -29,12 +29,6 @@ class PageContext < Radius::Context
     render_error_message(e.message)
   end
 
-  def tag_missing(name, attributes = {}, &block)
-    super
-  rescue Radius::UndefinedTagError => e
-    raise StandardTags::TagError.new(e.message)
-  end
-
   private
 
     def render_error_message(message)

data/app/models/standard_tags.rb

@@ -9,7 +9,6 @@ module StandardTags
   include WillPaginate::ViewHelpers
 
   class TagError < StandardError; end
-  class RequiredAttributeError < StandardError; end
 
   desc %{
     Causes the tags referring to a page's attributes to refer to the current page.

data/app/models/text_filter.rb

@@ -17,11 +17,6 @@ class TextFilter
       instance.filter(text)
     end
 
-    def description_file(filename)
-      text = File.read(filename) rescue ""
-      self.description text
-    end
-
     def descendants_names
       descendants.map { |s| s.filter_name }.sort
     end

data/app/models/trusty_cms/config.rb

@@ -211,10 +211,6 @@ module TrustyCms
         definitions[key] ||= TrustyCms::Config::Definition.new(:empty => true)
       end
 
-      def clear_definitions!
-        TrustyCms.config_definitions = {}
-      end
-
     end
 
     # The usual way to use a config item:

data/db/migrate/20161027141250_add_position_to_pages.rb

@@ -0,0 +1,26 @@
+class AddPositionToPages < ActiveRecord::Migration
+  def self.up
+    unless column_exists? :pages, :position
+      add_column :pages, :position, :integer
+      Page.reset_column_information
+      say_with_time("Putting all pages in a default order...") do
+        ActiveRecord::Base.record_timestamps = false
+        Page.where(parent_id: nil).each do |p|
+          put_children_into_list(p)
+        end
+        ActiveRecord::Base.record_timestamps = true
+      end
+    end
+  end
+
+  def self.down
+    remove_column :pages, :position
+  end
+
+  def self.put_children_into_list(page)
+    page.children.order("title asc").each_with_index do |pg, idx|
+      pg.update_attribute('position', idx + 1)
+      put_children_into_list(pg)
+    end
+  end
+end

data/db/schema.rb

@@ -70,6 +70,7 @@ ActiveRecord::Schema.define(:version => 20120209231801) do
     t.boolean  "virtual",                               :default => false, :null => false
     t.integer  "lock_version",                          :default => 0
     t.text     "allowed_children_cache"
+    t.integer  "position",                            limit: 4
   end
 
   add_index "pages", ["class_name"], :name => "pages_class_name"

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = "2.0.23"
+    VERSION = "2.0.24"
   end
 end

data/lib/trusty_cms/extension/script.rb

@@ -230,25 +230,6 @@ Supports:       TrustyCms #{supports_radiant_version}
     end
   end
 
-  class Bzip2 < Tarball
-    def filename
-      @unpacked ? super : "#{self.name}.tar.bz2"
-    end
-
-    def unpack
-      cd(Dir.tmpdir) { system "bunzip2 #{self.filename}" }
-      @unpacked = true
-      super
-    end
-  end
-
-  class Zip < Download
-    def unpack
-      output = nil
-      cd(Dir.tmpdir) { output = `unzip #{filename} -d #{name}` }
-      self.path = File.join(Dir.tmpdir, name)
-    end
-  end
 end
 
 module TrustyCms

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20120209231801) do
+ActiveRecord::Schema.define(version: 20161027141250) do
 
   create_table "config", force: :cascade do |t|
     t.string "key",   limit: 40,  default: "", null: false
@@ -70,6 +70,7 @@ ActiveRecord::Schema.define(version: 20120209231801) do
     t.boolean  "virtual",                              default: false, null: false
     t.integer  "lock_version",           limit: 4,     default: 0
     t.text     "allowed_children_cache", limit: 65535
+    t.integer  "position",               limit: 4
   end
 
   add_index "pages", ["class_name"], name: "pages_class_name", using: :btree
@@ -100,21 +101,23 @@ ActiveRecord::Schema.define(version: 20120209231801) do
   add_index "snippets", ["name"], name: "name", unique: true, using: :btree
 
   create_table "users", force: :cascade do |t|
-    t.string   "name",          limit: 100
-    t.string   "email",         limit: 255
-    t.string   "login",         limit: 40,    default: "",    null: false
-    t.string   "password",      limit: 40
-    t.boolean  "admin",                       default: false, null: false
-    t.boolean  "designer",                    default: false, null: false
+    t.string   "name",                   limit: 100
+    t.string   "email",                  limit: 255
+    t.string   "login",                  limit: 40,    default: "",    null: false
+    t.string   "password",               limit: 40
+    t.boolean  "admin",                                default: false, null: false
+    t.boolean  "designer",                             default: false, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "created_by_id", limit: 4
-    t.integer  "updated_by_id", limit: 4
-    t.string   "salt",          limit: 255
-    t.text     "notes",         limit: 65535
-    t.integer  "lock_version",  limit: 4,     default: 0
-    t.string   "session_token", limit: 255
-    t.string   "locale",        limit: 255
+    t.integer  "created_by_id",          limit: 4
+    t.integer  "updated_by_id",          limit: 4
+    t.string   "salt",                   limit: 255
+    t.text     "notes",                  limit: 65535
+    t.integer  "lock_version",           limit: 4,     default: 0
+    t.string   "session_token",          limit: 255
+    t.string   "locale",                 limit: 255
+    t.string   "password_reset_token",   limit: 255
+    t.datetime "password_reset_sent_at"
   end
 
   add_index "users", ["login"], name: "login", unique: true, using: :btree

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -1386,6 +1386,7 @@ files:
 - db/migrate/20111016150725_extend_page_part_content_limit.rb
 - db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb
 - db/migrate/20160527141249_add_password_reset_to_users.rb
+- db/migrate/20161027141250_add_position_to_pages.rb
 - db/schema.rb
 - lib/active_record_extensions/active_record_extensions.rb
 - lib/annotatable.rb
@@ -1644,7 +1645,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.