trusty-cms 1.0.0 → 1.0.1

data/lib/trusty_cms/admin_ui/region_partials.rb

@@ -3,11 +3,11 @@ class TrustyCms::AdminUI::RegionPartials
     @partials = Hash.new {|h,k| h[k] = "<strong>`#{k}' default partial not found!</strong>" }
     @template = template
   end
-  
+
   def [](key)
     @partials[key.to_s]
   end
-  
+
   def method_missing(method, *args, &block)
     if block_given?
       # Ruby 1.9.2 yields self in instance_eval... see https://gist.github.com/479572
@@ -20,4 +20,4 @@ class TrustyCms::AdminUI::RegionPartials
       @partials[method.to_s]
     end
   end
-end
+end

data/lib/trusty_cms/admin_ui/region_set.rb

@@ -6,11 +6,11 @@ class TrustyCms::AdminUI::RegionSet
     end
     yield self if block_given?
   end
-  
+
   def [](region)
     @regions[region.to_sym]
   end
-  
+
   def add(region=nil, partial=nil, options={})
     raise ArgumentError, "You must specify a region and a partial" unless region and partial
     if options[:before]
@@ -23,7 +23,7 @@ class TrustyCms::AdminUI::RegionSet
       self[region] << partial
     end
   end
-  
+
   def method_missing(method, *args, &block)
     if args.empty?
       self[method]
@@ -31,5 +31,5 @@ class TrustyCms::AdminUI::RegionSet
       super
     end
   end
-  
-end
+
+end

data/lib/trusty_cms/available_locales.rb

@@ -1,5 +1,5 @@
 module TrustyCms::AvailableLocales
-  
+
   # Returns the list of available locale files in options_for_select format.
   #
   def self.locales

data/lib/trusty_cms/config/definition.rb

@@ -1,14 +1,14 @@
 module TrustyCms
   class Config
     class Definition
-      
+
       attr_reader :empty, :default, :type, :notes, :validate_with, :select_from, :allow_blank, :allow_display, :allow_change, :units, :definer
 
       # Configuration 'definitions' are metadata held in memory that add restriction and description to individual config entries.
       #
       # By default radiant's configuration machinery is open and ad-hoc: config items are just globally-accessible variables.
-      # They're created when first mentioned and then available in all parts of the application. The definition mechanism is a way 
-      # to place limits on that behavior. It allows you to protect a config entry, to specify the values it can take and to 
+      # They're created when first mentioned and then available in all parts of the application. The definition mechanism is a way
+      # to place limits on that behavior. It allows you to protect a config entry, to specify the values it can take and to
       # validate it when it changes. In the next update it will also allow you to declare that
       # a config item is global or site-specific.
       #
@@ -27,32 +27,32 @@ module TrustyCms
           instance_variable_set "@#{attribute}".to_sym, options[attribute]
         end
       end
-      
+
       # Returns true if the definition included an :empty flag, which should only be the case for the blank, unrestricting
       # definitions created when an undefined config item is set or got.
       #
       def empty?
         !!empty
       end
-      
-      # Returns true if the definition included a :type => :boolean parameter. Config entries that end in '?' are automatically 
+
+      # Returns true if the definition included a :type => :boolean parameter. Config entries that end in '?' are automatically
       # considered boolean, whether a type is declared or not. config.boolean? may therefore differ from config.definition.boolean?
       #
       def boolean?
         type == :boolean
       end
-      
+
       # Returns true if the definition included a :select_from parameter (either as list or proc).
       #
       def selector?
-        !select_from.blank?   
+        !select_from.blank?
       end
-      
+
       # Returns true if the definition included a :type => :integer parameter
       def integer?
         type == :integer
       end
-      
+
       # Returns the list of possible values for this config entry in a form suitable for passing to options_for_select.
       # if :select_from is a proc it is called first with no arguments and its return value passed through.
       #
@@ -65,7 +65,7 @@ module TrustyCms
           choices
         end
       end
-      
+
       # in definitions we accept anything that options_for_select would normally take
       # here we standardises on an options array-of-arrays so that it's easier to validate input
       #
@@ -73,8 +73,8 @@ module TrustyCms
         choices = choices.to_a if Hash === choices
         choices = choices.collect{|c| (c.is_a? Array) ? c : [c,c]}
       end
-      
-      # If the config item is a selector and :select_from specifies [name, value] pairs (as hash or array), 
+
+      # If the config item is a selector and :select_from specifies [name, value] pairs (as hash or array),
       # this will return the name corresponding to the currently selected value.
       #
       def selected(value)
@@ -82,7 +82,7 @@ module TrustyCms
           pair.first
         end
       end
-      
+
       # Checks the supplied value against the validation rules for this definition.
       # There are several ways in which validations might be defined or implied:
       # * if :validate_with specifies a block, the setting object is passed to the block
@@ -106,36 +106,36 @@ module TrustyCms
           Integer(setting.value) rescue setting.errors.add :value, :not_a_number
         end
       end
