trusty-cms 1.0.0 → 1.0.1

data/app/views/admin/users/_password_fields.html.haml

@@ -2,7 +2,7 @@
   %label= t('password')
   %span.value
     •••••
-    %a.action{:href=>"#", :onclick=>" $('display_password').hide(); $('change_password').show()"}= t('change')
+    %a.action{:href=>"#", :onclick=>"$('#display_password').hide(); $('#change_password').show()"}= t('change')
 .set#change_password{:style=> (!@user.new_record? && @user.valid?) ? "display: none" : nil}
   %p
     = f.label :password, t('new_password')
@@ -13,6 +13,6 @@
     - unless @user.new_record?
       %span
         = t('or')
-        %a{:href=>"#", :onclick=>" $('display_password').show(); $('change_password').hide()"}= t('cancel')
+        %a{:href=>"#", :onclick=>" $('#display_password').show(); $('#change_password').hide()"}= t('cancel')
+
 
-        

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

@@ -3,7 +3,7 @@
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1 
+    %h1
       = t('edit_user')
   - main.edit_form do
     = render :partial => 'form'

data/app/views/admin/users/new.html.haml

@@ -1,6 +1,6 @@
 - render_region :main do |main|
   - main.edit_header do
-    %h1 
-      = t('new_user')  
+    %h1
+      = t('new_user')
   - main.edit_form do
     = render :partial => 'form'

data/app/views/admin/users/remove.html.haml

@@ -1,6 +1,6 @@
 %h1= t('remove_user')
 
-%p 
+%p
   = t('text.users.remove_warning')
 
 %table.index#users
@@ -9,8 +9,8 @@
       %td.user
         %span.title= @user.name
 
-- form_for [:admin, @user], :html => { :method => :delete, 'data-onsubmit_status'=>"Removing user…" } do
+= form_for [:admin, @user], :html => { :method => :delete, 'data-onsubmit_status'=>"Removing user…" } do
   .buttons
     %input.button{:type=>"submit", :value => t('delete_user')}/
-    = t('or')  
-    = link_to t('cancel'), admin_users_path
+    = t('or')
+    = link_to t('cancel'), admin_users_path

data/app/views/admin/welcome/login.html.haml

@@ -1,14 +1,14 @@
 - body_classes << "single_form"
 
 #single_form
-  %h1= t('please_login')       
+  %h1= t('please_login')
 
   = form_tag login_url do
     %p
       %label{:for=>"username_or_email"}= t('username_or_email')
-      = text_field_tag "username_or_email", @username_or_email, :class => 'textbox activate', :maxlength => 40, :size => 40
+      = text_field_tag "username_or_email", @username_or_email, :class => 'textbox', :maxlength => 40, :size => 40
     %p
-      %label{:for=>"password"}= t('password') 
+      %label{:for=>"password"}= t('password')
       = password_field_tag "password", '', :class => 'textbox password', :maxlength => 40, :size => 40
     %p.remember_me
       = check_box_tag :remember_me, 1, false, :class => 'checkbox'
@@ -18,6 +18,6 @@
 
 %p.version
   = t('powered_by')
-  %a{ :href => "http://radiantcms.org" } TrustyCms CMS
-  = t('version')   
-  = TrustyCms.loaded_via_gem? ? "#{TrustyCms::Version} (gem)." : "#{TrustyCms::Version}."
+  %a{ :href => "https://github.com/pgharts/trusty-cms" } TrustyCms CMS
+  = t('version')
+  = TrustyCms.loaded_via_gem? ? "#{TrustyCms::Version} (gem)." : "#{TrustyCms::Version}."

data/app/views/layouts/application.html.haml

@@ -3,24 +3,36 @@
   %head
     %meta{"http-equiv"=>"Content-type", :content=>"text/html;charset=utf-8"}/
     %title= @page_title || default_page_title
+
     - @stylesheets.uniq.each do |stylesheet|
-      = stylesheet_link_tag stylesheet
+      = stylesheet_link_tag stylesheet, media: "all"
+
     %script{:type=>"text/javascript"}="var relative_url_root = '#{ActionController::Base.relative_url_root}';"
