radiantcms-couchrest_model 0.1.3 → 0.1.4

data/lib/generators/extension/extension_generator.rb

@@ -21,20 +21,14 @@ class ExtensionGenerator < Rails::Generator::NamedBase
       m.directory "#{extension_path}/app/models"
       m.directory "#{extension_path}/app/views"
       m.directory "#{extension_path}/config/locales"
-      m.directory "#{extension_path}/config/initializers"
       m.directory "#{extension_path}/db/migrate"
       m.directory "#{extension_path}/lib/tasks"
-      m.directory "#{extension_path}/lib/radiant-#{file_name}-extension"
       
       m.template 'README',              "#{extension_path}/README"
       m.template 'extension.rb',        "#{extension_path}/#{extension_file_name}.rb"
       m.template 'tasks.rake',          "#{extension_path}/lib/tasks/#{extension_file_name}_tasks.rake"
       m.template 'en.yml',              "#{extension_path}/config/locales/en.yml"
       m.template 'routes.rb',           "#{extension_path}/config/routes.rb"
-      m.template 'radiant_config.rb',   "#{extension_path}/config/initializers/radiant_config.rb"
-      m.template 'lib.rb',              "#{extension_path}/lib/radiant-#{file_name}-extension.rb"
-      m.template 'version.rb',          "#{extension_path}/lib/radiant-#{file_name}-extension/version.rb"
-      m.template 'gemspec.rb',          "#{extension_path}/radiant-#{file_name}-extension.gemspec"
       
       if options[:with_test_unit]
         m.directory "#{extension_path}/test/fixtures"

data/lib/generators/extension/templates/README

@@ -1,6 +1,3 @@
 = <%= extension_name %>
 
-Radiant is so freaking awesome, but I made it better through this extension.
-
-Created by <%= author_name %>. <%- if author_email.include?('@') -%>If I don't update this content with real details,
-please contact me at <%= author_email %> with annoying messages telling me to do it.<%- end -%>
+Description goes here

data/lib/generators/extension/templates/RSpecRakefile

@@ -1,3 +1,22 @@
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "radiant-<%= file_name %>-extension"
+    gem.summary = %Q{<%= class_name.titleize %> for Radiant CMS}
+    gem.description = %Q{Describe your extension here}
+    gem.email = "<%= author_email %>"
+    gem.homepage = "<%= homepage %>"
+    gem.authors = ["<%= author_name %>"]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. This is only required if you plan to package <%= file_name %> as a gem."
+end
+
+# In rails 1.2, plugins aren't available in the path until they're loaded.
+# Check to see if the rspec plugin is installed first and require
+# it if it is.  If not, use the gem version.
+
 # Determine where the RSpec plugin is by loading the boot
 unless defined? RADIANT_ROOT
   ENV["RAILS_ENV"] = "test"

data/lib/generators/extension/templates/Rakefile

@@ -2,6 +2,23 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    # Radiant only recognizes gems as extensions if they're named according to
+    # the radiant-*-extension pattern. Please retain the prefix and suffix.
+    gem.name = "radiant-<%= file_name %>-extension"
+    gem.summary = %Q{<%= class_name.titleize %> for Radiant CMS}
+    gem.description = %Q{Describe your extension here}
+    gem.email = "<%= author_email %>"
+    gem.homepage = "<%= homepage %>"
+    gem.authors = ["<%= author_name %>"]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. This is only required if you plan to package <%= file_name %> as a gem."
+end
+
 desc 'Default: run unit tests.'
 task :default => :test
 

data/lib/generators/extension/templates/extension.rb

@@ -1,9 +1,9 @@
 # Uncomment this if you reference any of your controllers in activate
 # require_dependency 'application_controller'
-require 'radiant-<%= file_name %>-extension/version'
+
 class <%= class_name %> < Radiant::Extension
-  version Radiant<%= class_name %>::VERSION
-  description "Adds <%= file_name %> to Radiant."
+  version "1.0"
+  description "Describe your extension here"
   url "<%= homepage %>"
   
   # extension_config do |config|

data/lib/generators/instance/instance_generator.rb

@@ -42,11 +42,11 @@ class InstanceGenerator < Rails::Generator::Base
       base_dirs = %w(config config/environments config/initializers db log script public vendor/plugins vendor/extensions)
       text_files = %w(CHANGELOG CONTRIBUTORS LICENSE INSTALL README)
       environments = Dir["#{root}/config/environments/*.rb"]