-      
+
       # Returns true if the value is one of the permitted selections. Not case-sensitive.
       def selectable?(value)
         return true unless selector?
         selection.map(&:last).map(&:downcase).include?(value.downcase)
       end
-      
+
       # Returns true unless :allow_blank has been explicitly set to false. Defaults to true.
       # A config item that does not allow_blank must be set or it will not be valid.
       def allow_blank?
         true unless allow_blank == false
       end
-      
-      # Returns true unless :allow_change has been explicitly set to false. Defaults to true. 
+
+      # Returns true unless :allow_change has been explicitly set to false. Defaults to true.
       # A config item that is not settable cannot be changed in the running application.
       def settable?
         true unless allow_change == false
       end
-      
+
       # Returns true unless :allow_change has been explicitly set to false. Defaults to true.
       # A config item that is not visible cannot be displayed in a radius tag.
       def visible?
         true unless allow_display == false
       end
-      
+
       # Returns true if :allow_display has been explicitly set to false. Defaults to true.
       def hidden?
         true if allow_display == false
       end
-      
+
     end
   end
 end

data/lib/trusty_cms/engine.rb

@@ -1,10 +1,7 @@
 module TrustyCms
   class Engine < Rails::Engine
-    isolate_namespace TrustyCms
-
-    config.generators do |g|
-      g.test_framework :rspec
-      g.integration_tool :cucumber
-    end
+    paths["app/helpers"] = []
   end
-end
+end
+
+require 'ckeditor'

data/lib/trusty_cms/extension.rb

@@ -10,46 +10,46 @@ module TrustyCms
     annotate :version, :description, :url, :extension_name, :path
 
     attr_writer :active
-    
+
     def active?
       @active
     end
-    
+
     def root
       path.to_s
     end
-    
+
     def migrated?
       migrator.new(:up, migrations_path).pending_migrations.empty?
     end
-    
+
     def enabled?
       active? and migrated?
     end
-    
+
     # Conventional plugin-like routing
     def routed?
       File.exist?(routing_file)
     end
-    
+
     def migrations_path
       File.join(self.root, 'db', 'migrate')
     end
-    
+
     def migrates_from
       @migrates_from ||= {}
     end
-    
+
     def routing_file
       File.join(self.root, 'config', 'routes.rb')
     end
-        
+
     def load_initializers
       Dir["#{self.root}/config/initializers/**/*.rb"].sort.each do |initializer|
-        load(initializer)
+        require initializer
       end
     end
-    
+
     def migrator
       unless @migrator
         extension = self
@@ -57,11 +57,11 @@ module TrustyCms
       end
       @migrator
     end
-    
+
     def admin
       AdminUI.instance
     end
-    
+
     def tab(name, options={}, &block)
       @the_tab = admin.nav[name]
       unless @the_tab
@@ -84,7 +84,7 @@ module TrustyCms
       return @the_tab
     end
     alias :add_tab :tab
-    
+
     def add_item(*args)
       @the_tab.add_item(*args)
     end
@@ -140,7 +140,7 @@ module TrustyCms
       def extension_config(&block)
         yield Rails.configuration
       end
-      
+
     end
   end
 end

data/lib/trusty_cms/extension/script.rb

@@ -48,11 +48,11 @@ Supports:       TrustyCms #{supports_radiant_version}
       tasks = Rake.application.tasks.map(&:name)
       tasks.include? task
     end
-    
+
     def file_utils
       FileUtils
     end
-    
+
     delegate :cd, :cp_r, :rm_r, :to => :file_utils
   end
 
@@ -151,11 +151,11 @@ Supports:       TrustyCms #{supports_radiant_version}
     def project_in_git?
       @in_git ||= File.directory?(".git")
     end
-    
+
     def checkout_command
       "git clone #{url} #{name}"
     end
-    
+
     def checkout
       if project_in_git?
         system "git submodule add #{url} vendor/extensions/#{name}"
@@ -169,7 +169,7 @@ Supports:       TrustyCms #{supports_radiant_version}
         end
       end
     end
-    
+
     def copy_to_vendor_extensions
       super unless project_in_git?
     end
@@ -355,10 +355,10 @@ module TrustyCms
 
   For help on an individual command:
       script/extension help command
-      
+
   You may install extensions from another registry by setting the REGISTRY_URL
   By default the REGISTRY_URL is set to http://ext.radiantcms.org
-  
+
   Code for the registry application may be found at:
   http://github.com/radiant/radiant-extension-registry/
             }

data/lib/trusty_cms/extension_loader.rb

@@ -4,13 +4,13 @@ require 'method_observer'
 
 module TrustyCms
   class ExtensionLoader
-    # The ExtensionLoader is reponsible for the loading, activation and reactivation of extensions. 
+    # The ExtensionLoader is reponsible for the loading, activation and reactivation of extensions.
     # The noticing of important subdirectories is now handled by the ExtensionPath class.
 
     class DependenciesObserver < MethodObserver
       # Extends the reload mechanism in ActiveSupport so that extensions are deactivated and reactivated
       # when model classes are reloaded (in development mode, usually).
