trusty-cms 1.0.0 → 1.0.1

data/lib/trusty_cms/extension_path.rb

@@ -1,10 +1,10 @@
 module TrustyCms
   class ExtensionPath
-    # This class holds information about extensions that may be loaded. It has two roles: to remember the 
+    # This class holds information about extensions that may be loaded. It has two roles: to remember the
     # location of the extension so that we don't have to search for it again, and to look within that path
     # for significant application subdirectories.
     #
-    # We can't just retrieve this information from the Extension class because the initializer sets up 
+    # We can't just retrieve this information from the Extension class because the initializer sets up
     # most of the application load_paths before plugins (including extensions) are loaded. You can think
     # of this as a sort of pre-extension class preparing the way for extension loading.
     #
@@ -22,21 +22,21 @@ module TrustyCms
 
     attr_accessor :name, :path
     @@known_paths = {}
-    
+
     def initialize(options = {}) #:nodoc
-      @name, @path = options[:name], options[:path]
+      @name, @path = options[:name].underscore, options[:path]
       @@known_paths[@name.to_sym] = self
     end
-    
+
     def required
       File.join(path, "#{name}_extension")
     end
-    
+
     def to_s
       path
     end
-    
-    # Builds a new ExtensionPath object from the supplied path, working out the name of the extension by 
+
+    # Builds a new ExtensionPath object from the supplied path, working out the name of the extension by
     # stripping the extra bits from radiant-something-extension-1.0.0 to leave just 'something'. The object
     # is returned, and also remembered here for later use by the initializer (to find load paths) and the
     # ExtensionLoader, to load and activate the extension.
@@ -48,20 +48,20 @@ module TrustyCms
       name = File.basename(name).gsub(/^trusty-|-extension(-[\d\.a-z]+|-[a-z\d]+)*$/, '')
       new(:name => name, :path => path)
     end
-    
+
     # Forgets all recorded extension paths.
     # Currently only used in testing.
     #
     def self.clear_paths!
       @@known_paths = {}
     end
-    
-    # Returns a list of all the likely load paths found within this extension root. It includes all of these 
+
+    # Returns a list of all the likely load paths found within this extension root. It includes all of these
     # that exist and are directories:
     #
     # * path
-    # * path/lib 
-    # * path/app/models 
+    # * path/lib
+    # * path/app/models
     # * path/app/controllers
     # * path/app/metal
     # * path/app/helpers
@@ -86,7 +86,7 @@ module TrustyCms
     #
     def locale_paths
       if check_subdirectory("config/locales")
-        Dir[File.join("#{path}","config/locales","*.{rb,yml}")] 
+        Dir[File.join("#{path}","config/locales","*.{rb,yml}")]
       end
     end
 
@@ -111,7 +111,7 @@ module TrustyCms
       check_subdirectory("app/controllers")
     end
 
-    # Returns the app/views path if it is found within this extension root. 
+    # Returns the app/views path if it is found within this extension root.
     # Call the class method ExtensionPath.view_paths to get a list of the view paths found in all enabled extensions
     # in reverse order so that views override one another correctly.
     #
@@ -130,7 +130,7 @@ module TrustyCms
     #
     def rake_task_paths
       if check_subdirectory("lib/tasks")
-        Dir[File.join("#{path}","lib/tasks/**","*.rake")] 
+        Dir[File.join("#{path}","lib/tasks/**","*.rake")]
       end
     end
 
@@ -143,7 +143,7 @@ module TrustyCms
     def eager_load_paths
       [controller_paths, model_paths, helper_paths].flatten.compact
     end
-    
+
     class << self
       # Returns the ExtensionPath object for the given extension name.
       #
@@ -151,14 +151,14 @@ module TrustyCms
         raise LoadError, "Cannot return path for unknown extension: #{name}" unless @@known_paths[name.to_sym]
         @@known_paths[name.to_sym]
       end
-      
+
       # Returns the root path recorded for the given extension name.
       #
       def for(name)
         find(name).path
       end
 
-      # Returns a list of path objects for all the enabled extensions in the configured order. 
+      # Returns a list of path objects for all the enabled extensions in the configured order.
       # If a configured extension has not been found during initialization, a LoadError will be thrown here.
       #
       # Note that at this stage, in line with the usage of config.extensions = [], the extension names
