radiant 0.8.2 → 0.9.0.rc2

data/lib/generators/language_extension/templates/cucumber.yml

@@ -0,0 +1 @@
+default: --format progress features --tags ~@proposed,~@in_progress

data/lib/generators/language_extension/templates/cucumber_env.rb

@@ -0,0 +1,16 @@
+# Sets up the Rails environment for Cucumber
+ENV["RAILS_ENV"] = "test"
+# Extension root
+extension_env = File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
+require extension_env+'.rb'
+
+Dir.glob(File.join(RADIANT_ROOT, "features", "**", "*.rb")).each {|step| require step}
+ 
+Cucumber::Rails::World.class_eval do
+  include Dataset
+  datasets_directory "#{RADIANT_ROOT}/spec/datasets"
+  Dataset::Resolver.default = Dataset::DirectoryResolver.new("#{RADIANT_ROOT}/spec/datasets", File.dirname(__FILE__) + '/../../spec/datasets', File.dirname(__FILE__) + '/../datasets')
+  self.datasets_database_dump_path = "#{Rails.root}/tmp/dataset"
+  
+  # dataset :<%= file_name %>
+end

data/lib/generators/language_extension/templates/cucumber_paths.rb

@@ -0,0 +1,14 @@
+def path_to(page_name)
+  case page_name
+  
+  when /the homepage/i
+    root_path
+  
+  when /login/i
+    login_path
+  # Add more page name => path mappings here
+  
+  else
+    raise "Can't find mapping from \"#{page_name}\" to a path."
+  end
+end

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

@@ -0,0 +1,8 @@
+class <%= class_name %> < Radiant::Extension
+  version "1.0"
+  description "<%= localization_name %> language pack for Radiant CMS"
+  url "http://yourwebsite.com/<%= file_name %>"
+    
+  def activate
+  end
+end

data/lib/generators/language_extension/templates/functional_test.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class <%= class_name %>Test < Test::Unit::TestCase
+  
+  # Replace this with your real tests.
+  def test_this_extension
+    flunk
+  end
+  
+  def test_initialization
+    assert_equal File.join(File.expand_path(RAILS_ROOT), 'vendor', 'extensions', '<%= file_name %>'), <%= class_name %>.root
+    assert_equal '<%= extension_name %>', <%= class_name %>.extension_name
+  end
+  
+end

data/lib/generators/language_extension/templates/lang.yml