-      # initializers are now run from RADIANT_ROOT before the instance, so those are no longer copied across
+      initializers = Dir["#{root}/config/initializers/*.rb"]
       scripts = Dir["#{root}/script/**/*"].reject { |f| f =~ /(destroy|generate|plugin)$/ }
       public_files = ["public/.htaccess"] + Dir["#{root}/public/**/*"]
       
-      files = base_dirs + text_files + environments + scripts + public_files
+      files = base_dirs + text_files + environments + initializers + scripts + public_files
       files.map! { |f| f = $1 if f =~ %r{^#{root}/(.+)$}; f }
       files.sort!
       
@@ -82,7 +82,6 @@ class InstanceGenerator < Rails::Generator::Base
         :app_name => File.basename(File.expand_path(@destination_root))
       }
       m.template "instance_boot.rb", "config/boot.rb"
-      m.file "instance_radiant_config.rb", "config/initializers/radiant_config.rb"
       
       # Install Readme
       m.readme radiant_root("INSTALL")

data/lib/generators/instance/templates/instance_environment.rb

@@ -20,10 +20,9 @@ Radiant::Initializer.run do |config|
   # config.extensions = [ :all ]
   
   # 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
+  # the list below if you'd like to provide any of the supported languages
   config.extensions -= [:dutch_language_pack, :french_language_pack, :german_language_pack,
-                        :italian_language_pack, :japanese_language_pack, :russian_language_pack,
-                        :debug]
+                        :italian_language_pack, :japanese_language_pack, :russian_language_pack]
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!

data/lib/radiant.rb

@@ -5,8 +5,8 @@ unless defined? Radiant::Version
     module Version
       Major = '0'
       Minor = '9'
-      Tiny  = '2'
-      Patch = 'a' # set to nil for normal release
+      Tiny  = '1'
+      Patch = nil # set to nil for normal release
 
       class << self
         def to_s

data/lib/radiant/admin_ui.rb

@@ -120,7 +120,7 @@ module Radiant
     end
 
     # Region sets
-    %w{page snippet layout user configuration extension}.each do |controller|
+    %w{page snippet layout user extension}.each do |controller|
       attr_accessor controller
       alias_method "#{controller}s", controller
     end
@@ -141,7 +141,7 @@ module Radiant
       nav << design
 
       settings = nav_tab("Settings")
-      settings << nav_item("General", "/admin/configuration")
+      settings << nav_item("Personal", "/admin/preferences")
       settings << nav_item("Users", "/admin/users")
       settings << nav_item("Extensions", "/admin/extensions")
       nav << settings
@@ -152,7 +152,6 @@ module Radiant
       @snippet = load_default_snippet_regions
       @layout = load_default_layout_regions
       @user = load_default_user_regions
-      @configuration = load_default_configuration_regions
       @extension = load_default_extension_regions
     end
 
@@ -162,13 +161,12 @@ module Radiant
       returning OpenStruct.new do |page|
         page.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form edit_popups}
-          edit.form.concat %w{edit_title edit_extended_metadata edit_page_parts}
-          edit.layout.concat %w{edit_layout edit_type edit_status edit_published_at}
+          edit.form.concat %w{edit_title edit_extended_metadata edit_page_parts edit_layout_and_type}
           edit.form_bottom.concat %w{edit_buttons edit_timestamp}
         end
         page.index = RegionSet.new do |index|
-          index.sitemap_head.concat %w{title_column_header status_column_header actions_column_header}
-          index.node.concat %w{title_column status_column actions_column}
+          index.sitemap_head.concat %w{title_column_header status_column_header modify_column_header}
+          index.node.concat %w{title_column status_column add_child_column remove_column}
         end
         page.remove = page.children = page.index
         page.new = page._part = page.edit
@@ -189,8 +187,8 @@ module Radiant
           edit.form_bottom.concat %w{edit_buttons edit_timestamp}
         end
         user.index = RegionSet.new do |index|
-          index.thead.concat %w{title_header roles_header actions_header}
-          index.tbody.concat %w{title_cell roles_cell actions_cell}
+          index.thead.concat %w{title_header roles_header modify_header}
+          index.tbody.concat %w{title_cell roles_cell modify_cell}
           index.bottom.concat %w{new_button}
         end
         user.new = user.edit
@@ -206,8 +204,8 @@ module Radiant
         end
         snippet.index = RegionSet.new do |index|
           index.top.concat %w{}
-          index.thead.concat %w{title_header actions_header}
-          index.tbody.concat %w{title_cell actions_cell}
+          index.thead.concat %w{title_header modify_header}
+          index.tbody.concat %w{title_cell modify_cell}
           index.bottom.concat %w{new_button}
         end
         snippet.new = snippet.edit
