trusty-cms 1.0.0 → 1.0.1

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

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

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

@@ -5,12 +5,12 @@ extension_env = File.expand_path(File.dirname(__FILE__) + '/../../../../../confi
 require extension_env+'.rb'
 
 Dir.glob(File.join(TRUSTY_CMS_ROOT, "features", "**", "*.rb")).each {|step| require step}
- 
+
 Cucumber::Rails::World.class_eval do
   include Dataset
   datasets_directory "#{TRUSTY_CMS_ROOT}/spec/datasets"
   Dataset::Resolver.default = Dataset::DirectoryResolver.new("#{TRUSTY_CMS_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
+end

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

@@ -1,14 +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
+end

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

@@ -9,4 +9,4 @@ class <%= class_name %> < TrustyCms::Extension
 
   def activate
   end
-end
+end

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

@@ -1,15 +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

@@ -26,20 +26,20 @@
   add_child: 'Add Child'
   add_part: 'Add Part'
   add_tab: 'Add Tab'
-  admin: 'Administrator' 
+  admin: 'Administrator'
   available_tags: 'Available Tags'
   available_tags_for: 'Available Tags for'
-  body: 'Body'  
+  body: 'Body'
   breadcrumb: 'Breadcrumb'
   buttons:
-    create: 'Create %{name}'   
+    create: 'Create %{name}'
     save_and_continue: 'Save and Continue Editing'
-    save_changes: 'Save Changes'  
+    save_changes: 'Save Changes'
   cancel: 'Cancel'
   change: 'Change'
   close: 'Close'
   content: 'Content'
-  content_type: 'Content‑Type'    
+  content_type: 'Content‑Type'
   creating_status: 'Creating %{model}…'
   date:
     abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
@@ -50,10 +50,10 @@
       long: "%B %e, %Y"
       only_day: "%e"
       short: "%e %b"
-    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]   
+    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_pages: 'Delete %{pages}'
   delete_snippet: 'Delete Snippet'
   delete_user: 'Delete User'
   description: 'Description'
@@ -61,7 +61,7 @@
   designer: 'Designer'
   draft: 'Draft'
   edit_layout: 'Edit Layout'
-  edit_page:  'Edit Page'   
+  edit_page:  'Edit Page'
   edit_snippet: 'Edit Snippet'
   edit_user: 'Edit User'
   email_address: 'E-mail Address'
@@ -69,7 +69,7 @@
   extensions: 'Extensions'
   filter: 'Filter'
   hidden: 'Hidden'
-  hide: 'Hide' 
+  hide: 'Hide'
   keywords: 'Keywords'
   language: 'Language'
   layout: 'Layout'
@@ -77,53 +77,53 @@
   log_out: 'Logout'
   logged_in_as: 'Logged in as'
   login: 'Login'
-  modify: 'Modify' 
+  modify: 'Modify'
   more: 'More'
   name: 'Name'
-  new_layout: 'New Layout'    
+  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'    
+  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_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' 
+    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: 'Preferences'
   preferences_controller:
-    error_updating: 'There was an error updating your preferences.'      
-    updated: 'Your preferences have been updated.' 
+    error_updating: 'There was an error updating your preferences.'
+    updated: 'Your preferences have been updated.'
   published: 'Published'
-  published_at: 'Published at' 
+  published_at: 'Published at'
   reference:  'Reference'
   remember_me: 'Remember me'
   remove: 'Remove'
-  remove_layout: 'Remove Layout' 
+  remove_layout: 'Remove Layout'
   remove_page: 'Remove Page'
-  remove_pages: 'Remove %{pages}' 
-  remove_tab: 'Remove Tab'  
+  remove_pages: 'Remove %{pages}'
+  remove_tab: 'Remove Tab'
   remove_user: 'Remove user'
-  required: 'Required'  
+  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." 
+    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'
@@ -132,36 +132,36 @@
   search_tags: 'Search Tags:'
   select:
     inherit: '<inherit>'
-    none: '<none>' 
+    none: '<none>'
     normal: '<normal>'
   settings: 'Settings'
   slug: 'Slug'
-  snippet: 'Snippet'   
+  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 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: 
+    users:
       remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following user?'
-  this_file_language: "<%= file_name.capitalize %>" 
+  this_file_language: "<%= file_name.capitalize %>"
   time:
     am: 'am'
     formats:
       datetime:
         formats:
           default: "%Y-%m-%dT%H:%M:%S%Z"
-      default: "%a %b %d %H:%M:%S %Z %Y"   
+      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" 
+      timestamp: "%I:%M %p on %B %d, %Y"
     pm: 'pm'
   timestamp:
     at: 'at'
@@ -172,10 +172,10 @@
   username_or_email: 'Username or E-mail Address'
   users: 'Users'
   users_controller:
-    cannot_delete_self: 'You cannot delete yourself.'    
+    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.'  
+    invalid_user: 'Invalid username, e-mail address, or password.'
+    logged_out: 'You are now logged out.'

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

@@ -33,4 +33,4 @@ Spec::Runner.configure do |config|
   #
   # 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
+end

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

@@ -1,7 +1,7 @@
 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 'trusty_cms/extension_migrator'
@@ -11,7 +11,7 @@ namespace :radiant do
           <%= 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) }
