trusty-cms 2.0.2.pre.beta → 2.0.2

data/config/boot.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 

data/config/database.mysql.yml

@@ -4,19 +4,19 @@
 #
 
 development:
-  adapter: mysql
+  adapter: mysql2
   database: trusty_cms_dev
   username: root
   password:
 
 test: &TEST
-  adapter: mysql
+  adapter: mysql2
   database: trusty_cms_test
   username: root
   password:
 
 production:
-  adapter: mysql
+  adapter: mysql2
   database: trusty_cms_live
   username: root
   password:

data/config/environments/development.rb

@@ -5,6 +5,7 @@ TrustyCms::Application.configure do
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
+  config.eager_load = false
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true

data/config/environments/test.rb

@@ -6,6 +6,7 @@ TrustyCms::Application.configure do
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
+  config.eager_load = false
 
   # ensure test extensions are loaded
   # test_extension_dir = File.join(File.expand_path(TRUSTY_CMS_ROOT), 'test', 'fixtures', 'extensions')
@@ -23,9 +24,6 @@ TrustyCms::Application.configure do
   config.consider_all_requests_local = true
   config.action_controller.perform_caching             = false
 
-  # Quiet rack cache logging in test mode
-  Rails.application.middleware.delete Rack::Cache
-  Rails.application.middleware.insert 0, Rack::Cache, { verbose: false }
 
   # Raise an ActiveModel::MassAssignmentSecurity::Error any time
   # something is mass-assigned that shouldn't be for ease in debugging.
@@ -40,7 +38,7 @@ TrustyCms::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Raise exceptions instead of rendering exception templates

data/config/initializers/trusty_cms_config.rb

@@ -13,4 +13,5 @@ TrustyCms.config do |config|
   config.define 'site.title', :default => "Your site title", :allow_blank => false
   config.define 'site.host', :default => "www.example.com", :allow_blank => false
   config.define 'user.allow_password_reset?', :default => true
+  config.define 'session_timeout', :default => 2.weeks
 end

data/config/routes.rb

@@ -35,4 +35,5 @@ TrustyCms::Application.routes.draw do
   get 'error/404' => 'site#not_found', :as => :not_found
   get 'error/500' => 'site#error', :as => :error
   get '*url' => 'site#show_page'
+
 end

data/db/migrate/001_create_radiant_tables.rb

@@ -10,7 +10,7 @@ class CreateRadiantTables < ActiveRecord::Migration
       t.column "title", :string
       t.column "slug", :string, :limit => 100
       t.column "breadcrumb", :string, :limit => 160
-      t.column "behavior", :string, :limit => 25
+      t.column "class_name", :string, :limit => 25
       t.column "status_id", :integer, :default => 1, :null => false
       t.column "parent_id", :integer
       t.column "layout_id", :integer
@@ -59,6 +59,7 @@ class CreateRadiantTables < ActiveRecord::Migration
       t.column "updated_at", :datetime
       t.column "created_by", :integer
       t.column "updated_by", :integer
+      t.column "salt", :string
     end
     add_index "users", ["login"], :name => "login", :unique => true
 

data/db/migrate/20100805155020_convert_page_metas.rb

@@ -1,24 +1,11 @@
 class ConvertPageMetas < ActiveRecord::Migration
   def self.up
-    # 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|
-      page.fields.create(:name => 'Keywords', :content => page.keywords)
-      page.fields.create(:name => 'Description', :content => page.description)
-    end
     remove_column :pages, :keywords
     remove_column :pages, :description
-    remove_column :pages, :allowed_children_cache
   end
 
   def self.down
     add_column :pages, :description, :string
     add_column :pages, :keywords, :string
-    Page.all.each do |page|
-      page.description = page.field('description').content
-      page.keywords = page.field('keywords').content
-      page.save
-    end
   end
 end

data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb

@@ -1,10 +1,6 @@
 class AddAllowedChildrenCacheToPages < ActiveRecord::Migration
   def self.up
     add_column :pages, :allowed_children_cache, :text