@@ -0,0 +1,181 @@
+---
+<%= localization_name %>:
+  account: 'Account'
+  activerecord:
+    errors:
+      messages:
+        blank: 'required' # required
+        invalid: 'invalid format' #invalid_format
+        not_a_number: 'must be a number' # must be number
+        taken: 'name already in use' # name_in_use
+        too_long: '{{count}}-character limit' # character_limit
+        too_short: '{{count}}-character minimum' # character_minimum
+      models:
+        page:
+          attributes:
+            slug:
+              taken: 'slug already in use for child of parent' # slug_in_use
+        user:
+          attributes:
+            email:
+              invalid: 'invalid e-mail address' # invalid_email
+            login:
+              taken: 'login already in use' # login already in use
+            password:
+              confirmation: 'must match confirmation' # password_confirmation
+  add_child: 'Add Child'
+  add_part: 'Add Part'
+  add_tab: 'Add Tab'
+  admin: 'Administrator' 
+  available_tags: 'Available Tags'
+  available_tags_for: 'Available Tags for'
+  body: 'Body'  
+  breadcrumb: 'Breadcrumb'
+  buttons:
+    create: 'Create {{name}}'   
+    save_and_continue: 'Save and Continue Editing'
+    save_changes: 'Save Changes'  
+  cancel: 'Cancel'
+  change: 'Change'
+  close: 'Close'
+  content: 'Content'
+  content_type: 'Content&#8209;Type'    
+  creating_status: 'Creating {{model}}&#8230;'
+  date:
+    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+    formats:
+      default: "%Y-%m-%d"
+      long: "%B %e, %Y"
+      only_day: "%e"
+      short: "%e %b"
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]   
+    order: [ :year, :month, :day ]
+  delete_layout: 'Delete Layout'
+  delete_pages: 'Delete {{pages}}'  
+  delete_snippet: 'Delete Snippet'
+  delete_user: 'Delete User'
+  description: 'Description'
+  design: 'Design'
+  designer: 'Designer'
+  draft: 'Draft'
+  edit_layout: 'Edit Layout'
+  edit_page:  'Edit Page'   
+  edit_snippet: 'Edit Snippet'
+  edit_user: 'Edit User'
+  email_address: 'E-mail Address'
+  extension: 'Extension'
+  extensions: 'Extensions'
+  filter: 'Filter'
+  hidden: 'Hidden'
+  hide: 'Hide' 
+  keywords: 'Keywords'
+  language: 'Language'
+  layout: 'Layout'
+  layouts: 'Layouts'
+  log_out: 'Logout'
+  logged_in_as: 'Logged in as'
+  login: 'Login'
+  modify: 'Modify' 
+  more: 'More'
+  name: 'Name'
+  new_layout: 'New Layout'    
+  new_page: 'New Page'
+  new_password: 'New Password'
+  new_snippet: 'New Snippet'
+  new_user: 'New User'  
+  no_pages: 'No Pages' 
+  notes: 'Notes'    
+  optional: 'Optional'
+  or: 'or'
+  page: 'Page'
+  page_page: 'Page Part'
+  page_title: 'Page Title'  
+  page_type: 'Page Type'
+  pages: 'Pages'
+  pages_controller:
+    removed_many: "The pages were successfully removed from the site."   
+    removed_one: "The page was successfully removed from the site."  
+    saved: "Your page has been saved below."  
+  password: 'Password' 
+  password_confirmation: 'Confirm New Password'
+  personal: 'Personal'
+  personal_preferences: 'Personal Preferences'
+  please_login: 'Please Login'
+  powered_by: 'Powered by'
+  preferences: 'Preferences' 
+  preferences_controller:
+    error_updating: 'There was an error updating your preferences.'      
+    updated: 'Your preferences have been updated.' 
+  published: 'Published'
+  published_at: 'Published at' 
+  reference:  'Reference'
+  remember_me: 'Remember me'
+  remove: 'Remove'
+  remove_layout: 'Remove Layout' 
+  remove_page: 'Remove Page'
+  remove_pages: 'Remove {{pages}}' 
+  remove_tab: 'Remove Tab'  
+  remove_user: 'Remove user'
+  required: 'Required'  
+  resource_controller:
+    not_found: "{{humanized_model_name}} could not be found."
+    removed: "{{humanized_model_name}} has been deleted."
+    saved: "{{humanized_model_name}} saved below."
+    update_conflict: "{{humanized_model_name}} has been modified since it was last loaded. Changes cannot be saved without potentially losing data." 
+    validation_errors: "Validation errors occurred while processing this form. Please take a moment to  review the form and correct any input errors before continuing."
+  reviewed: 'Reviewed'
+  roles: 'Roles'
+  saving_changes: Saving Changes
+  saving_preferences: Saving preferences
+  search_tags: 'Search Tags:'
+  select:
+    inherit: '<inherit>'
+    none: '<none>' 
+    normal: '<normal>'
+  settings: 'Settings'
+  slug: 'Slug'
+  snippet: 'Snippet'   
+  snippets: 'Snippets'
+  status: 'Status'
+    # Warnings and info text:
+  text:
+    layouts:
+      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following layout?'   
+    pages: 
+      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following {{pages}}?'
+    snippets:
+      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following snippet?'
+    users: 
+      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following user?'
+  this_file_language: "English" 
+  time:
+    am: 'am'
+    formats:
+      datetime:
+        formats:
+          default: "%Y-%m-%dT%H:%M:%S%Z"
+      default: "%a %b %d %H:%M:%S %Z %Y"   
+      long: "%B %d, %Y %H:%M"
+      only_second: "%S"
+      short: "%d %b %H:%M"
+      time: "%H:%M"
+      timestamp: "%I:%M %p on %B %d, %Y" 
+    pm: 'pm'
+  timestamp:
+    at: 'at'
+    by: 'by'
+    last_updated: 'Last Updated'
+  user: 'User'
+  username: 'Username'
+  username_or_email: 'Username or E-mail Address'
+  users: 'Users'
+  users_controller:
+    cannot_delete_self: 'You cannot delete yourself.'    
+  version: 'Version'
+  view_site: 'View Site'
+  website: 'Website'
+  welcome_controller:
+    invalid_user: 'Invalid username, e-mail address, or password.' 
+    logged_out: 'You are now logged out.'  