@@ -168,13 +168,13 @@ module TrustyCms
         enabled_extensions = TrustyCms::Application.config.enabled_extensions
         @@known_paths.values_at(*enabled_extensions).compact
       end
-      
+
       # Returns a list of the root paths to all the enabled extensions, in the configured order.
       #
       def enabled_paths
         enabled.map(&:path)
       end
-      
+
       [:load_paths, :plugin_paths, :helper_paths, :model_paths, :controller_paths, :eager_load_paths].each do |m|
         define_method(m) do
           enabled.map{|ep| ep.send(m)}.flatten.compact
@@ -195,6 +195,6 @@ module TrustyCms
       subdirectory = File.join(path, subpath)
       subdirectory if File.directory?(subdirectory)
     end
-    
+
   end
-end
+end

data/lib/trusty_cms/initializer.rb

@@ -1,31 +1,49 @@
+require 'will_paginate'
+require 'rails'
+require 'jquery-rails'
+require 'haml-rails'
+require 'haml'
+require 'mysql'
+
 require 'trusty_cms/admin_ui'
 require 'trusty_cms/extension_loader'
+require 'string_extensions/string_extensions'
+require 'trusty_cms/engine'
+
+# This is a wild and probably terrible hack built to initialize extension engines.
+# I have no idea what the repercussions will be. Revisit later.
+Gem.loaded_specs.each_with_object([]) do |(gemname, gemspec), found|
+  if gemname =~ /trusty-.*-extension$/
+    ep = TrustyCms::ExtensionLoader.record_path(gemspec.full_gem_path, gemname)
+    require "#{ep.name}/engine"
+  end
+end
 
 module TrustyCms
 
   module Initializer
-  
+
     # Rails::Initializer is essentially a list of startup steps and we extend it here by:
     # * overriding or extending some of those steps so that they use radiant and extension paths
     #   as well as (or instead of) the rails defaults.
     # * appending some extra steps to set up the admin UI and activate extensions
 
 
-    # Returns true in the very unusual case where radiant has been deployed as a rails app itself, rather than 
+    # Returns true in the very unusual case where radiant has been deployed as a rails app itself, rather than
     # loaded as a gem or from vendor/. This is only likely in situations where radiant is customised so heavily
     # that extensions are not sufficient.
     #
     def deployed_as_app?
       TRUSTY_CMS_ROOT == Rails.root
     end
-    
+
     # Extends the Rails::Initializer default to add extension paths to the autoload list.
     # Note that +default_autoload_paths+ is also overridden to point to TRUSTY_CMS_ROOT.
-    # 
+    #
     def set_autoload_patf
       super
     end
-    
+
     # Overrides the Rails initializer to load metal from TRUSTY_CMS_ROOT and from radiant extensions.
     #
     def initialize_metal
@@ -34,7 +52,7 @@ module TrustyCms
       Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths
       Rails::Rack::Metal.metal_paths += extension_loader.paths(:metal)
       Rails::Rack::Metal.metal_paths.uniq!
