trusty-cms 1.0.0 → 1.0.1

data/config/routes.rb

@@ -1,30 +1,38 @@
 TrustyCms::Application.routes.draw do
-  namespace :admin, :member => { :remove => :get } do
+  root to: 'site#show_page'
+  TrustyCms::Application.config.enabled_extensions.each { |ext|
+    load File.join(TrustyCms::ExtensionPath.find(ext).to_s, "config", "routes.rb")
+  }
+  namespace :admin do
     resources :pages do
-
-
-      resources :children
+      resources :children, :controller => 'pages'
+      #TODO: put back the remove on children possibly
+      get 'remove', on: :member
+    end
+    resources :layouts do
+      get 'remove', on: :member
+    end
+    resources :users do
+      get 'remove', on: :member
     end
-    resources :layouts
-    resources :users
   end
 
   match 'admin/preview' => 'admin/pages#preview', :as => :preview, :via => [:post, :put]
   namespace :admin do
     resource :preferences
-    resource :configuration
+    resource :configuration, :controller => 'configuration'
     resources :extensions, :only => :index
     resources :page_parts
     resources :page_fields
-    match '/reference/:type.:format' => 'references#show', :as => :reference, :via => :get
+    match '/reference/:type(.:format)' => 'references#show', :as => :reference, :via => :get
   end
 
   match 'admin' => 'admin/welcome#index', :as => :admin
   match 'admin/welcome' => 'admin/welcome#index', :as => :welcome
   match 'admin/login' => 'admin/welcome#login', :as => :login
   match 'admin/logout' => 'admin/welcome#logout', :as => :logout
-  match '/' => 'site#show_page', :url => '/'
+  # match '/' => 'site#show_page', :url => '/' # set root to this so root_path works
   match 'error/404' => 'site#not_found', :as => :not_found
   match 'error/500' => 'site#error', :as => :error
   match '*url' => 'site#show_page'
-end
+end

data/db/migrate/001_create_radiant_tables.rb

@@ -4,7 +4,7 @@ class CreateRadiantTables < ActiveRecord::Migration
       t.column "key", :string, :limit => 40, :default => "", :null => false
       t.column "value", :string, :default => ""
     end
-    add_index "config", ["key"], :name => "key", :unique => true 
+    add_index "config", ["key"], :name => "key", :unique => true
 
     create_table "pages", :force => true do |t|
       t.column "title", :string
@@ -47,7 +47,7 @@ class CreateRadiantTables < ActiveRecord::Migration
       t.column "created_by", :integer
       t.column "updated_by", :integer
     end
-    
+
     create_table "users", :force => true do |t|
       t.column "name", :string, :limit => 100
       t.column "email", :string
@@ -61,7 +61,7 @@ class CreateRadiantTables < ActiveRecord::Migration
       t.column "updated_by", :integer
     end
     add_index "users", ["login"], :name => "login", :unique => true
-  
+
   end
 
   def self.down

data/db/migrate/002_insert_initial_data.rb

@@ -1,5 +1,5 @@
 class InsertInitialData < ActiveRecord::Migration
-  
+
   # Historical. We no longer rely on this migration to insert the initial data into
   # the database. Instead we recommend `rake db:bootstrap`.
 
@@ -8,5 +8,5 @@ class InsertInitialData < ActiveRecord::Migration
 
   def self.down
   end
-  
+
 end

data/db/migrate/005_add_virtual_column_to_page.rb

@@ -6,4 +6,4 @@ class AddVirtualColumnToPage < ActiveRecord::Migration
   def self.down
     remove_column "pages", "virtual"
   end
-end
+end

data/db/migrate/006_integer_columns_to_boolean.rb

@@ -1,30 +1,30 @@
 class IntegerColumnsToBoolean < ActiveRecord::Migration
-  
+
   class User < ActiveRecord::Base; end
-  
+
   def self.up
     change_column "users", "admin",     :boolean, :default => false, :null => false
     change_column "users", "developer", :boolean, :default => false, :null => false
   end
