trusty-cms 1.0.0 → 1.0.1

data/lib/simpleton.rb

@@ -1,21 +1,21 @@
 module Simpleton
-  
+
   def self.included(base)
     base.extend(ClassMethods)
   end
-  
+
   module ClassMethods
-    
+
     def instance(&block)
       @instance ||= new
       block.call(@instance) if block_given?
       @instance
     end
-    
+
     def method_missing(method, *args, &block)
       instance.respond_to?(method) ? instance.send(method, *args, &block) : super
     end
-    
+
   end
-  
-end
+
+end

data/lib/string_extensions/string_extensions.rb

@@ -4,11 +4,11 @@ class String
   def symbolize
     self.gsub(/[^A-Za-z0-9]+/, "_").gsub(/(^_+|_+$)/, "").underscore.to_sym
   end
-  
+
   def titlecase
-    self.gsub(/((?:^|\s)[a-z])/) { $1.upcase }
+    self.gsub(/((?:^|\s)[a-z])/) { $1.to_s.upcase }
   end
-  
+
   def to_name(last_part = '')
     self.underscore.gsub('/', ' ').humanize.titlecase.gsub(/\s*#{last_part}$/, '')
   end
@@ -18,8 +18,8 @@ class String
       remove_formatting.downcase.replace_whitespace(sep).collapse(sep)
     end
   end
-  
+
   alias :to_slug   :parameterize
   alias :slugify   :parameterize
   alias :slugerize :parameterize
-end
+end

data/lib/symbol_extensions/symbol_extensions.rb

@@ -2,4 +2,4 @@ class Symbol
   def symbolize
     self.to_s.symbolize
   end
-end
+end

data/lib/tasks/database.rake

@@ -3,13 +3,13 @@ namespace :db do
   task :remigrate => :environment do
     require 'highline/import'
     if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
-      
+
       # Migrate downward
       ActiveRecord::Migrator.migrate("#{TRUSTY_CMS_ROOT}/db/migrate/", 0)
-    
-      # Migrate upward 
+
+      # Migrate upward
       Rake::Task["db:migrate"].invoke
-      
+
       # Dump the schema
       Rake::Task["db:schema:dump"].invoke
     else
@@ -17,14 +17,14 @@ namespace :db do
       exit
     end
   end
-  
-  task :initialize => :environment do    
+
+  task :initialize => :environment do
     require 'highline/import'
     if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
-      # We need to erase and remove all existing radiant tables, but we don't want to 
+      # We need to erase and remove all existing trusty-cms tables, but we don't want to
       # assume that the administrator has access to drop and create the database.
-      # Ideally we should also allow for the presence of non-radiant tables, though
+      # Ideally we should also allow for the presence of non-trusty-cms tables, though
       # that's not a setup anyone would recommend.
       #
       ActiveRecord::Base.connection.tables.each do |table|
@@ -36,7 +36,7 @@ namespace :db do
       exit
     end
   end
-  
+
   desc "Bootstrap your database for TrustyCms."
   task :bootstrap => :initialize do
     require 'trusty_cms/setup'
@@ -47,9 +47,9 @@ namespace :db do
       :database_template => ENV['DATABASE_TEMPLATE']
     )
     Rake::Task['db:migrate:extensions'].invoke
-    Rake::Task['radiant:extensions:update_all'].invoke
+    Rake::Task['trusty_cms:extensions:update_all'].invoke
     puts %{
-Your TrustyCms application is ready to use. Run `script/server -e production` to
+Your TrustyCms application is ready to use. Run `rails s -e production` to
 start the server. Your site will then be running at http://localhost:3000
 
 You can access the administrative interface at http://localhost:3000/admin
@@ -58,16 +58,13 @@ You may also need to set permissions on the public and cache directories so that
 your Web server can access those directories with the user that it runs under.
 
 To add more extensions just add them to your Gemfile and run `bundle install`.
-If an extension is not available as a gem use `script/extension install name`.
-
-Visit http://ext.radiantcms.org to find more extensions.
 
 }
   end