-    
+
       configuration.middleware.insert_before(
         :"ActionController::ParamsParser",
         Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
@@ -70,13 +88,13 @@ module TrustyCms
       super
       extension_loader.load_extensions
     end
-    
+
     # Extends the Rails initializer to run initializers from radiant and from extensions. The load order will be:
     # 1. TRUSTY_CMS_ROOT/config/intializers/*.rb
     # 2. Rails.root/config/intializers/*.rb
     # 3. config/initializers/*.rb found in extensions, in extension load order.
     #
-    # In the now rare case where radiant is deployed as an ordinary rails application, step 1 is skipped 
+    # In the now rare case where radiant is deployed as an ordinary rails application, step 1 is skipped
     # because it is equivalent to step 2.
     #
     def load_application_initializers
@@ -107,7 +125,7 @@ module TrustyCms
       TrustyCms::Application.config.add_controller_paths(extension_loader.paths(:controller))
       TrustyCms::Application.config.add_eager_load_paths(extension_loader.paths(:eager_load))
     end
-    
+
     # Initializes all the admin interface elements and views. Separate here so that it can be called
     # to reset the interface before extension (re)activation.
     #
@@ -116,15 +134,15 @@ module TrustyCms
       initialize_framework_views
       admin.load_default_regions
     end
-    
+
     # Initializes the core admin tabs. Separate so that it can be invoked by itself in tests.
     #
     def initialize_default_admin_tabs
       admin.initialize_nav
     end
-    
-    # This adds extension view paths to the standard Rails::Initializer method. 
-    # In environments that don't cache templates it reloads the path set on each request, 
+
+    # This adds extension view paths to the standard Rails::Initializer method.
+    # In environments that don't cache templates it reloads the path set on each request,
     # so that new extension paths are noticed without a restart.
     #
     def initialize_framework_views
@@ -135,9 +153,9 @@ module TrustyCms
       if ActionMailer::Base.view_paths.count == 0 || !ActionView::Base.cache_template_loading
         ActionMailer::Base.view_paths = ActionView::Base.process_view_paths(view_paths)
       end
-    end 
+    end
 
-    # Extends the Rails initializer to make sure that extension controller paths are available when routes 
+    # Extends the Rails initializer to make sure that extension controller paths are available when routes
     # are initialized.
     #
     def initialize_routing

data/lib/trusty_cms/pagination/link_renderer.rb

@@ -8,7 +8,7 @@ module TrustyCms
       def initialize(url_stem)
         @url_stem = url_stem
       end
-  
+
       def to_html
         links = @options[:page_links] ? windowed_links : []
         links.unshift page_link_or_span(@collection.previous_page, 'disabled prev_page', @options[:previous_label])
@@ -16,7 +16,7 @@ module TrustyCms
         html = links.join(@options[:separator])
         @options[:container] ? %{<div class="pagination">#{html}</div>} : html
       end
-      
+
       # this is rather crude compared to the WillPaginate link-builder,
       # but it can get by without much context to draw on
       def page_link(page, text, attributes = {})
@@ -31,4 +31,4 @@ module TrustyCms
       end
     end
   end
-end
+end

data/lib/trusty_cms/resource_responses.rb

@@ -5,13 +5,13 @@ module TrustyCms
       base.send :class_attribute, :responses
       base.send :include, InstanceMethods
     end
-    
-    def responses
-      r = (self.responses = read_inheritable_attribute(:responses) || Collector.new)
+
+    def create_responses
+      r = (self.responses ||= Collector.new)
       yield r if block_given?
       r
     end
-    
+
     module InstanceMethods
       def response_for(action)
         responses = self.class.responses.send(action)
@@ -33,7 +33,7 @@ module TrustyCms
           end
         end
       end
-      
+
       def wrap(proc)
         # Makes sure our response blocks get evaluated in the right context
         lambda do
@@ -42,18 +42,18 @@ module TrustyCms
           if RUBY_VERSION =~ /^1\.9/ and proc.lambda? and proc.arity != 1
             raise "You can only pass a proc ('Proc.new') or a lambda that takes exactly one arg (for self) to the wrap method."
           end
-          
+
           instance_eval(&proc)
         end
       end
     end
-    
+
     class Collector < OpenStruct
       def initialize
         super
         @table = Hash.new {|h,k| h[k] = Response.new }
       end
-      
+
       def initialize_copy(orig)
         super
         @table.keys.each do |key|
@@ -61,7 +61,7 @@ module TrustyCms
         end
       end
     end
-    
+
     class Response
       attr_reader :publish_formats, :publish_block, :blocks, :block_order
       def initialize
@@ -69,7 +69,7 @@ module TrustyCms
         @blocks = {}
         @block_order = []
       end
-      
+
       def initialize_copy(orig)
         @publish_formats = orig.publish_formats.dup
         @blocks = orig.blocks.dup
@@ -77,23 +77,23 @@ module TrustyCms
         @publish_block = orig.publish_block.dup if orig.publish_block
         @default = orig.default.dup if orig.default
       end
-      
+
       def default(&block)
         if block_given?
           @default = block
         end
         @default
       end
-      
+
       def publish(*formats, &block)
         @publish_formats.concat(formats)
         if block_given?
-          @publish_block = block 
+          @publish_block = block
         else
           raise ArgumentError, "Block required to publish" unless @publish_block
         end
       end
-      
+
       def each_published
         publish_formats.each do |format|
           yield format, publish_block if block_given?
@@ -118,4 +118,4 @@ module TrustyCms
       end
     end
   end
-end
+end

data/lib/trusty_cms/setup.rb

@@ -3,7 +3,7 @@ require "forwardable"
 
 module TrustyCms
   class Setup
-  
+
     class << self
       def bootstrap(config)
         setup = new
@@ -11,18 +11,18 @@ module TrustyCms
         setup
       end
     end
-    
+
     attr_accessor :config
-    
+
     def bootstrap(config)
       @config = config
       @admin = create_admin_user(config[:admin_name], config[:admin_username], config[:admin_password])
       UserActionObserver.current_user = @admin
       load_default_configuration
-      load_database_template(config[:database_template])
+      # load_database_template(config[:database_template])
       announce "Finished."
     end
-    
+
     def create_admin_user(name, username, password)
       unless name and username and password
         announce "Create the admin user (press enter for defaults)."
@@ -34,15 +34,16 @@ module TrustyCms
         :name => name,
         :login => username,
         :password => password,
-        :password_confirmation => password,
-        :admin => true
+        :password_confirmation => password
       }
       admin = User.find_by_login(username)
       admin = User.new unless admin
       admin.update_attributes(attributes)
+      admin.admin = true
+      admin.save
       admin
     end
-    
+
     def load_default_configuration
       feedback "\nInitializing configuration" do
         step { TrustyCms::Config['admin.title'   ] = 'TrustyCms CMS' }
@@ -55,7 +56,7 @@ module TrustyCms
         step { TrustyCms::Config['default_locale'] = 'en' }
       end
     end
-    
+
     def load_database_template(filename)
       template = nil
       if filename
@@ -85,19 +86,19 @@ module TrustyCms
       end
       create_records(template)
     end
-        
+
     private
-      
+
       def prompt_for_admin_name
         username = ask('Name (Administrator): ', String) do |q|
           q.validate = /^.{0,100}$/
-          q.responses[:not_valid] = "Invalid name. Must be at less than 100 characters long."
+          q.responses[:not_valid] = "Invalid name. Must be under 100 characters long."
           q.whitespace = :strip
         end
         username = "Administrator" if username.blank?
         username
       end
-      
+
       def prompt_for_admin_username
         username = ask('Username (admin): ', String) do |q|
           q.validate = /^(|.{3,40})$/
@@ -107,18 +108,19 @@ module TrustyCms
         username = "admin" if username.blank?
         username
       end
-      
+
       def prompt_for_admin_password
-        password = ask('Password (radiant): ', String) do |q|
+        default_password = 'trusty'
+        password = ask("Password (#{default_password}): ", String) do |q|
           q.echo = false unless defined?(::JRuby) # JRuby doesn't support stty interaction
           q.validate = /^(|.{5,40})$/
           q.responses[:not_valid] = "Invalid password. Must be at least 5 characters long."
           q.whitespace = :strip
         end
-        password = "radiant" if password.blank?
+        password = default_password if password.blank?
         password
       end
-      
+
       def find_template_in_path(filename)
         (
           [
@@ -137,17 +139,17 @@ module TrustyCms
           end
         ).find { |name| File.file?(name) }
       end
-      
+
       def find_and_load_templates(glob)
         templates = Dir[glob]
         templates.map! { |template| load_template_file(template) }
         templates.sort_by { |template| template['name'] }
       end
-      
+
       def load_template_file(filename)
         YAML.load_file(filename)
       end
-      
+
       def create_records(template)
         records = template['records']
         if records
@@ -166,44 +168,44 @@ module TrustyCms
           end
         end
       end
-      
+
       def model(model_name)
         model_name.to_s.singularize.constantize
       end
-      
+
       def order_by_id(records)
         records.map { |name, record| [record['id'], record] }.sort { |a, b| a[0] <=> b[0] }
       end
-      
+
       extend Forwardable
       def_delegators :terminal, :agree, :ask, :choose, :say
-  
+
       def terminal
         @terminal ||= HighLine.new
       end
-  
+
       def output
         terminal.instance_variable_get("@output")
       end
-  
+
       def wrap(string)
         string = terminal.send(:wrap, string) unless terminal.wrap_at.nil?
         string
       end
-  
+
       def print(string)
         output.print(wrap(string))
         output.flush
       end
-  
+
       def puts(string = "\n")
         say string
       end
-  
+
       def announce(string)
         puts "\n#{string}"
       end
-            
+
       def feedback(process, &block)
         print "#{process}..."
         if yield
@@ -217,11 +219,11 @@ module TrustyCms
         puts "FAILED"
         raise e
       end
-      
+
       def step
         yield if block_given?
         print '.'
       end
-      
+
   end
-end
+end