trusty-cms 1.0.0 → 1.0.1

data/app/models/status.rb

@@ -5,31 +5,31 @@ class Status
     options = options.symbolize_keys
     @id, @name = options[:id], options[:name]
   end
-  
+
   def symbol
     @name.to_s.downcase.intern
   end
-  
+
   def self.[](value)
     @@statuses.find { |status| status.symbol == value.to_s.downcase.intern }
   end
-  
+
   def self.find(id)
     @@statuses.find { |status| status.id.to_s == id.to_s }
   end
-  
+
   def self.find_all
     @@statuses.dup
   end
-  
+
   def self.selectable
     find_all - [self['Scheduled']]
   end
-    
+
   def self.selectable_values
     self.selectable.map(&:name)
   end
-  
+
   @@statuses = [
     Status.new(:id => 1,   :name => 'Draft'    ),
     Status.new(:id => 50,  :name => 'Reviewed' ),
@@ -37,5 +37,5 @@ class Status
     Status.new(:id => 100, :name => 'Published'),
     Status.new(:id => 101, :name => 'Hidden'   )
   ]
-  
+
 end

data/app/models/text_filter.rb

@@ -1,22 +1,22 @@
 class TextFilter
   include Simpleton
   include Annotatable
-  
+
   annotate :filter_name, :description
-   
+
   def filter(text)
     text
   end
-  
+
   class << self
     def inherited(subclass)
       subclass.filter_name = subclass.name.to_name('Filter')
     end
-    
+
     def filter(text)
       instance.filter(text)
     end
-    
+
     def description_file(filename)
       text = File.read(filename) rescue ""
       self.description text

data/app/models/trusty_cms/config.rb

@@ -20,10 +20,10 @@ module TrustyCms
     #   TrustyCms.config['setting.name'] #=> "value"
     #
     # Config entries can be used freely as general-purpose global variables unless a definition
-    # has been given for that key, in which case restrictions and defaults may apply. The restrictions  
-    # can take the form of validations, requirements, permissions or permitted options. They are 
+    # has been given for that key, in which case restrictions and defaults may apply. The restrictions
+    # can take the form of validations, requirements, permissions or permitted options. They are
     # declared by calling TrustyCms::Config#define:
-    # 
+    #
     #   # setting must be either 'foo', 'bar' or 'blank'
     #   define('admin.name', :select_from => ['foo', 'bar'])
     #
@@ -60,20 +60,20 @@ module TrustyCms
     #
     # Helper methods are defined in ConfigurationHelper that will display config entry values
     # or edit fields:
-    # 
+    #
     #   # to display label and value, where label comes from looking up the config key in the active locale
-    #   show_setting('admin.name') 
+    #   show_setting('admin.name')
     #
     #   # to display an appropriate checkbox, text field or select box with label as above:
     #   edit_setting('admin.name)
     #
-    
-    set_table_name "config"
+
+    self.table_name = "config"
     after_save :update_cache
     attr_reader :definition
-    
+
     class ConfigError < RuntimeError; end
-    
+
     class << self
       def [](key)
         if table_exists?
@@ -92,54 +92,54 @@ module TrustyCms
           setting.value = value
         end
       end
-      
+
       def to_hash
         Hash[ *all.map { |pair| [pair.key, pair.value] }.flatten ]
       end
-      
+
       def initialize_cache
         TrustyCms::Config.ensure_cache_file
         Rails.cache.write('TrustyCms::Config',TrustyCms::Config.to_hash)
         Rails.cache.write('TrustyCms.cache_mtime', File.mtime(cache_file))
         Rails.cache.silence!
       end
-      
+
       def cache_file_exists?
         File.file?(cache_file)
       end
-      
+
       def stale_cache?
         return true unless TrustyCms::Config.cache_file_exists?
         Rails.cache.read('TrustyCms.cache_mtime') != File.mtime(cache_file)
       end
-      
+
       def ensure_cache_file
         FileUtils.mkpath(cache_path)
         FileUtils.touch(cache_file)
       end
-      
+
       def cache_path
         "#{Rails.root}/tmp"
       end
-      
+
       def cache_file
-        cache_file = File.join(cache_path,'radiant_config_cache.txt')
+        File.join(cache_path,'radiant_config_cache.txt')
       end
-      
+
       def site_settings
         @site_settings ||= %w{ site.title site.host dev.host local.timezone }
       end
-      
+
       def default_settings