-    Page.reset_column_information
-    Page.find_each do |page|
-      page.save # update the allowed_children_cache
-    end
   end
 
   def self.down

data/db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb

@@ -1,6 +1,5 @@
 class ChangePagesAllowedChildrenCacheToText  < ActiveRecord::Migration
   def self.up
-    Page.reset_column_information
     change_column :pages, :allowed_children_cache, :text
   end
 

data/lib/generators/instance/templates/databases/mysql.yml

@@ -11,7 +11,7 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql
+  adapter: mysql2
   database: <%= app_name %>_development
   username: root
   password:
@@ -25,7 +25,7 @@ development:
 # re-generated from your development database when you run 'rake'.
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql
+  adapter: mysql2
   database: <%= app_name %>_test
   username: root
   password:
@@ -36,7 +36,7 @@ test:
 <% end -%>
 
 production:
-  adapter: mysql
+  adapter: mysql2
   database: <%= app_name %>_production
   username: root
   password:

data/lib/generators/instance/templates/instance_gemfile

@@ -20,8 +20,8 @@ gem "compass-rails", "~> 1.0.3"
 # SQLite is the default database connection but only suitable for local use
 <%= '# ' unless db == 'sqlite3' %>gem "sqlite3", "~> 1.3.5"
 
-# To use MySQL
-<%= '# ' unless db == 'mysql' %>gem "mysql", "~> 2.8.1"
+# To use MySQL2
+<%= '# ' unless db == 'mysql2' %>"mysql2", "~> 0.4.2"
 
 # Postgres
 <%= '# ' unless db == 'postgresql' %>gem "pg", "~> 0.11.0"

data/lib/generators/trusty_cms/templates/database.yml.erb

@@ -4,25 +4,25 @@
 #
 
 development:
-  adapter: mysql
+  adapter: mysql2
   database: <%= project_name%>_blank_dev
   username:
   password:
   host: localhost
 
 test: &TEST
-  adapter: mysql
+  adapter: mysql2
   database: <%= project_name%>_blank_test
   username:
   password:
   host:
 
 production:
-  adapter: mysql
+  adapter: mysql2
   database: <%= project_name%>_blank_live
   username:
   password:
   socket: /tmp/mysql.sock
 
 cucumber:
-  <<: *TEST
+  <<: *TEST

data/lib/generators/trusty_cms/templates/routes.rb.erb

@@ -1 +0,0 @@
-load File.join(TRUSTY_CMS_ROOT, "config", "routes.rb")

data/lib/login_system.rb

@@ -81,7 +81,7 @@ module LoginSystem
     end
 
     def set_session_cookie(user = current_user)
-      cookies[:session_token] = { :value => user.session_token , :expires => TrustyCms::Config['session_timeout'].to_i.from_now.utc }
+      cookies[:session_token] = { :value => user.session_token , :expires => (Time.now + ((TrustyCms::Config['session_timeout'].to_i)/86400).days).utc }
     end
 
   module ClassMethods

data/lib/tasks/database.rake

@@ -63,9 +63,7 @@ To add more extensions just add them to your Gemfile and run `bundle install`.
   end
 
   desc "Migrate the database through all available migration scripts (looks for db/migrate/* in trusty-cms, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false."
-  task :migrate => :environment do
-    Rake::Task['db:migrate:trusty_cms'].invoke
-    Rake::Task['db:migrate:extensions'].invoke
+  task :migrate => [:environment, 'db:migrate:trusty_cms', 'db:migrate:extensions'] do
     ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
     ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby

data/lib/tasks/framework.rake