data/lib/generators/language_extension/templates/spec.opts

@@ -0,0 +1,6 @@
+--colour
+--format
+progress
+--loadby
+mtime
+--reverse

data/lib/generators/language_extension/templates/spec_helper.rb

@@ -0,0 +1,36 @@
+unless defined? RADIANT_ROOT
+  ENV["RAILS_ENV"] = "test"
+  case
+  when ENV["RADIANT_ENV_FILE"]
+    require ENV["RADIANT_ENV_FILE"]
+  when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions}
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
+  else
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../")}/config/environment"
+  end
+end
+require "#{RADIANT_ROOT}/spec/spec_helper"
+
+Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
+
+if File.directory?(File.dirname(__FILE__) + "/matchers")
+  Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file }
+end
+
+Spec::Runner.configure do |config|
+  # config.use_transactional_fixtures = true
+  # config.use_instantiated_fixtures  = false
+  # config.fixture_path = RAILS_ROOT + '/spec/fixtures'
+
+  # You can declare fixtures for each behaviour like this:
+  #   describe "...." do
+  #     fixtures :table_a, :table_b
+  #
+  # Alternatively, if you prefer to declare them only once, you can
+  # do so here, like so ...
+  #
+  #   config.global_fixtures = :table_a, :table_b
+  #
+  # If you declare global fixtures, be aware that they will be declared
+  # for all of your examples, even those that don't use them.
+end

data/lib/generators/language_extension/templates/tasks.rake

@@ -0,0 +1,28 @@
+namespace :radiant do
+  namespace :extensions do
+    namespace :<%= file_name %> do
+      
+      desc "Runs the migration of the <%= localization_name %> language pack"
+      task :migrate => :environment do
+        require 'radiant/extension_migrator'
+        if ENV["VERSION"]
+          <%= class_name %>.migrator.migrate(ENV["VERSION"].to_i)
+        else
+          <%= class_name %>.migrator.migrate
+        end
+      end
+      
+      desc "Copies public assets of the <%= localization_name %> language pack to the instance public/ directory."
+      task :update => :environment do
+        is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }
+        puts "Copying assets from <%= class_name %>"
+        Dir[<%= class_name %>.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
+          path = file.sub(<%= class_name %>.root, '')
+          directory = File.dirname(path)
+          mkdir_p RAILS_ROOT + directory, :verbose => false
+          cp file, RAILS_ROOT + path, :verbose => false
+        end
+      end  
+    end
+  end
+end

data/lib/generators/language_extension/templates/test_helper.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+# Load the environment
+unless defined? RADIANT_ROOT
+  ENV["RAILS_ENV"] = "test"
+  case
+  when ENV["RADIANT_ENV_FILE"]
+    require ENV["RADIANT_ENV_FILE"]
+  when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions}
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
+  else
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../")}/config/environment"
+  end
+end
+require "#{RADIANT_ROOT}/test/test_helper"
+
+class Test::Unit::TestCase
+  
+  # Include a helper to make testing Radius tags easier
+  test_helper :extension_tags
+  
+  # Add the fixture directory to the fixture path
+  self.fixture_path << File.dirname(__FILE__) + "/fixtures"
+  
+  # Add more helper methods to be used by all extension tests here...
+  
+end

data/lib/login_system.rb

@@ -54,24 +54,8 @@ module LoginSystem
       end
     end
 
-    def user_has_role?(role)
-      current_user.send("#{role}?")
-    end
-
     def user_has_access_to_action?(action)
-      permissions = self.class.controller_permissions[action.to_s.intern]
-      case
-      when allowed_roles = permissions[:when]
-        allowed_roles = [allowed_roles].flatten
-        allowed_roles.each do |role|
-          return true if user_has_role?(role)
-        end
-        false
-      when condition_method = permissions[:if]
-        send(condition_method)
-      else
-        true
-      end
+      self.class.user_has_access_to_action?(current_user, action, self)
     end
 
     def login_from_session