-      
+
       attr_accessor :config
 
       def initialize(rails_config) #:nodoc
@@ -49,13 +49,13 @@ module TrustyCms
     #   extension_loader.paths(:eager_load)    #=> ['extension/app/controllers', 'extension/app/models', 'extension/app/helpers']
     #
     # For compatibility with the old loader, there are corresponding +type_paths+ methods.
-    # There are also (deprecated) +add_type_paths+ methods. 
+    # There are also (deprecated) +add_type_paths+ methods.
     #
     def paths(type)
       ExtensionPath.send("#{type}_paths".to_sym)
     end
 
-    # Loads but does not activate all the extensions that have been enabled, in the configured order 
+    # Loads but does not activate all the extensions that have been enabled, in the configured order
     # (which defaults to alphabetically). If an extension fails to load an error will be logged
     # but application startup will continue. If an extension doesn't exist, a LoadError will be raised
     # and startup will halt.
@@ -65,7 +65,7 @@ module TrustyCms
       @observer ||= DependenciesObserver.new(configuration).observe(::ActiveSupport::Dependencies)
       self.extensions = configuration.enabled_extensions.map { |ext| load_extension(ext) }.compact
     end
-    
+
     # Loads the specified extension.
     #
     def load_extension(name)
@@ -81,17 +81,17 @@ module TrustyCms
         nil
       end
     end
-    
+
     # Loads all the initializers defined in enabled extensions, in the configured order.
     #
     def load_extension_initalizers
-      extensions.each &:load_initializers
+      extensions.each(&:load_initializers)
     end
 
     # Deactivates all enabled extensions.
     #
     def deactivate_extensions
-      extensions.each &:deactivate
+      extensions.each(&:deactivate)
     end
 
     # Activates all enabled extensions and makes sure that any newly declared subclasses of Page are recognised.
@@ -99,21 +99,33 @@ module TrustyCms
     #
     def activate_extensions
       initializer.initialize_views
-      extensions.each &:activate
+      ordered_extensions = []
+      configuration = TrustyCms::Application.config
+      if configuration.extensions.first == :all
+        ordered_extensions = extensions
+      else
+        configuration.extensions.each {|name| ordered_extensions << select_extension(name)  }
+      end
+      ordered_extensions.flatten.each(&:activate)
       Page.load_subclasses
     end
+
+    def select_extension(name)
+      extensions.select {|ext| ext.extension_name.symbolize == name}
+    end
+
     alias :reactivate :activate_extensions
 
     class << self
       # Builds an ExtensionPath object from the supplied path, working out the name of the extension on the way.
       # The ExtensionPath object will later be used to scan and load the extension.
-      # An extension name can be supplied in addition to the path. It will be processed in the usual way to 
+      # An extension name can be supplied in addition to the path. It will be processed in the usual way to
       # remove radiant- and -extension and any verion numbering.
       #
       def record_path(path, name=nil)
         ExtensionPath.from_path(path, name)
       end
-    
+
       # For compatibility with old calls probably still to be found in some extensions.
       #
       %w{controller model view metal plugin load locale}.each do |type|

data/lib/trusty_cms/extension_migrator.rb

@@ -6,7 +6,7 @@ module TrustyCms
       def migrate(target_version = nil)
         super extension.migrations_path, target_version
       end
-      
+
       def migrate_extensions
         TrustyCms::Application.config.enabled_extensions.each do |ext|
           to_migrate = Extension.descendants.detect{|descendant| descendant.name == "#{ext.to_s.camelize}Extension" }
@@ -20,30 +20,30 @@ module TrustyCms
           map { |version| version.sub("#{@extension.extension_name}-", '').to_i }.sort
       end
     end
-    
+
     def initialize(direction, migrations_path, target_version = nil)
       super
       initialize_extension_schema_migrations
       initialize_received_migrations
     end
-    
+
     private
       def quote(s)
         ActiveRecord::Base.connection.quote(s)
       end
-      
+
       def extension_name
         self.class.extension.extension_name
       end
-      
+
       def version_string(version)
         "#{extension_name}-#{version}"
       end
-      
+
       def initialize_extension_schema_migrations
         current_version = ActiveRecord::Base.connection.select_value("SELECT schema_version FROM extension_meta WHERE name = #{quote(extension_name)}")
         if current_version
-          assume_migrated_upto_version(current_version.to_i) 
+          assume_migrated_upto_version(current_version.to_i)
           ActiveRecord::Base.connection.delete("DELETE FROM extension_meta WHERE name = #{quote(extension_name)}")
         end
       end
@@ -57,7 +57,7 @@ module TrustyCms
           end
         end
       end
-      
+
       def assume_migrated_upto_version(version)
         version = version.to_i
         sm_table = self.class.schema_migrations_table_name
@@ -81,7 +81,7 @@ module TrustyCms
           end
         end
       end
-      
+
       def record_version_state_after_migrating(version)
         sm_table = self.class.schema_migrations_table_name