-    = javascript_include_tag %w(admin/prototype admin/effects admin/dragdrop admin/lowpro admin/dateinput admin/pagestatus admin/cookie admin/popup admin/pagefield admin/dropdown admin/status admin/utility admin/codearea admin/tabcontrol admin/ruledtable admin/sitemap admin/shortcuts admin/toggle admin/validationerror admin/application), :cache => 'admin/all'
+
+    = javascript_include_tag 'admin'
     - @javascripts.uniq.each do |javascript|
       = javascript_include_tag javascript
-    - if @content_for_page_scripts
-      = javascript_tag @content_for_page_scripts
-    - if @content_for_page_css
-      %style{:type => "text/css"}= @content_for_page_css
+    = javascript_tag do
+      = yield :page_scripts
+    %style{:type => "text/css"}
+      = yield :page_css
+
     = yield :meta
-    = stylesheet_and_javascript_overrides
+
+    - stylesheet_overrides.each do |stylesheet|
+      = stylesheet_link_tag stylesheet
+
+    - javascript_overrides.each do |javascript|
+      = javascript_include_tag javascript
+
+    = csrf_meta_tags
+
   %body{:class=>body_classes.join(" ")}
     #page
       #header
         - if logged_in?
           #site_links
-            = %{#{t('logged_in_as')} #{link_to h(current_user.name), edit_admin_preferences_path}   (#{link_to t('log_out'), logout_path})}
+            = %{#{t('logged_in_as')} #{link_to h(current_user.name), edit_admin_preferences_path}   (#{link_to t('log_out'), logout_path})}.html_safe
              
             = link_to t('view_site'), root_path, :id=>"view_site"
           %ul#navigation
@@ -45,6 +57,5 @@
         #content
           = find_and_preserve(yield)
 
-      - if @content_for_popups
-        #popups
-          = yield :popups
+      #popups
+        = yield :popups

data/app/views/site/not_found.html.haml

@@ -1,3 +1,3 @@
 - @page_title = 'Page Not Found'
 %h1=@page_title
-%p The page you were looking for could not be located on this site.
+%p The page you were looking for could not be located on this site.

data/app/views/site/show_page.html.haml

@@ -0,0 +1 @@
+= response.body.html_safe

data/bin/ci/before_script

@@ -4,11 +4,6 @@ case $DB in
   "mysql" )
     mysql -e 'create database radiant_test;'
     cp spec/ci/database.mysql.yml config/database.yml;;
-  "postgres" )
-    psql -c 'create database radiant_test;' -U postgres
-    cp spec/ci/database.postgresql.yml config/database.yml;;
-  "sqlite" )
-    cp spec/ci/database.sqlite.yml config/database.yml;;
 esac
 
 bundle exec rake db:migrate

data/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run TrustyCms::Application

data/config/application.rb

@@ -5,120 +5,130 @@ require 'configuration_extensions/configuration_extensions'
 require 'radius'
 require 'trusty_cms/extension_loader'
 require 'trusty_cms/initializer'
-
-
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+require 'compass'
+require 'rack/cache'
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
 
 module TrustyCms