@@ -127,5 +111,18 @@ module LoginSystem
     def controller_permissions
       @controller_permissions ||= Hash.new { |h,k| h[k.to_s.intern] = Hash.new }
     end
+    
+    def user_has_access_to_action?(user, action, instance=new)
+      permissions = controller_permissions[action.to_s.intern]
+      case
+      when allowed_roles = permissions[:when]
+        allowed_roles = [allowed_roles].flatten
+        allowed_roles.any? { |role| user.has_role?(role) }
+      when condition_method = permissions[:if]
+        instance.send(condition_method)
+      else
+        true
+      end
+    end
   end
 end

data/lib/radiant.rb

@@ -4,12 +4,13 @@ unless defined? Radiant::Version
   module Radiant
     module Version
       Major = '0'
-      Minor = '8'
-      Tiny  = '2'
+      Minor = '9'
+      Tiny  = '0'
+      Patch = 'rc2' # set to nil for normal release
 
       class << self
         def to_s
-          [Major, Minor, Tiny].join('.')
+          [Major, Minor, Tiny, Patch].join('.')
         end
         alias :to_str :to_s
       end

data/lib/radiant/admin_ui.rb

@@ -8,74 +8,116 @@ module Radiant
 
     class DuplicateTabNameError < StandardError; end
 
-    class Tab
-      attr_accessor :name, :url, :visibility
+    # The NavTab Class holds the structure of a navigation tab (including
+    # its sub-nav items).
+    class NavTab < Array
+      attr_reader :name
 
-      def initialize(name, url, options = {})
-        @name, @url = name, url
-        @visibility = [options[:for], options[:visibility]].flatten.compact
-        @visibility = [:all] if @visibility.empty?
+      def initialize(name)
+        @name = name
       end
 
-      def shown_for?(user)
-        visibility.include?(:all) or
-          visibility.any? { |role| user.send("#{role}?") }
+      def [](id)
+        unless id.kind_of? Fixnum
+          self.find {|subnav_item| subnav_item.name.to_s.titleize == id.to_s.titleize }
+        else
+          super
+        end
       end
-    end
 
-    class TabSet
-      def initialize
-        @tabs = []
+      def <<(*args)
+        options = args.extract_options!
+        item = args.size > 1 ? deprecated_add(*(args << caller)) : args.first
+        raise DuplicateTabNameError.new("duplicate tab name `#{item.name}'") if self[item.name]
+        item.tab = self if item.respond_to?(:tab=)
+        if options.empty?
+          super(item)
+        else
+          options.symbolize_keys!
+          before = options.delete(:before)
+          after = options.delete(:after)
+          tab_name = before || after
+          if self[tab_name]
+            _index = index(self[tab_name])
+            _index += 1 unless before
+            insert(_index, item)
+          else
+            super(item)
+          end
+        end
       end
 
-      def add(name, url, options = {})
+      alias :add :<<
+      
+      def add_item(*args)
+        options = args.extract_options!
         options.symbolize_keys!
         before = options.delete(:before)
         after = options.delete(:after)
         tab_name = before || after
-        if self[name]
-          raise DuplicateTabNameError.new("duplicate tab name `#{name}'")
+        if self[tab_name]
+          _index = index(self[tab_name])
+          _index += 1 unless before
+          insert(_index, NavSubItem.new(args.first, args.second))
         else
-          if tab_name
-            index = @tabs.index(self[tab_name])
-            index += 1 if before.nil?
-            @tabs.insert(index, Tab.new(name, url, options))
-          else
-            @tabs << Tab.new(name, url, options)
-          end
+          add NavSubItem.new(args.first, args.second)
         end
       end
 
-      def remove(name)
-        @tabs.delete(self[name])
+      def visible?(user)
+        any? { |sub_item| sub_item.visible?(user) }
       end
 
-      def size
-        @tabs.size
+      def deprecated_add(name, url, caller)
+        ActiveSupport::Deprecation.warn("admin.tabs.add is no longer supported in Radiant 0.9.x.  Please update your code to use: \ntab \"Content\" do\n\tadd_item(...)\nend", caller)
+        NavSubItem.new(name, url)
       end
+    end
 
-      def [](index)
-        if index.kind_of? Integer
-          @tabs[index]
-        else
-          @tabs.find { |tab| tab.name == index }
-        end
-      end
+    # Simple structure for storing the properties of a tab's sub items.
+    class NavSubItem
+      attr_reader :name, :url
+      attr_accessor :tab
 