@@ -223,28 +221,14 @@ module Radiant
         end
         layout.index = RegionSet.new do |index|
           index.top.concat %w{}
-          index.thead.concat %w{title_header actions_header}
-          index.tbody.concat %w{title_cell actions_cell}
+          index.thead.concat %w{title_header modify_header}
+          index.tbody.concat %w{title_cell modify_cell}
           index.bottom.concat %w{new_button}
         end
         layout.new = layout.edit
       end
     end
 
-    def load_default_configuration_regions
-      returning OpenStruct.new do |configuration|
-        configuration.show = RegionSet.new do |show|
-          show.user.concat %w{preferences}
-          show.config.concat %w{site defaults users}
-        end
-        configuration.edit = RegionSet.new do |edit|
-          edit.main.concat %w{edit_header edit_form}
-          edit.form.concat %w{edit_site edit_defaults edit_users}
-          edit.form_bottom.concat %w{edit_buttons}
-        end
-      end
-    end
-
     def load_default_extension_regions
       returning OpenStruct.new do |extension|
         extension.index = RegionSet.new do |index|

data/lib/radiant/extension.rb

@@ -27,7 +27,7 @@ module Radiant
     def routed?
       File.exist?(routing_file)
     end
-
+    
     def migrations_path
       File.join(self.root, 'db', 'migrate')
     end
@@ -35,13 +35,7 @@ module Radiant
     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)
-      end
-    end
-
+    
     def migrator
       unless @migrator
         extension = self

data/lib/radiant/extension_loader.rb

@@ -92,10 +92,6 @@ module Radiant
         end
       end.compact
     end
-    
-    def load_extension_initalizers
-      extensions.each &:load_initializers
-    end
 
     def deactivate_extensions
       extensions.each &:deactivate

data/lib/radiant/initializer.rb

@@ -4,34 +4,10 @@ $LOAD_PATH.unshift "#{RADIANT_ROOT}/vendor/rails/railties/lib"
 require 'initializer'
 require 'radiant/admin_ui'
 require 'radiant/extension_loader'
-require 'radiant/extension_locator'
-require 'radiant/gem_locator'
 
 module Radiant
   autoload :Cache, 'radiant/cache'
   
-  class << self
-    # Radiant.config returns the Radiant::Config eigenclass object, so it can be used wherever you would use Radiant::Config.
-    #
-    #   Radiant.config['site.title']
-    #   Radiant.config['site.url'] = 'example.com'
-    #
-    # but it will also yield itself to a block:
-    #
-    #   Radiant.config do |config|
-    #     config.define 'something', default => 'something'
-    #     config['other.thing'] = 'nothing'
-    #   end
-    #    
-    def config  # method must be defined before any initializers run
-      yield Radiant::Config if block_given?
-      Radiant::Config
-    end
-  end
-  
-  # NB. Radiant::Configuration (aka Rails.configuration) is an extension-aware subclass of Rails::Configuration 
-  #     Radiant::Config (aka Radiant.config) is the application-configuration model class
-  
   class Configuration < Rails::Configuration
     attr_accessor :extension_paths
     attr_writer :extensions
@@ -53,13 +29,6 @@ module Radiant
       paths.unshift(RADIANT_ROOT + "/test/fixtures/extensions") if env == "test"
       paths
     end
-
-    def default_plugin_locators
-      locators = []
-      locators << Radiant::ExtensionLocator if defined? Gem
-      locators << Radiant::GemLocator if defined? Gem
-      locators << Rails::Plugin::FileSystemLocator
-    end
     
     def extensions
       @extensions ||= all_available_extensions
@@ -84,6 +53,7 @@ module Radiant
       AdminUI.instance
     end
 
+
     def extension(ext)
       ::ActiveSupport::Deprecation.warn("Extension dependencies have been deprecated. Extensions may be packaged as gems and use the Gem spec to declare dependencies.", caller)
       @extension_dependencies << ext unless @extension_dependencies.include?(ext)
@@ -225,27 +195,13 @@ end_error
       load_gems
       check_gem_dependencies
     end