-class Application < Rails::Application
-
-  include TrustyCms::Initializer
-
-  config.autoload_paths += %W(#{config.root}/lib)
-
-
-  # Initialize extension paths
-  config.initialize_extension_paths
-  extension_loader = ExtensionLoader.instance {|l| l.initializer = self }
-  extension_loader.paths(:load).reverse_each do |path|
-    config.autoload_paths.unshift path
-    $LOAD_PATH.unshift path
-  end
-  # config.add_plugin_paths(extension_loader.paths(:plugin))
-  radiant_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
-  config.i18n.load_path = radiant_locale_paths + extension_loader.paths(:locale)
-
-  config.encoding = 'utf-8'
-  # Skip frameworks you're not going to use (only works if using vendor/rails).
-  # To use Rails without a database, you must remove the Active Record framework
-  # config.frameworks -= [ :action_mailer ]
-
-  # Only load the extensions named here, in the order given. By default all
-  # extensions in vendor/extensions are loaded, in alphabetical order. :all
-  # can be used as a placeholder for all extensions not explicitly named.
-  # 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
-  # config.ignore_extensions []
-
-  # Your secret key for verifying cookie session data integrity.
-  # If you change this key, all old sessions will become invalid!
-  # Make sure the secret is at least 30 characters and all random,
-  # no regular words or you'll be exposed to dictionary attacks.
-  config.session_store(:cookie_store,
-                       {:key => '_trusty_cms_session',
-                        :secret => 'asdfqwerfxcoivswqenadfasdfqewpfioutyqwel'})
-
-  # Comment out this line if you want to turn off all caching, or
-  # add options to modify the behavior. In the majority of deployment
-  # scenarios it is desirable to leave TrustyCms's cache enabled and in
-  # the default configuration.
-  #
-  # Additional options:
-  #  :use_x_sendfile => true
-  #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd.
-  #  :use_x_accel_redirect => '/some/virtual/path'
-  #    Turns on X-Accel-Redirect support for nginx. You have to provide
-  #    a path that corresponds to a virtual location in your webserver
-  #    configuration.
-  #  :entitystore => "radiant:tmp/cache/entity"
-  #    Sets the entity store type (preceding the colon) and storage
-  #   location (following the colon, relative to Rails.root).
-  #    We recommend you use radiant: since this will enable manual expiration.
-  #  :metastore => "radiant:tmp/cache/meta"
-  #    Sets the meta store type and storage location.  We recommend you use
-  #    radiant: since this will enable manual expiration and acceleration headers.
-
-
-  # TODO: We're not sure this is actually working, but we can't really test this until the app initializes.
-  config.middleware.use "TrustyCms::Cache"
-
-
-  config.filter_parameters += [:password, :password_confirmation]
-
-  # Use the database for sessions instead of the cookie-based default,
-  # which shouldn't be used to store highly confidential information
-  # (create the session table with 'rake db:sessions:create')
-  # config.action_controller.session_store = :cookie_store DEPRECATED
-
-  # Activate observers that should always be running
-  config.active_record.observers = :user_action_observer
-
-  # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
-  # All files from config/locales/*.rb,yml are added automatically.
-  # config.i18n.load_path << Dir[File.join(Rails.root, 'my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :'en'
-
-  # Make Active Record use UTC-base instead of local time
-  config.time_zone = 'UTC'
-
-  # Set the default field error proc
-  config.action_view.field_error_proc = Proc.new do |html, instance|
-    if html !~ /label/
-      %{<span class="error-with-field">#{html} <span class="error">#{[instance.error_message].flatten.first}</span></span>}
-    else
-      html
+  class Application < Rails::Application
+    include TrustyCms::Initializer
+    config.active_record.whitelist_attributes = true
+    config.autoload_paths += %W(#{config.root}/lib)
+    Sass.load_paths << Compass::Frameworks['compass'].stylesheets_directory
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+
+    # Initialize extension paths
+    config.initialize_extension_paths
+    extension_loader = ExtensionLoader.instance {|l| l.initializer = self }
+    extension_loader.paths(:load).reverse_each do |path|
+      config.autoload_paths.unshift path
+      $LOAD_PATH.unshift path
     end
-  end
-
-  config.after_initialize do
-    extension_loader.load_extensions
-    extension_loader.load_extension_initalizers
-
-
-    Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
-      load(initializer)
+    paths["app/helpers"] = []
+    # config.add_plugin_paths(extension_loader.paths(:plugin))
+    radiant_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
+    config.i18n.load_path = radiant_locale_paths + extension_loader.paths(:locale)
+    I18n.enforce_available_locales = true
+
+    config.encoding = 'utf-8'
+
+    # Skip frameworks you're not going to use (only works if using vendor/rails).
+    # To use Rails without a database, you must remove the Active Record framework
+    # config.frameworks -= [ :action_mailer ]
+
+    # Only load the extensions named here, in the order given. By default all
+    # extensions in vendor/extensions are loaded, in alphabetical order. :all
+    # can be used as a placeholder for all extensions not explicitly named.
+    # 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
+    # config.ignore_extensions []
+
+    # Comment out this line if you want to turn off all caching, or
+    # add options to modify the behavior. In the majority of deployment
+    # scenarios it is desirable to leave TrustyCms's cache enabled and in
+    # the default configuration.
+    #
+    # Additional options:
+    #  :use_x_sendfile => true
+    #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd.
+    #  :use_x_accel_redirect => '/some/virtual/path'
+    #    Turns on X-Accel-Redirect support for nginx. You have to provide
+    #    a path that corresponds to a virtual location in your webserver
+    #    configuration.
+    #  :entitystore => "radiant:tmp/cache/entity"
+    #    Sets the entity store type (preceding the colon) and storage
+    #   location (following the colon, relative to Rails.root).
+    #    We recommend you use radiant: since this will enable manual expiration.
+    #  :metastore => "radiant:tmp/cache/meta"
+    #    Sets the meta store type and storage location.  We recommend you use
+    #    radiant: since this will enable manual expiration and acceleration headers.
+
+
+    config.middleware.use Rack::Cache,
+                          :private_headers => ['Authorization'],
+                          :entitystore => "radiant:tmp/cache/entity",
+                          :metastore => "radiant:tmp/cache/meta",
+                          :verbose => false,
+                          :allow_reload => false,
+                          :allow_revalidate => false
+    # TODO: There's got to be a better place for this, but in order for assets to work fornow, we need ConditionalGet
+    # TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
+    config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
+    config.assets.enabled = true
+
+
+    config.filter_parameters += [:password, :password_confirmation]
+
+    # Use the database for sessions instead of the cookie-based default,
+    # which shouldn't be used to store highly confidential information
+    # (create the session table with 'rake db:sessions:create')
+    # config.action_controller.session_store = :cookie_store DEPRECATED
+
+    # Activate observers that should always be running
+    config.active_record.observers = :user_action_observer
+
+    # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
+    # All files from config/locales/*.rb,yml are added automatically.
+    # config.i18n.load_path << Dir[File.join(Rails.root, 'my', 'locales', '*.{rb,yml}')]
+    # config.i18n.default_locale = :'en'
+
+    # Make Active Record use UTC-base instead of local time
+    config.time_zone = 'UTC'
+
+    # Set the default field error proc
+    config.action_view.field_error_proc = Proc.new do |html, instance|
+      if html !~ /label/
+        %{<span class="error-with-field">#{html} <span class="error">#{[instance.error_message].flatten.first}</span></span>}
+      else
+        html
+      end
     end
 
-    extension_loader.activate_extensions  # also calls initialize_views
-    #config.add_controller_paths(extension_loader.paths(:controller))
-    #config.add_eager_load_paths(extension_loader.paths(:eager_load))
+    config.after_initialize do
+      extension_loader.load_extensions
+      extension_loader.load_extension_initalizers
+
+      extension_loader.activate_extensions  # also calls initialize_views
+      #config.add_controller_paths(extension_loader.paths(:controller))
+      #config.add_eager_load_paths(extension_loader.paths(:eager_load))
 
-    # Add new inflection rules using the following format:
-    ActiveSupport::Inflector.inflections do |inflect|
-      inflect.uncountable 'config'
+      # Add new inflection rules using the following format:
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.uncountable 'config'
+      end
     end
   end
 end
-end

data/config/boot.rb

@@ -6,4 +6,4 @@ require 'rubygems'
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/config/database.mysql.yml

@@ -5,21 +5,18 @@
 
 development:
   adapter: mysql
-  database: radiant_dev
+  database: trusty_cms_dev
   username: root
   password:
-  socket: /tmp/mysql.sock
 
 test: &TEST
   adapter: mysql
-  database: radiant_test
+  database: trusty_cms_test
   username: root
   password:
-  socket: /tmp/mysql.sock
 
 production:
   adapter: mysql
-  database: radiant_live
+  database: trusty_cms_live
   username: root
   password:
-  socket: /tmp/mysql.sock

data/config/environments/development.rb

@@ -4,16 +4,28 @@ TrustyCms::Application.configure do
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the webserver when you make code changes.
-  config.cache_classes     = false
+  config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils        = true
+  config.whiny_nils = true
 
   # Show full error reports and caching is turned off
   config.consider_all_requests_local = true
-  #config.action_view.debug_rjs                         = true
-  config.action_controller.perform_caching             = false
+  config.action_controller.perform_caching = false
+
+  # Raise an ActiveModel::MassAssignmentSecurity::Error any time
+  # something is mass-assigned that shouldn't be for ease in debugging.
+  # config.active_record.mass_assignment_sanitizer = :strict
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
-end
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end