-  
+
   def self.down
     change_column "users", "admin",     :integer, :limit => 1, :default => 0, :null => false
     change_column "users", "developer", :integer, :limit => 1, :default => 0, :null => false
   end
-  
+
   def self.change_column(table, column, type, options={})
     model_class = table.singularize.camelize.constantize
-    
+
     announce "saving #{model_class} data"
     old_values = model_class.find(:all).map do |model|
       [model.id, model.send("#{column}?")]
     end
-    
+
     remove_column table, column
     add_column table, column, type, options
-    
+
     model_class.reset_column_information
-    
+
     announce "restoring #{model_class} data"
     old_values.each do |(id, value)|
       model = model_class.find(id)
@@ -32,5 +32,5 @@ class IntegerColumnsToBoolean < ActiveRecord::Migration
       model.save
     end
   end
-  
+
 end

data/db/migrate/007_remove_virtual_column_from_page.rb

@@ -2,7 +2,7 @@ class RemoveVirtualColumnFromPage < ActiveRecord::Migration
   def self.up
     remove_column "pages", "virtual"
   end
-  
+
   def self.down
     add_column "pages", "virtual", :boolean, :null => false, :default => false
   end

data/db/migrate/008_add_virtual_column_to_page_again.rb

@@ -6,4 +6,4 @@ class AddVirtualColumnToPageAgain < ActiveRecord::Migration
   def self.down
     remove_column "pages", "virtual"
   end
-end
+end

data/db/migrate/010_merge_behaviors_and_pages.rb

@@ -2,13 +2,13 @@ class MergeBehaviorsAndPages < ActiveRecord::Migration
   class OldPage < ActiveRecord::Base
     set_table_name 'pages'
   end
-  
+
   @@page_map = {
     "Page Missing" => "FileNotFoundPage"
   }
-  
+
   @@behavior_map = @@page_map.invert
-  
+
   def self.up
     announce "converting behavior names to class names"
     OldPage.find(:all).each do |page|
@@ -31,7 +31,7 @@ class MergeBehaviorsAndPages < ActiveRecord::Migration
       end
     end
   end
-  
+
   def self.page_name(behavior_name)
     if @@page_map.has_key?(behavior_name)
       @@page_map[behavior_name]
@@ -42,7 +42,7 @@ class MergeBehaviorsAndPages < ActiveRecord::Migration
       name
     end
   end
-  
+
   def self.behavior_name(page_name)
     if @@behavior_map.has_key?(page_name)
       @@behavior_map[page_name]
@@ -52,6 +52,6 @@ class MergeBehaviorsAndPages < ActiveRecord::Migration
       name
     end
   end
-  
+
 
 end

data/db/migrate/014_rename_config_default_parts_key.rb

@@ -1,5 +1,5 @@
 class RenameConfigDefaultPartsKey < ActiveRecord::Migration
-  
+
   def self.up
     rename_config_key 'default.parts', 'defaults.page.parts'
   end
@@ -7,11 +7,11 @@ class RenameConfigDefaultPartsKey < ActiveRecord::Migration
   def self.down
     rename_config_key 'defaults.page.parts', 'default.parts'
   end
-  
+
   def self.rename_config_key(from, to)
     return unless setting = TrustyCms::Config.find_by_key(from)
     setting.key = to
     setting.save!
   end
-  
+
 end

data/db/migrate/015_add_optimistic_locking.rb

@@ -1,5 +1,5 @@
 class AddOptimisticLocking < ActiveRecord::Migration
-  
+
   def self.up
     [:pages, :layouts, :snippets, :users].each do |table|
       add_column table, :lock_version, :integer, :default => 0
@@ -11,5 +11,5 @@ class AddOptimisticLocking < ActiveRecord::Migration
       remove_column table, :lock_version
     end
   end
-  
+
 end

data/db/migrate/020_add_session_info_to_users.rb

@@ -8,4 +8,4 @@ class AddSessionInfoToUsers < ActiveRecord::Migration
     remove_column :users, :session_token
     remove_column :users, :session_expire
   end
-end
+end

data/db/migrate/20081203140407_add_indexes.rb