@@ -22,7 +22,7 @@ namespace :radiant do
           mkdir_p Rails.root + directory, :verbose => false
           cp file, Rails.root + path, :verbose => false
         end
-      end  
+      end
     end
   end
 end

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

@@ -14,13 +14,13 @@ end
 require "#{TRUSTY_CMS_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
+
+end

data/lib/inheritable_class_attributes.rb

@@ -8,52 +8,52 @@ module InheritableClassAttributes
       end
     end
   end
-  
+
   module ClassMethods
     def inheritable_cattr_readers
       @inheritable_class_readers ||= []
     end
-    
+
     def inheritable_cattr_writers
       @inheritable_class_writers ||= []
     end
-    
+
     def cattr_inheritable_reader(*symbols)
       symbols.each do |symbol|
         self.inheritable_cattr_readers << symbol
         self.module_eval %{
           def self.#{symbol}
             @#{symbol}
-          end 
+          end
         }
       end
       self.inheritable_cattr_readers.uniq!
     end
-    
+
     def cattr_inheritable_writer(*symbols)
       symbols.each do |symbol|
         self.inheritable_cattr_writers << symbol
         self.module_eval %{
           def self.#{symbol}=(value)
             @#{symbol} = value
-          end 
+          end
         }
       end
       self.inheritable_cattr_writers.uniq!
     end
-    
+
     def cattr_inheritable_accessor(*symbols)
       cattr_inheritable_writer(*symbols)
       cattr_inheritable_reader(*symbols)
     end
-    
+
     def inherited_with_inheritable_class_attributes(klass)
       inherited_without_inheritable_class_attributes(klass) if respond_to?(:inherited_without_inheritable_class_attributes)
-      
+
       readers = inheritable_cattr_readers.dup
       writers = inheritable_cattr_writers.dup
       inheritables = [:inheritable_cattr_readers, :inheritable_cattr_writers]
-      
+
       (readers + writers + inheritables).uniq.each do |attr|
         var = "@#{attr}"
         old_value = self.module_eval(var)
@@ -62,4 +62,4 @@ module InheritableClassAttributes
       end
     end
   end
-end
+end

data/lib/local_time.rb

@@ -2,5 +2,5 @@ module LocalTime
   def adjust_time(time)
     ::ActiveSupport::Deprecation.warn("`adjust_time' is deprecated. All time output is now auto-adjusted to TrustyCms::Config['local.timezone'] or the default ActiveRecord time zone.", caller)
     time
-  end 
-end
+  end
+end

data/lib/login_system.rb

@@ -13,21 +13,20 @@ module LoginSystem
     def current_user
       @current_user ||= (login_from_session || login_from_cookie || login_from_http)
     end
-    
+
     def current_user=(value=nil)
       if value && value.is_a?(User)
         @current_user = value
-        session['user_id'] = value.id 
+        session['user_id'] = value.id
       else
         @current_user = nil
         session['user_id'] = nil
       end
       @current_user
     end
-    
+
     def authenticate
       #puts _process_action_callbacks.map(&:filter)
-      action = params['action'].to_s.intern
       if current_user
         session['user_id'] = current_user.id
         true
@@ -89,7 +88,7 @@ module LoginSystem
     def no_login_required
       skip_before_filter :authenticate
       skip_before_filter :authorize
-      puts _process_action_callbacks.map(&:filter)
+      # puts _process_action_callbacks.map(&:filter)
     end
 
     def login_required?
@@ -115,7 +114,7 @@ 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

data/lib/method_observer.rb

@@ -1,30 +1,30 @@
 class MethodObserver
-  
+
   attr_reader :target
   attr_accessor :result
-  
+
   class ObserverCannotObserveTwiceError < StandardError
     def initialize(message = 'observer cannot observe twice')
       super
     end
   end
-  
+
   def observe(target)
     raise ObserverCannotObserveTwiceError if @target
     @target = target
     make_observable(target)
   end
-  
+
   def self.instances
     @instances ||= {}
   end
-  
+
   def self.new(*args)
     o = super
     instances[o.object_id] = o
     o
   end
-  
+
   private
     def make_observable(target)
       methods_to_observe.each do |method|
@@ -39,12 +39,12 @@ class MethodObserver
         }
       end
     end
-    
+
     def methods_to_observe
       (methods_for(:before) + methods_for(:after)).uniq
     end
-    
+
     def methods_for(name)
       methods.grep(/^#{name}_/).map { |n| n.to_s.gsub(/^#{name}_/, '').intern }
     end
-end
+end