-        @default_settings ||= %w{ defaults.locale defaults.page.filter defaults.page.parts defaults.page.fields defaults.page.status defaults.snippet.filter }
+        @default_settings ||= %w{ defaults.locale defaults.page.filter defaults.page.parts defaults.page.fields defaults.page.status }
       end
-      
+
       def user_settings
         @user_settings ||= ['user.allow_password_reset?']
       end
-      
+
       # A convenient drying method for specifying a prefix and options common to several settings.
-      # 
+      #
       #   TrustyCms.config do |config|
       #     config.namespace('secret', :allow_display => false) do |secret|
       #       secret.define('identity', :default => 'batman')      # defines 'secret.identity'
@@ -152,7 +152,7 @@ module TrustyCms
         prefix = [options[:prefix], prefix].join('.') if options[:prefix]
         with_options(options.merge(:prefix => prefix), &block)
       end
-      
+
       # Declares a setting definition that will constrain and support the use of a particular config entry.
       #
       #   define('setting.key', options)
@@ -190,12 +190,6 @@ module TrustyCms
           key = [options[:prefix], key].join('.') if options[:prefix]
         end
 
-        raise LoadError, %{
-Config definition error: '#{key}' is defined twice:
-1. #{called_from}
-2. #{definitions[key].definer}
-        } unless definitions[key].nil? || definitions[key].empty?
-
         definition ||= TrustyCms::Config::Definition.new(options.merge(:definer => called_from))
         definitions[key] = definition
 
@@ -207,21 +201,21 @@ Config definition error: '#{key}' is defined twice:
           end
         end
       end
-      
+
       def definitions
         TrustyCms.config_definitions
       end
-      
+
       def definition_for(key)
         definitions[key] ||= TrustyCms::Config::Definition.new(:empty => true)
       end
-      
+
       def clear_definitions!
         TrustyCms.config_definitions = {}
       end
-      
+
     end
-    
+
     # The usual way to use a config item:
     #
     #    TrustyCms.config['key'] = value
@@ -231,7 +225,7 @@ Config definition error: '#{key}' is defined twice:
     #   TrustyCms::Config.find_or_create_by_key('key').value = value
     #
     # Calling value= also applies any validations and restrictions that are found in the associated definition.
-    # so this will raise a ConfigError if you try to change a protected config entry or a RecordInvalid if you 
+    # so this will raise a ConfigError if you try to change a protected config entry or a RecordInvalid if you
     # set a value that is not among those permitted.
     #
     def value=(param)
@@ -256,9 +250,9 @@ Config definition error: '#{key}' is defined twice:
     #
     #   key = TrustyCms::Config.find_or_create_by_key('key').value
     #
-    # If the config item is boolean the response will be true or false. For items with :type => :integer it will be an integer, 
+    # If the config item is boolean the response will be true or false. For items with :type => :integer it will be an integer,
     # for everything else a string.
-    # 
+    #
     def value
       if boolean?
         checked?
@@ -279,26 +273,26 @@ Config definition error: '#{key}' is defined twice:
     def boolean?
       definition.boolean? || self.key.ends_with?("?")
     end
-    
+
     # Returns true if the item is boolean and true.
     #
     def checked?
       return nil if self[:value].nil?
       boolean? && self[:value] == "true"
     end
-    
+
     # Returns true if the item defintion includes a :select_from parameter that limits the range of permissible options.
     #
     def selector?
       definition.selector?
     end
-    
+
     # Returns a name corresponding to the current setting value, if the setting definition includes a select_from parameter.
     #
     def selected_value
       definition.selected(value)
     end
-    
+
     def update_cache
       TrustyCms::Config.initialize_cache
     end

data/app/models/trusty_cms/page_response_cache_director.rb

@@ -11,6 +11,7 @@ module TrustyCms
 
     class << self
       def cache_timeout
+        # TODO: This cache is caching even in development. That shouldn't be happening.
         @cache_timeout ||= 5.minutes
       end
 
@@ -40,4 +41,4 @@ module TrustyCms
     end
 
   end
-end
+end

data/app/models/user.rb

@@ -2,6 +2,7 @@ require 'digest/sha1'
 
 class User < ActiveRecord::Base
   has_many :pages, :foreign_key => :created_by_id
+  attr_protected 'why_is_this_needed'
 
   # Default Order
   default_scope :order => 'name'
@@ -18,7 +19,6 @@ class User < ActiveRecord::Base
   validates_presence_of :name, :login
   validates_presence_of :password, :password_confirmation, :if => :new_record?
 