@@ -120,7 +120,7 @@ unless File.directory? "#{Rails.root}/app"
 
         db_gems = {
           'sqlite3' => 'sqlite3',
-          'mysql' => 'mysql',
+          'mysql2' => 'mysql2',
           'pg' => 'postgresql',
           'db2' => 'db2',
           'activerecord-sqlserver-adapter' => 'sqlserver'

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.2-beta"
+    VERSION = "2.0.2"
   end
 end

data/lib/trusty_cms/admin_ui.rb

@@ -198,6 +198,7 @@ module TrustyCms
           index.bottom.concat %w{new_button}
         end
         user.new = user.edit
+        user.remove = user.edit
       end
     end
 
@@ -215,6 +216,7 @@ module TrustyCms
           index.bottom.concat %w{new_button}
         end
         layout.new = layout.edit
+        layout.remove = layout.edit
       end
     end
 

data/lib/trusty_cms/extension_migrator.rb

@@ -84,13 +84,12 @@ module TrustyCms
 
       def record_version_state_after_migrating(version)
         sm_table = self.class.schema_migrations_table_name
-
         @migrated_versions ||= []
         if down?
           @migrated_versions.delete(version.to_i)
           ActiveRecord::Base.connection.update("DELETE FROM #{sm_table} WHERE version = #{quote(version_string(version))}")
         else
-          @migrated_versions.push(version.to_i).sort!
+          @migrated_versions.add(version.to_i)
           ActiveRecord::Base.connection.insert("INSERT INTO #{sm_table} (version) VALUES (#{quote(version_string(version))})")
         end
       end

data/lib/trusty_cms/initializer.rb

@@ -3,7 +3,7 @@ require 'rails'
 require 'jquery-rails'
 require 'haml-rails'
 require 'haml'
-require 'mysql'
+require 'mysql2'
 
 require 'trusty_cms/admin_ui'
 require 'trusty_cms/extension_loader'

data/lib/trusty_cms/setup.rb

@@ -36,7 +36,7 @@ module TrustyCms
         :password => password,
         :password_confirmation => password
       }
-      admin = User.find_by_login(username)
+      admin = User.find_by(login: username)
       admin = User.new unless admin
       admin.update_attributes(attributes)
       admin.admin = true

data/spec/ci/database.mysql.yml

@@ -1,4 +1,4 @@
 test: &TEST
-  adapter: mysql
+  adapter: mysql2
   database: radiant_test
   username:

data/spec/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/spec/dummy/Rakefile

@@ -0,0 +1,5 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+TrustyCms::Application.load_tasks

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Rails.application

data/spec/dummy/config/application.rb