-  
-  desc "Migrate the database through all available migration scripts (looks for db/migrate/* in radiant, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false."
+
+  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:radiant'].invoke
+    Rake::Task['db:migrate:trusty_cms'].invoke
     Rake::Task['db:migrate:extensions'].invoke
     ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
     ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
@@ -75,11 +72,11 @@ Visit http://ext.radiantcms.org to find more extensions.
   end
 
   namespace :migrate do
-    desc "Migrates the database through steps defined in the core radiant distribution. Usual db:migrate options can apply."
-    task :radiant => :environment do
+    desc "Migrates the database through steps defined in the core trusty-cms distribution. Usual db:migrate options can apply."
+    task :trusty_cms => :environment do
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
       ActiveRecord::Migrator.migrate(File.join(TrustyCms.root, 'db', 'migrate'), ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
       Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
   end
-end
+end

data/lib/tasks/extensions.rake

@@ -74,11 +74,11 @@ namespace :spec do
   end
 end
 
-namespace :radiant do
+namespace :trusty_cms do
   namespace :extensions do
     desc "Runs update asset task for all extensions"
     task :update_all => [:environment] do
-      extension_update_tasks = TrustyCms.configuration.enabled_extensions.map { |n| "radiant:extensions:#{n}:update" }.select { |t| Rake::Task.task_defined?(t) }
+      extension_update_tasks = TrustyCms.configuration.enabled_extensions.map { |n| "trusty_cms:extensions:#{n}:update" }.select { |t| Rake::Task.task_defined?(t) }
       extension_update_tasks.each {|t| Rake::Task[t].invoke }
     end
   end

data/lib/tasks/framework.rake

@@ -1,6 +1,6 @@
 # Only define freeze and unfreeze tasks in instance mode
 unless File.directory? "#{Rails.root}/app"
-  namespace :radiant do
+  namespace :trusty_cms do
     namespace :freeze do
       desc "Lock this application to the current gems (by unpacking them into vendor/radiant)"
       task :gems do
@@ -38,21 +38,21 @@ unless File.directory? "#{Rails.root}/app"
         radiant_git = "git://github.com/pgharts/trusty-cms.git"
 
         if File.exist?("vendor/trusty_cms/.git/HEAD")
-          cd("vendor/radiant") { system "git checkout master"; system "git pull origin master"}        
+          cd("vendor/radiant") { system "git checkout master"; system "git pull origin master"}
         else
           system "git clone #{radiant_git} vendor/radiant"
         end
 
         case
         when ENV['TAG']
-          cd("vendor/radiant") { system "git checkout -b v#{ENV['TAG']} #{ENV['TAG']}"} 
+          cd("vendor/radiant") { system "git checkout -b v#{ENV['TAG']} #{ENV['TAG']}"}
         when ENV['BRANCH']
-          cd("vendor/radiant") { system "git checkout --track -b #{ENV['BRANCH']} origin/#{ENV['BRANCH']}"} 
+          cd("vendor/radiant") { system "git checkout --track -b #{ENV['BRANCH']} origin/#{ENV['BRANCH']}"}
         when ENV['REVISION']
-          cd("vendor/radiant") { system "git checkout -b REV_#{ENV['REVISION']} #{ENV['REVISION']}"} 
+          cd("vendor/radiant") { system "git checkout -b REV_#{ENV['REVISION']} #{ENV['REVISION']}"}
         end
 
-        cd("vendor/radiant") { system "git submodule update --init"}        
+        cd("vendor/radiant") { system "git submodule update --init"}
       end
     end
 
@@ -67,9 +67,9 @@ unless File.directory? "#{Rails.root}/app"
       tasks = tasks & ENV['ONLY'].split(',') if ENV['ONLY']
       tasks = tasks - ENV['EXCEPT'].split(',') if ENV['EXCEPT']
 
-      tasks.each do |task| 
+      tasks.each do |task|
         puts "* Updating #{task}"
-        Rake::Task["radiant:update:#{task}"].invoke
+        Rake::Task["trusty_cms:update:#{task}"].invoke
       end
     end
 
@@ -117,7 +117,7 @@ unless File.directory? "#{Rails.root}/app"
         tmpfile = "#{Rails.root}/Gemfile.tmp"
         genfile = "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_gemfile"
         backfile = "#{Rails.root}/Gemfile.bak"
-        
+
         db_gems = {
           'sqlite3' => 'sqlite3',
           'mysql' => 'mysql',
@@ -132,7 +132,7 @@ unless File.directory? "#{Rails.root}/app"
           db = db_gems[active_db_gem]
           f.write ERB.new(File.read(genfile)).result(binding)
         end
-        
+
         unless File.exist?(file) && FileUtils.compare_file(file, tmpfile)
           warning = ""
           if File.exist?(file)
@@ -180,7 +180,7 @@ A Gemfile has been created in your application directory. If you have config.gem
           :cucumber     => "#{Rails.root}/config/environments/cucumber.bak",
           :production   => "#{Rails.root}/config/environments/production.bak"
         }
-        
+
         FileUtils.cp("#{File.dirname(__FILE__)}/../generators/instance/templates/instance_boot.rb", Rails.root + '/config/boot.rb')
         FileUtils.cp("#{File.dirname(__FILE__)}/../../config/preinitializer.rb", Rails.root + '/config/preinitializer.rb')
         warning = ""
@@ -201,7 +201,7 @@ A Gemfile has been created in your application directory. If you have config.gem
         unless warning.blank?
           puts "** WARNING **
 The following files have been changed in TrustyCms. Your originals have
-been backed up with .bak extensions. Please copy your customizations to 
+been backed up with .bak extensions. Please copy your customizations to
 the new files: #{warning}"
         end
       end
@@ -226,7 +226,7 @@ the new files: #{warning}"
       desc "Update admin stylesheets from your current radiant install"
       task :stylesheets do
         project_dir = Rails.root + '/public/stylesheets/admin/'
-        
+
         copy_stylesheets = proc do |project_dir, styles|
           styles.reject!{|s| File.basename(s) == 'overrides.css'} if File.exists?(project_dir + 'overrides.css')
           FileUtils.cp(styles, project_dir)

data/lib/tasks/instance.rake

@@ -20,4 +20,4 @@
 #     end
 #     eval(lines.join("\n"), binding, rake)
 #   end
-# end
+# end

data/lib/tasks/radiant_config.rake

@@ -1,5 +1,5 @@
 require 'trusty_cms/task_support'
-namespace :radiant do
+namespace :trusty_cms do
   namespace :config do
     desc "Export TrustyCms::Config to Rails.root/config/radiant_config.yml. Specify a path with RADIANT_CONFIG_PATH - defaults to Rails.root/config/radiant_config.yml"
     task :export => :environment do
@@ -7,7 +7,7 @@ namespace :radiant do
       clear = ENV['CLEAR_CONFIG'] || nil
       TrustyCms::TaskSupport.config_export(config_path)
     end
-    
+
     desc "Import TrustyCms::Config from Rails.root/config/radiant_config.yml. Specify a path with RADIANT_CONFIG_PATH - defaults to Rails.root/config/radiant_config.yml Set CLEAR_CONFIG=true to delete all existing settings before import"
     task :import => :environment do
       config_path = ENV['RADIANT_CONFIG_PATH'] || "#{Rails.root}/config/radiant_config.yml"
@@ -15,4 +15,4 @@ namespace :radiant do
       TrustyCms::TaskSupport.config_import(config_path, clear)
     end
   end
-end
+end

data/lib/tasks/translate.rake

@@ -1,6 +1,6 @@
-namespace :radiant do
+namespace :trusty_cms do
   namespace :i18n do
-    
+
     desc "Syncs all available translations to the English master"
     task :sync => :environment do
       # All places TrustyCms can store locales
@@ -19,10 +19,10 @@ namespace :radiant do
             other.delete_if { |k,v| !words[k] }         # Remove if not defined in en.yml
             TranslationSupport.write_file(filename, basename, comments, other)
           end
-        end 
+        end
       end
     end
-    
+
     desc "Creates or updates the English available tag descriptions"
     task :available_tags => :environment do
       descriptions = Hash.new
@@ -30,11 +30,11 @@ namespace :radiant do
         tag = '    ' + tag.gsub(':','-') + ':'
         desc = desc.gsub('    ','      ')
         descriptions[tag] = ' "' + desc.gsub('%','%').gsub('"','\"').strip + '"'
-      end 
+      end
       comments = ''
       TranslationSupport.write_file("#{TRUSTY_CMS_ROOT}/config/locales/en_available_tags.yml","---\nen:\n  desc",comments,descriptions)
-    end 
-    
+    end
+
     desc "Syncs all translations available_tags to the English master"
     task :sync_available_tags => :environment do
       # All places TrustyCms can store locales
@@ -51,9 +51,9 @@ namespace :radiant do
             (comments, other) = TranslationSupport.open_available_tags(filename)
             puts other
           end
-        end 
+        end
       end
-    end         
-    
+    end
+
   end
 end

data/lib/tasks/undefine.rake

@@ -13,10 +13,6 @@
 #     radiant:release
 #     radiant:repackage
 #     radiant:uninstall_gem
-#     radiant:import:prototype:stylesheets
-#     radiant:import:prototype:images
-#     radiant:import:prototype:javascripts
-#     radiant:import:prototype:assets
 #     rails:freeze:edge
 #     rails:freeze:gems
 #     rails:unfreeze
@@ -25,4 +21,4 @@
 #     rails:update:javascripts
 #     rails:update:scripts
 #   )
-# end
+# end

data/lib/translation_support.rb

@@ -1,18 +1,18 @@
 class TranslationSupport
   class << self
-    
+
     #Retrieve US word set
     def get_translation_keys(language_root, suffix=nil)
       (dummy_comments, words) = read_file("#{language_root}/en#{suffix}.yml", 'en')
       words
     end
-    
+
     #Retrieve comments, translation data in hash form
     def read_file(filename, basename)
       (comments, data) = IO.read(filename).split(/\n#{basename}:\s*\n/)   #Add error checking for failed file read?
       return comments, create_hash(data, basename)
     end
-    
+
     #Creates hash of translation data
     def create_hash(data, basename)
       words = Hash.new
@@ -32,12 +32,12 @@ class TranslationSupport
       end
       words
     end
-    
+
     def open_available_tags(filename)
       data = YAML::load(File.open("#{filename}"))
       data.to_s
     end
-    
+
     #Writes to file from translation data hash structure
     def write_file(filename,basename,comments,words)
       File.open(filename, "w") do |log|
@@ -49,6 +49,6 @@ class TranslationSupport
         end
       end
     end
-    
+
   end
-end
+end

data/lib/trusty_cms.rb

@@ -5,7 +5,7 @@ unless defined? TrustyCms::Version
     module Version
       Major = '1'
       Minor = '0'
-      Tiny  = '0'
+      Tiny  = '1'
       Patch = nil # set to nil for normal release
 
       class << self

data/lib/trusty_cms/admin_ui.rb

@@ -5,18 +5,18 @@ module TrustyCms
   class AdminUI
     # This may be loaded before ActiveSupport, so do an explicit require
     require 'trusty_cms/admin_ui/region_set'
-    
+
     class DuplicateTabNameError < StandardError; end
-    
+
     # The NavTab Class holds the structure of a navigation tab (including
     # its sub-nav items).
     class NavTab < Array
       attr_reader :name
-      
+
       def initialize(name)
         @name = name
       end
-      
+
       def [](id)
         unless id.kind_of? Fixnum
           self.find {|subnav_item| subnav_item.name.to_s.titleize == id.to_s.titleize }
@@ -24,7 +24,7 @@ module TrustyCms
           super
         end
       end
-      
+
       def <<(*args)
         options = args.extract_options!
         item = args.size > 1 ? deprecated_add(*(args << caller)) : args.first
@@ -46,9 +46,9 @@ module TrustyCms
           end
         end
       end
-      
+
       alias :add :<<
-      
+
       def add_item(*args)
         options = args.extract_options!
         options.symbolize_keys!
@@ -63,37 +63,37 @@ module TrustyCms
           add NavSubItem.new(args.first, args.second)
         end
       end
-      
+
       def visible?(user)
         any? { |sub_item| sub_item.visible?(user) }
       end
-      
+
       def deprecated_add(name, url, caller)
         ActiveSupport::Deprecation.warn("admin.tabs.add is no longer supported in TrustyCms 0.9.x.  Please update your code to use: \ntab \"Content\" do\n\tadd_item(...)\nend", caller)
         NavSubItem.new(name, url)
       end
     end
-    
+
     # Simple structure for storing the properties of a tab's sub items.
     class NavSubItem
       attr_reader :name, :url
       attr_accessor :tab
-      
+
       def initialize(name, url = "#")
         @name, @url = name, url
       end
-      
+
       def visible?(user)
         visible_by_controller?(user)
       end
-      
+
       def relative_url
         File.join(ActionController::Base.relative_url_root || '', url)
       end
-      
+
       private
       def visible_by_controller?(user)
-        params = ActionController::Routing::Routes.recognize_path(url, :method => :get)
+        params = TrustyCms::Application.routes.recognize_path(url, :method => :get)
         if params && params[:controller]
           klass = "#{params[:controller].camelize}Controller".constantize
           klass.user_has_access_to_action?(user, params[:action])
@@ -102,48 +102,48 @@ module TrustyCms
         end
       end
     end
-    
+
     include Simpleton
-    
+
     attr_accessor :nav
-    
+
     def nav_tab(*args)
       NavTab.new(*args)
     end
-    
+
     def nav_item(*args)
       NavSubItem.new(*args)
     end
-    
+
     def tabs
       nav['Content']
     end
-    
+
     # Region sets
     %w{page layout user configuration extension}.each do |controller|
       attr_accessor controller
       alias_method "#{controller}s", controller
     end
-    
+
     def initialize
       initialize_nav
       load_default_regions
     end
-    
+
     def initialize_nav
       @nav = NavTab.new("Tab Container")
       load_default_nav
     end
-    
+
     def load_default_nav
       content = nav_tab("Content")
       content << nav_item("Pages", "/admin/pages")
       nav << content
-      
+
       design = nav_tab("Design")
       design << nav_item("Layouts", "/admin/layouts")
       nav << design
-      
+
       settings = nav_tab("Settings")
       settings << nav_item("General", "/admin/configuration")
       settings << nav_item("Personal", "/admin/preferences")
@@ -151,7 +151,7 @@ module TrustyCms
       settings << nav_item("Extensions", "/admin/extensions")
       nav << settings
     end
-    
+
     def load_default_regions
       @page = load_default_page_regions
       @layout = load_default_layout_regions
@@ -159,9 +159,9 @@ module TrustyCms
       @configuration = load_default_configuration_regions
       @extension = load_default_extension_regions
     end
-    
+
     private
-    
+
     def load_default_page_regions
       OpenStruct.new.tap do |page|
         page.edit = RegionSet.new do |edit|
@@ -178,7 +178,7 @@ module TrustyCms
         page.new = page._part = page.edit
       end
     end
-    
+
     def load_default_user_regions
       OpenStruct.new.tap do |user|
         user.preferences = RegionSet.new do |preferences|
@@ -200,7 +200,7 @@ module TrustyCms
         user.new = user.edit
       end
     end
-    
+
     def load_default_layout_regions
       OpenStruct.new.tap do |layout|
         layout.edit = RegionSet.new do |edit|
@@ -217,12 +217,12 @@ module TrustyCms
         layout.new = layout.edit
       end
     end
-    
+
     def load_default_configuration_regions
       OpenStruct.new.tap do |configuration|
         configuration.show = RegionSet.new do |show|
           show.user.concat %w{preferences}
-          show.config.concat %w{site defaults users}
+          show.trusty_config.concat %w{site defaults users}
         end
         configuration.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form}
@@ -231,7 +231,7 @@ module TrustyCms
         end
       end
     end
-    
+
     def load_default_extension_regions
       OpenStruct.new.tap do |extension|
         extension.index = RegionSet.new do |index|