-      def each
-        @tabs.each { |t| yield t }
+      def initialize(name, url = "#")
+        @name, @url = name, url
       end
 
-      def clear
-        @tabs.clear
+      def visible?(user)
+        visible_by_controller?(user)
       end
 
-      include Enumerable
+      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)
+        if params && params[:controller]
+          klass = "#{params[:controller].camelize}Controller".constantize
+          klass.user_has_access_to_action?(user, params[:action])
+        else
+          false
+        end
+      end
     end
 
     include Simpleton
 
-    attr_accessor :tabs
+    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 snippet layout user extension}.each do |controller|
@@ -84,10 +126,27 @@ module Radiant
     end
 
     def initialize
-      @tabs = TabSet.new
+      @nav = NavTab.new("Tab Container")
       load_default_regions
     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")
+      design << nav_item("Snippets", "/admin/snippets")
+      nav << design
+
+      settings = nav_tab("Settings")
+      settings << nav_item("Personal", "/admin/preferences/edit")
+      settings << nav_item("Users", "/admin/users")
+      settings << nav_item("Extensions", "/admin/extensions")
+      nav << settings
+    end
+
     def load_default_regions
       @page = load_default_page_regions
       @snippet = load_default_snippet_regions
@@ -101,15 +160,12 @@ module Radiant
     def load_default_page_regions
       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.form_bottom.concat %w{edit_buttons}
-            edit.parts_bottom.concat %w{edit_layout_and_type edit_timestamp}
+          edit.main.concat %w{edit_header edit_form edit_popups}
+          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
-                                      modify_column_header}
+          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
@@ -121,14 +177,14 @@ module Radiant
       returning OpenStruct.new do |user|
         user.preferences = RegionSet.new do |preferences|
           preferences.main.concat %w{edit_header edit_form}
-          preferences.form.concat %w{edit_password edit_email}
+          preferences.form.concat %w{edit_name edit_email edit_username edit_password edit_locale}
           preferences.form_bottom.concat %w{edit_buttons}
         end
         user.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form}
           edit.form.concat %w{edit_name edit_email edit_username edit_password
-                              edit_roles edit_notes}
-          edit.form_bottom.concat %w{edit_timestamp edit_buttons}
+                              edit_roles edit_locale edit_notes}
+          edit.form_bottom.concat %w{edit_buttons edit_timestamp}
         end
         user.index = RegionSet.new do |index|
           index.thead.concat %w{title_header roles_header modify_header}
@@ -143,11 +199,11 @@ module Radiant
       returning OpenStruct.new do |snippet|
         snippet.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form}
-          edit.form.concat %w{edit_title edit_content edit_filter edit_timestamp}
-          edit.form_bottom.concat %w{edit_buttons}
+          edit.form.concat %w{edit_title edit_content edit_filter}
+          edit.form_bottom.concat %w{edit_buttons edit_timestamp}
         end
         snippet.index = RegionSet.new do |index|
-          index.top.concat %w{help_text}
+          index.top.concat %w{}
           index.thead.concat %w{title_header modify_header}
           index.tbody.concat %w{title_cell modify_cell}
           index.bottom.concat %w{new_button}
@@ -160,11 +216,11 @@ module Radiant
       returning OpenStruct.new do |layout|
         layout.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form}
-          edit.form.concat %w{edit_title edit_extended_metadata edit_content edit_timestamp}
-          edit.form_bottom.concat %w{edit_buttons}
+          edit.form.concat %w{edit_title edit_extended_metadata edit_content}
+          edit.form_bottom.concat %w{reference_links edit_buttons edit_timestamp}
         end
         layout.index = RegionSet.new do |index|
-          index.top.concat %w{help_text}
+          index.top.concat %w{}
           index.thead.concat %w{title_header modify_header}
           index.tbody.concat %w{title_cell modify_cell}
           index.bottom.concat %w{new_button}
@@ -172,7 +228,7 @@ module Radiant
         layout.new = layout.edit
       end
     end
-    
+
     def load_default_extension_regions
       returning OpenStruct.new do |extension|
         extension.index = RegionSet.new do |index|