-    
-    def load_application_initializers
-      load_radiant_initializers
-      super
-      extension_loader.load_extension_initalizers
-    end
-
-    def load_radiant_initializers
-      unless RADIANT_ROOT == RAILS_ROOT   ## in that case the initializers will be run during normal rails startup
-        Dir["#{RADIANT_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
-          load(initializer)
-        end
-      end
-    end
 
     def after_initialize
       super
       extension_loader.activate_extensions
       configuration.check_extension_dependencies
     end
-    
+
     def initialize_default_admin_tabs
       admin.nav.clear
       admin.load_default_nav

data/lib/radiant/setup.rb

@@ -20,9 +20,7 @@ module Radiant
       UserActionObserver.current_user = @admin
       load_default_configuration
       load_database_template(config[:database_template])
-      announce "Finished."
-      announce "Don't forget to run your update task to copy any public assets for your template.\n\n"
-      announce "For example, run 'rake radiant:extensions:site_templates:update'."
+      announce "Finished.\n\n"
     end
     
     def create_admin_user(name, username, password)
@@ -52,7 +50,6 @@ module Radiant
         step { Radiant::Config['defaults.page.parts' ] = 'body, extended' }
         step { Radiant::Config['defaults.page.status' ] = 'draft' }
         step { Radiant::Config['defaults.page.filter' ] = nil }
-        step { Radiant::Config['defaults.page.fields'] = 'Keywords, Description' }
         step { Radiant::Config['session_timeout'] = 2.weeks }
         step { Radiant::Config['default_locale'] = 'en' }
       end
@@ -71,10 +68,7 @@ module Radiant
       end
       unless filename
         templates = find_and_load_templates("#{RADIANT_ROOT}/db/templates/*.yml")
-        templates.concat find_and_load_templates("#{RADIANT_ROOT}/vendor/extensions/**/db/templates/*.yml")
-        templates.concat find_and_load_templates("#{Rails.root}/vendor/extensions/**/db/templates/*.yml")
-        templates.concat find_and_load_templates("#{Rails.root}/db/templates/*.yml")
-        templates.uniq!
+        templates.concat find_and_load_templates("#{RAILS_ROOT}/db/templates/*.yml") if RADIANT_ROOT != RAILS_ROOT
         choose do |menu|
           menu.header = "\nSelect a database template"
           menu.prompt = "[1-#{templates.size}]: "
@@ -119,19 +113,15 @@ module Radiant
       end
       
       def find_template_in_path(filename)
-        (
-          [
-            filename,
-            "#{RADIANT_ROOT}/#{filename}",
-            "#{RADIANT_ROOT}/db/templates/#{filename}",
-            "#{Rails.root}/#{filename}",
-            "#{Rails.root}/db/templates/#{filename}",
-            "#{Dir.pwd}/#{filename}",
-            "#{Dir.pwd}/db/templates/#{filename}"
-          ] +
-          Dir.glob("#{RADIANT_ROOT}/vendor/extensions/**/db/templates/#{filename}") + 
-          Dir.glob("#{Rails.root}/vendor/extensions/**/db/templates/#{filename}")
-        ).find { |name| File.file?(name) }
+        [
+          filename,
+          "#{RADIANT_ROOT}/#{filename}",
+          "#{RADIANT_ROOT}/db/templates/#{filename}",
+          "#{RAILS_ROOT}/#{filename}",
+          "#{RAILS_ROOT}/db/templates/#{filename}",
+          "#{Dir.pwd}/#{filename}",
+          "#{Dir.pwd}/db/templates/#{filename}",
+        ].find { |name| File.file?(name) }
       end
       
       def find_and_load_templates(glob)

data/lib/task_support.rb

@@ -16,21 +16,15 @@ class TaskSupport
     end
     def config_import(path = "#{Rails.root}/config/radiant_config.yml", clear = nil)
       self.establish_connection
+      Radiant::Config.delete_all if clear
       if File.exist?(path)
-        begin
-          Radiant::Config.transaction do
-            Radiant::Config.delete_all if clear
-            configs = YAML.load(YAML.load_file(path))
-            configs.each do |key, value|
-              c = Radiant::Config.find_or_initialize_by_key(key)
-              c.value = value
-              c.save
-            end
+          configs = YAML.load(YAML.load_file(path))
+          configs.each do |key, value|
+            c = Radiant::Config.find_or_initialize_by_key(key)
+            c.value = value
+            c.save
           end
-          puts "Radiant::Config updated from #{path}"
-        rescue ActiveRecord::RecordInvalid => e
-          puts "IMPORT FAILED and rolled back. #{e}"
-        end
+        puts "Radiant::Config updated from #{path}"
       else
         puts "No file exists at #{path}"
       end
@@ -43,7 +37,7 @@ class TaskSupport
         File.read(File.join(dir, f)) }.join("\n\n")
 
       cache_path = File.join(dir, cache_file)
-      File.delete(cache_path) if File.exists?(cache_path)
+      rm(cache_path) if File.exists?(cache_path)
       File.open(cache_path, "w+") { |f| f.write(cache_content) }
     end