@@ -4,13 +4,13 @@ class AddIndexes < ActiveRecord::Migration
     add_index :pages,       :parent_id,             :name => 'pages_parent_id'
     add_index :pages,       %w{slug parent_id},     :name => 'pages_child_slug'
     add_index :pages,       %w{virtual status_id},  :name => 'pages_published'
-    
+
     add_index :page_parts,  %w{page_id name},       :name => 'parts_by_page'
   end
 
   def self.down
     remove_index :page_parts, :name => 'parts_by_page'
-                              
+
     remove_index :pages,      :name => 'pages_published'
     remove_index :pages,      :name => 'pages_child_slug'
     remove_index :pages,      :name => 'pages_parent_id'

data/db/migrate/20090226140109_add_user_language.rb

@@ -1,9 +1,9 @@
 class AddUserLanguage < ActiveRecord::Migration
-  def self.up  
+  def self.up
     add_column :users, :language, :string
   end
 
-  def self.down    
+  def self.down
     remove_column :users, :language
   end
 end

data/db/migrate/20100805155020_convert_page_metas.rb

@@ -1,6 +1,6 @@
 class ConvertPageMetas < ActiveRecord::Migration
   def self.up
-    # following add and remove column enables running this migration 
+    # following add and remove column enables running this migration
     # when upgrading radiant with allowed_children_cache added to Page model
     add_column :pages, :allowed_children_cache, :text
     Page.all.each do |page|

data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb

@@ -10,4 +10,4 @@ class AddAllowedChildrenCacheToPages < ActiveRecord::Migration
   def self.down
     remove_column :pages, :allowed_children_cache
   end
-end
+end

data/db/migrate/20111016150725_extend_page_part_content_limit.rb

@@ -12,4 +12,4 @@ class ExtendPagePartContentLimit < ActiveRecord::Migration
       change_column :page_parts, :content, :text
     end
   end
-end
+end

data/db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb

@@ -1,11 +1,10 @@
 class ChangePagesAllowedChildrenCacheToText  < ActiveRecord::Migration
   def self.up
-    unless Page.columns_hash['allowed_children_cache'].type == :text
-      change_column :pages, :allowed_children_cache, :text
-    end
+    Page.reset_column_information
+    change_column :pages, :allowed_children_cache, :text
   end
 
   def self.down
     change_column :pages, :allowed_children_cache, :string, :limit => 1500
   end
-end
+end

data/db/schema.rb

@@ -77,12 +77,6 @@ ActiveRecord::Schema.define(:version => 20120209231801) do
   add_index "pages", ["slug", "parent_id"], :name => "pages_child_slug"
   add_index "pages", ["virtual", "status_id"], :name => "pages_published"
 
-  create_table "people", :force => true do |t|
-  end
-
-  create_table "places", :force => true do |t|
-  end
-
   create_table "sessions", :force => true do |t|
     t.string   "session_id"
     t.text     "data"

data/lib/active_record_extensions/active_record_extensions.rb

@@ -1,7 +1,7 @@
 require 'active_record'
 
 class ActiveRecord::Base
-  
+
   def self.validates_path(*args)
     configuration = args.extract_options!
     validates_each(args, configuration) do |record, attr_name, value|
@@ -9,7 +9,7 @@ class ActiveRecord::Base
       record.errors.add(attr_name, :page_not_found, :default => configuration[:message]) if page.nil? || page.is_a?(FileNotFoundPage)
     end
   end
-  
+
   def self.object_id_attr(symbol, klass)
     module_eval %{
       def #{symbol}
@@ -24,4 +24,4 @@ class ActiveRecord::Base
       end
     }
   end
-end
+end

data/lib/annotatable.rb

@@ -11,7 +11,7 @@ module Annotatable
         alias :inherited :inherited_with_annotatable
       end
     end
-    
+
     def annotate(*attrs)
       options = {}
       options = attrs.pop if attrs.last.kind_of?(Hash)
@@ -43,7 +43,7 @@ module Annotatable
     def inherited_with_annotatable(subclass)
       inherited_without_annotatable(subclass)
       (["inherited_annotations"] + (@inherited_annotations || [])).each do |t|