-  validates_format_of :email, :allow_nil => true, :with => /^$|^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
 
   validates_length_of :name, :maximum => 100, :allow_nil => true
   validates_length_of :login, :within => 3..40, :allow_nil => true
@@ -26,15 +26,6 @@ class User < ActiveRecord::Base
   validates_length_of :email, :maximum => 255, :allow_nil => true
 
   attr_writer :confirm_password
-  class << self
-    def unprotected_attributes
-      @unprotected_attributes ||= [:name, :email, :login, :password, :password_confirmation, :locale]
-    end
-
-    def unprotected_attributes=(array)
-      @unprotected_attributes = array.map{|att| att.to_sym }
-    end
-  end
 
   def has_role?(role)
     respond_to?("#{role}?") && send("#{role}?")

data/app/models/user_action_observer.rb

@@ -1,25 +1,25 @@
 class UserActionObserver < ActiveRecord::Observer
   observe User, Page, Layout
-  
+
   def current_user=(user)
     self.class.current_user = user
   end
   def self.current_user=(user)
     Thread.current[:current_user] = user
   end
-  
+
   def current_user
     self.class.current_user
   end
   def self.current_user
     Thread.current[:current_user]
   end
-  
+
   def before_create(model)
     model.created_by = self.current_user
   end
-  
+
   def before_update(model)
     model.updated_by = self.current_user
   end
-end
+end

data/app/views/admin/configuration/edit.html.haml

@@ -6,30 +6,30 @@
     %h1 Configuration
 
   - main.edit_form do
-    - form_for :trusty_config, :url => admin_configuration_url, :html => {"data-onsubmit_status"=>"Saving changes…", :method => :put} do |f|
+    = form_for :trusty_config, :url => admin_configuration_url, :html => {"data-onsubmit_status"=>"Saving changes…", :method => :put} do |f|
       = render_region :form_top
       - render_region :form do |form|
         - form.edit_site do
           %fieldset
-            %h3 Site  
+            %h3 Site
             - TrustyCms.config.site_settings.each do |site_setting|
               %p
                 = edit_config site_setting
-  
+
         - form.edit_defaults do
           %fieldset
             %h3 Defaults
             - TrustyCms.config.default_settings.each do |default_setting|
               %p
                 = edit_config default_setting
-  
+
         - form.edit_users do
           %fieldset
             %h3 Passwords
             - TrustyCms.config.user_settings.each do |user_setting|
               %p
                 = edit_config user_setting
-    
+
       - render_region :form_bottom do |form_bottom|
         - form_bottom.edit_buttons do
           .buttons

data/app/views/admin/configuration/show.html.haml

@@ -9,28 +9,28 @@
         = t('personal_preferences')
       = image_tag(gravatar_url(@user.email, :size=>"64px"), :class=>"avatar", :width=>64, :height=>64, :alt=>"")
       %p.ruled
-        %label 
-          = t('name') 
+        %label
+          = t('name')
         %span
           = current_user.name
       %p.ruled
-        %label 
-          = t('email_address') 
-        %span.uri 
+        %label
+          = t('email_address')
+        %span.uri
           = current_user.email
       %p.ruled
-        %label 
-          = t('login') 
+        %label
+          = t('login')
         %span
           = current_user.login
       %p.ruled
-        %label 
-          = t('password') 
+        %label
+          = t('password')
         %big •••••
       %p.ruled
         %label
-          = t('language') 
-        %span 
+          = t('language')
+        %span
           = current_user.locale
 
 #config.box

data/app/views/admin/extensions/index.html.haml

@@ -2,7 +2,7 @@
 
 - content_for :page_css do
   :sass
-    table.index 
+    table.index
       h4
         font-size: 110%
         margin-top: .5em
@@ -21,7 +21,7 @@
           - thead.title_header do
             %th.extension= t('extension')
           - thead.website_header do
-            %th.website= t('more_info') 
+            %th.website= t('more_info')
           - thead.version_header do
             %th.version= t('version')
     %tbody
@@ -32,10 +32,10 @@
               %td.extension
                 %h4= h extension.extension_name
                 %p= h extension.description
-            - tbody.website_cell do 
+            - tbody.website_cell do
               %td.website
                 = extension.url.nil? || extension.url.empty? ? "" : link_to(t('more_info'), extension.url, :target => "_blank")
             - tbody.version_cell do
               %td.version= h extension.version
 
-= render_region :bottom
+= render_region :bottom