@@ -0,0 +1,152 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+require 'acts_as_tree'
+require "trusty_cms"
+require 'ckeditor'
+require 'radius'
+require 'trusty_cms/extension_loader'
+require 'trusty_cms/initializer'
+require 'string_extensions/string_extensions'
+require 'active_record_extensions/active_record_extensions'
+require 'configuration_extensions/configuration_extensions'
+require 'compass'
+require 'rack/cache'
+require "sass-rails"
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  require 'rake'
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
+module TrustyCms
+  class Application < Rails::Application
+    include TrustyCms::Initializer
+
+    config.autoload_paths += %W(#{TRUSTY_CMS_ROOT}/lib)
+    config.autoload_paths += %W(#{config.root}/lib)
+    config.autoload_paths += %W(#{config.root}/app/helpers)
+
+    Sass.load_paths << Compass::Frameworks['compass'].stylesheets_directory
+
+    # Initialize extension paths
+    config.initialize_extension_paths
+    extension_loader = ExtensionLoader.instance {|l| l.initializer = self }
+    extension_loader.paths(:load).reverse_each do |path, value|
+      config.autoload_paths.unshift path
+      $LOAD_PATH.unshift path
+    end
+    # config.add_plugin_paths(extension_loader.paths(:plugin))
+    # TODO: Come back and look at this.
+    radiant_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
+    config.i18n.load_path = radiant_locale_paths + extension_loader.paths(:locale)
+
+    config.encoding = 'utf-8'
+    # Skip frameworks you're not going to use (only works if using vendor/rails).
+    # To use Rails without a database, you must remove the Active Record framework
+    # config.frameworks -= [ :action_mailer ]
+
+    # Only load the extensions named here, in the order given. By default all
+    # extensions in vendor/extensions are loaded, in alphabetical order. :all
+    # can be used as a placeholder for all extensions not explicitly named.
+
+    # An example of how to add extensions:
+    # config.extensions = [ :snippets, :clipped, :layouts, :reorder, :multi_site, :rad_social]
+
+    config.extensions = []
+    config.extensions_migration_order = []
+
+    # By default, only English translations are loaded. Remove any of these from
+    # the list below if you'd like to provide any of the additional options
+    # config.ignore_extensions []
+
+    # Your secret key for verifying cookie session data integrity.
+    # If you change this key, all old sessions will become invalid!
+    # Make sure the secret is at least 30 characters and all random,
+    # no regular words or you'll be exposed to dictionary attacks.
+
+    # Comment out this line if you want to turn off all caching, or
+    # add options to modify the behavior. In the majority of deployment
+    # scenarios it is desirable to leave TrustyCms's cache enabled and in
+    # the default configuration.
+    #
+    # Additional options:
+    #  :use_x_sendfile => true
+    #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd.
+    #  :use_x_accel_redirect => '/some/virtual/path'
+    #    Turns on X-Accel-Redirect support for nginx. You have to provide
+    #    a path that corresponds to a virtual location in your webserver
+    #    configuration.
+    #  :entitystore => "radiant:tmp/cache/entity"
+    #    Sets the entity store type (preceding the colon) and storage
+    #   location (following the colon, relative to Rails.root).
+    #    We recommend you use radiant: since this will enable manual expiration.
+    #  :metastore => "radiant:tmp/cache/meta"
+    #    Sets the meta store type and storage location.  We recommend you use
+    #    radiant: since this will enable manual expiration and acceleration headers.
+
+    # TODO: We're not sure this is actually working, but we can't really test this until the app initializes.
+    config.middleware.use Rack::Cache,
+                          :private_headers => ['Authorization'],
+                          :entitystore => "radiant:tmp/cache/entity",
+                          :metastore => "radiant:tmp/cache/meta",
+                          :verbose => false,
+                          :allow_reload => false,
+                          :allow_revalidate => false
+    # TODO: There's got to be a better place for this, but in order for assets to work fornow, we need ConditionalGet
+    # TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
+    config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
+    config.assets.enabled = true
+
+
+
+    config.filter_parameters += [:password, :password_confirmation]
+
+    # Use the database for sessions instead of the cookie-based default,
+    # which shouldn't be used to store highly confidential information
+    # (create the session table with 'rake db:sessions:create')
+    # config.action_controller.session_store = :cookie_store DEPRECATED
+
+    # Activate observers that should always be running
+    #config.active_record.observers = :user_action_observer
+
+    # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
+    # All files from config/locales/*.rb,yml are added automatically.
+    # config.i18n.load_path << Dir[File.join(Rails.root, 'my', 'locales', '*.{rb,yml}')]
+    # config.i18n.default_locale = :'en'
+
+    # Make Active Record use UTC-base instead of local time
+    config.time_zone = 'UTC'
+
+    # Set the default field error proc
+    config.action_view.field_error_proc = Proc.new do |html, instance|
+      if html !~ /label/
+        %{<span class="error-with-fieldxxxx">#{html} <span class="error">#{[instance.error_message].flatten.first}</span></span>}.html_safe
+      else
+        html
+      end
+    end
+
+    config.after_initialize do
+      extension_loader.load_extensions
+      extension_loader.load_extension_initalizers
+
+      #Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
+      #  load(initializer)
+      #end
+
+      extension_loader.activate_extensions  # also calls initialize_views
+      #config.add_controller_paths(extension_loader.paths(:controller))
+      #config.add_eager_load_paths(extension_loader.paths(:eager_load))
+
+      # Add new inflection rules using the following format:
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.uncountable 'config'
+      end
+
+    end
+  end
+end