-        ivar = "@#{t}" 
+        ivar = "@#{t}"
         subclass.instance_variable_set(ivar, instance_variable_get(ivar))
       end
     end
@@ -65,4 +65,4 @@ class Hash
   def symbolize_keys!
     self.replace(self.symbolize_keys)
   end
-end
+end

data/lib/configuration_extensions/configuration_extensions.rb

@@ -1,5 +1,5 @@
 module TrustyCms
-  autoload :Cache, 'trusty_cms/cache'
+  autoload :Cache, 'rack/cache'
 
   class << self
     # Returns the TrustyCms::Config eigenclass object, so it can be used wherever you would use TrustyCms::Config.
@@ -60,7 +60,7 @@ module TrustyCms
     end
 
     def app?
-      File.exist?("#{Rails.root}/lib/radiant.rb")
+      File.exist?("#{Rails.root}/lib/trusty_cms.rb")
     end
 
     def preinitialize
@@ -87,35 +87,6 @@ class Rails::Application::Configuration
 
   attr_accessor :extension_paths, :ignored_extensions
 
-
-  def load_trusty_paths
-    #paths << ["#{TRUSTY_CMS_ROOT}/test/mocks/#{environment}"]
-
-    # Add the app's controller directory
-    #paths['app/controllers'].concat(Dir["#{TRUSTY_CMS_ROOT}/app/controllers/"])
-
-
-
-    # Followed by the standard includes.
-    %w(
-        app
-        app/models
-        app/controllers
-        app/helpers
-        app/views
-        config
-        lib
-        vendor
-      ).each  do |dir|
-      autoload_paths.unshift "#{TRUSTY_CMS_ROOT}/#{dir}"
-      $LOAD_PATH.unshift "#{TRUSTY_CMS_ROOT}/#{dir}"
-      puts dir
-      paths[dir] << "#{TRUSTY_CMS_ROOT}/#{dir}"
-    end
-
-    #paths.concat builtin_directories
-  end
-
   def initialize_extension_paths
     self.extension_paths = default_extension_paths
     self.ignored_extensions = []
@@ -130,7 +101,8 @@ class Rails::Application::Configuration
   def default_extension_paths
     env = ENV["RAILS_ENV"] || Rails.env
     paths = [Rails.root + 'vendor/extensions']
-    paths.unshift(TRUSTY_CMS_ROOT + "vendor/extensions") unless Rails.root == TRUSTY_CMS_ROOT
+    paths.unshift(TRUSTY_CMS_ROOT + "/vendor/extensions") unless Rails.root == TRUSTY_CMS_ROOT
+    paths.unshift(TRUSTY_CMS_ROOT + "test/fixtures/extensions") if env =~ /test/
     paths
   end
 
@@ -266,13 +238,6 @@ class Rails::Application::Configuration
     TrustyCms::AdminUI.instance
   end
 
-  %w{controller model view metal plugin load eager_load}.each do |type|
-    define_method("add_#{type}_paths".to_sym) do |paths|
-      puts "paths"
-      self.paths["app/#{type}s"].concat(paths)
-    end
-  end
-
   private
 
   # Overrides the Rails::Initializer default to add plugin paths in TRUSTY_CMS_ROOT as well as Rails.root.
@@ -307,7 +272,7 @@ class Boot
   def load_mutex
     begin
       require "thread" unless defined?(Mutex)
-    rescue LoadError => e
+    rescue LoadError => _
       $stderr.puts %(Mutex could not be initialized. #{load_error_message})
       exit 1
     end
@@ -317,7 +282,7 @@ class Boot
     begin
       require 'trusty_cms'
       require 'trusty_cms/initializer'
-    rescue LoadError => e
+    rescue LoadError => _
       $stderr.puts %(TrustyCms could not be initialized. #{load_error_message})
       exit 1
     end
@@ -354,4 +319,4 @@ class GemBoot < Boot
   def load_error_message
     "Have you run `bundle install`?'."
   end
-end
+end