zen 0.2.7 → 0.2.8

data/.gitignore

@@ -0,0 +1,15 @@
+coverage/
+spec/database.db
+
+# Ignore common dotfiles
+.yardoc
+*.rbc
+*.swp
+.DS_Store
+
+# Ignore general files and directories
+doc
+pkg/*.gem
+
+# Keep the .gitkeep files.
+!.gitkeep

data/.mailmap

@@ -0,0 +1,2 @@
+YorickPeterse <yorickpeterse@gmail.com> YorickPeterse <info@yorickpeterse.com>
+YorickPeterse <yorickpeterse@gmail.com> Yorick Peterse <info@yorickpeterse.com>

data/.rvmrc

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+rvm use --create 1.9.2@zen

data/.travis.yml

@@ -1,6 +1,11 @@
 script: "gem install ramaze; rake test"
 rvm:
   - 1.9.2
-  - rbx
-  - jruby
-  - 1.8.7
+
+notifications:
+  disabled: true
+
+branches:
+  only:
+    - develop
+    - master

data/AUTHORS

@@ -1,5 +1,4 @@
 Following persons have contributed to Zen.
 (Sorted by number of submitted patches, then alphabetically)
 
-   115 YorickPeterse <info@yorickpeterse.com>
-     1 Yorick Peterse <info@yorickpeterse.com>
+   184 YorickPeterse <yorickpeterse@gmail.com>

data/CHANGELOG.md

@@ -1,28 +1,59 @@
-## 0.2.7 - June 16th, 2011
+## 0.2.8 - August 3, 2011
+
+* Replaced RSpec with Bacon.
+* When retrieving section entries comments are now retrieved properly.
+* Comments and categories are no longer retrieved by default when calling the
+  section entries plugin.
+* Statuses of comments and section entries are now stored in a separate table.
+* Plugins can be called as a singleton using Zen::Plugin.plugin.
+* The column menu_items.order has been renamed to menu_items.sort_order.
+* The accessor method for settings that defines the possible values now accepts
+  a Proc, this makes it possible for conditional possible values and such.
+* Various performance tweaks.
+* The rake task proto:package has been removed.
+* The core package have been cleaned up and are much more robust thanks to
+  better validation of various objects such as category groups when viewing a
+  list of categories.
+* Assets can now be loaded for specific methods using Zen::Asset by specifying
+  the :method key.
+* Users can now create their own custom field types.
+* Overview pages now paginate their results so they display a maximum of 20 rows
+  per page.
+* All references to "css_class" and "css_id" have been replaced with
+  "html_class" and "html_id".
+* Ramaze::Helper::Common has been removed.
+* Tables can now be sorted by clicking on the headers.
+* The required permissions for the #save() methods of all controllers have been
+  set correctly (issue #28).
+* The executable now uses OptionParser instead of Commander.
+* The total code coverage has been increased to 95.63% meaning Zen has become
+  even more stable than ever.
+* Fixed a few broken migrations.
+
+## 0.2.7 - June 16, 2011
 
 * Started using Ramaze.setup for Gem management.
-* Websites can no longer be marked as "offline", this was a rather useless feature anyway.
+* Websites can no longer be marked as "offline", this was a rather useless
+  feature anyway.
 * Fixed various bugs
 
-## 0.2.6.1 - June 1st, 2011
+## 0.2.6.1 - June 1, 2011
 
-* Dropped Zen.settings and modified the settings plugin so that it works properly when
-  using a multi-process based environment such as Unicorn.
+* Dropped Zen.settings and modified the settings plugin so that it works
+  properly when using a multi-process based environment such as Unicorn.
 
-## 0.2.6 - May 29th, 2011
+## 0.2.6 - May 29, 2011
 
 * Zen is now using RVM for gem management and such.
-* Began working on making Zen compatible with at least JRuby. Rubinius isn't worth the
-  effort at this time.
-* Removed Ramaze::Helper::Common.notification in favor of Ramaze::Helper::Message.
-* Dropped Zen::Database, Zen::Settings and most of the options in favor of instance
-  variables set in the main Zen module. See commit 
-  [d40ee1c2e518a323b2983e1bcfb7a0d863bf3b2f][d40ee1c2e518a323b2983e1bcfb7a0d863bf3b2f] 
-  for more information.
+* Began working on making Zen compatible with at least JRuby. Rubinius isn't
+  worth the effort at this time.
+* Removed Ramaze::Helper::Common.notification in favor of
+  Ramaze::Helper::Message.
+* Dropped Zen::Database, Zen::Settings and most of the options in favor of
+  instance variables set in the main Zen module. See commit
+  d40ee1c2e518a323b2983e1bcfb7a0d863bf3b2f for more information.
 * Translated Zen to Dutch.
 * Re-organized the application prototypes to make them easier to use/understand.
-* Implemented the anti-spam system as a plugin and added a decent XSS protection system
-  using Loofah.
+* Implemented the anti-spam system as a plugin and added a decent XSS protection
+  system using Loofah.
 * Various changes to the Javascript classes.
-
-[d40ee1c2e518a323b2983e1bcfb7a0d863bf3b2f]: https://github.com/zen-cms/Zen-Core/commit/d40ee1c2e518a323b2983e1bcfb7a0d863bf3b2f

data/README.md

@@ -1,16 +1,17 @@
 # README
 
-Zen is a modular CMS written on top of the awesome Ramaze framework. Zen was built out of 
-the frustration with Expression Engine, a popular CMS built on top of the Codeigniter 
-framework which in turn is written using PHP. While I really like Codeigniter, 
-ExpressionEngine and EllisLab there were several problems that bothered me. So I set out 
-to write a system that's loosely based on ExpressionEngine but fits my needs. Because of 
-this certain features may seem similar to those provided by EE and while at certain 
-points there are similarities there are also pretty big differences.
+Zen is a modular CMS written on top of the awesome Ramaze framework. Zen was
+built out of the frustration with Expression Engine, a popular CMS built on top
+of the Codeigniter framework which in turn is written using PHP. While I really
+like Codeigniter, ExpressionEngine and EllisLab there were several problems
+that bothered me. So I set out to write a system that's loosely based on
+ExpressionEngine but fits my needs. Because of this certain features may seem
+similar to those provided by EE and while at certain points there are
+similarities there are also pretty big differences.
 
 ## Requirements
 
-* Ramaze 2011.01.30 or newer 
+* Ramaze 2011.01.30 or newer
 * Ruby 1.9.2
 * A database (MySQL, PostgreSQL, etc)
 
@@ -19,47 +20,50 @@ points there are similarities there are also pretty big differences.
 Installing Zen using Rubygems is probably the easiest way:
 
     $ gem install zen
-    $ zen app application_name
+    $ zen create application_name
 
 If you like to hack with the core of Zen it's best to install it using Git:
 
-    $ git clone git://github.com/zen-cms/zen-core.git
+    $ git clone git://github.com/zen-cms/Zen-Core.git
     $ cd zen-core
     $ rake build:gem
 
 ## Database Support
 
-Technically Zen should run on any given DBMS that's supported by Sequel as Zen doesn't
-use any DBMS specific field types. However, there might be a chance that it won't work.
-If you happen to have any problems getting Zen running using your database of choice
-feel free to submit a ticket or post it on the mailing list.
+Technically Zen should run on any given DBMS that's supported by Sequel as Zen
+doesn't use any DBMS specific field types. However, there might be a chance that
+it won't work. If you happen to have any problems getting Zen running using your
+database of choice feel free to submit a ticket or post it on the mailing
+list.
 
-The Zen website itself is tested and served using MySQL, SQLite3 works just as fine and
-PostgreSQL will be tested in the near future.
+The Zen website itself is tested and served using MySQL, SQLite3 works just as
+fine and PostgreSQL will be tested in the near future.
 
 ## Running Zen
 
-Zen can be run using any webserver as long as it supports Rack. Thin, Unicorn or Passenger,
-they should all work. The main website of Zen is served using Unicorn and Nginx, 
-development is done using WEBRick and Unicorn.
+Zen can be run using any webserver as long as it supports Rack. Thin, Unicorn or
+Passenger, they should all work. The main website of Zen is served using Unicorn
+and Nginx, development is done using WEBRick and Unicorn.
 
 ## Documentation
 
-The documentation (both the userguide and the API docs) can be found on the website,
-located [here][zen documentation].
+The documentation (both the userguide and the API docs) can be found on the
+website, located [here][zen documentation].
 
 ## Hacking/Contributing
 
-Zen follows a relatively strict set of guidelines when it comes to developing core features
-and making sure everything goes along smoothly. When working with Git a branch model based
-on [nvie's branch model][nvie branch model] is used. This means that the "master" branch
-is directly used for pushing Gems and thus should *always* contain stable code. Develop
-is used to contain less stable (but not unstable) commits that will be pushed into "master"
-from time to time. All other branches, e.g. "rspec2" will be used for individual features.
+Zen follows a relatively strict set of guidelines when it comes to developing
+core features and making sure everything goes along smoothly. When working with
+Git a branch model based on [nvie's branch model][nvie branch model] is used.
+This means that the "master" branch is directly used for pushing Gems and thus
+should *always* contain stable code. Develop is used to contain less stable (but
+not unstable) commits that will be pushed into "master" from time to time.  All
+other branches, e.g. "rspec2" will be used for individual features.
 
-Besides following this model developers are also expected to write tests using either
-RSpec or Capybara for their features. Capybara is used to test controllers and browser 
-based tests while RSpec is used to test libraries, helpers, etc.
+Besides following this model developers are also expected to write tests using
+either RSpec or Capybara for their features. Capybara is used to test
+controllers and browser based tests while RSpec is used to test libraries,
+helpers, etc.
 
 ## Coding Standards
 
@@ -68,28 +72,29 @@ based tests while RSpec is used to test libraries, helpers, etc.
 * Document your code, that includes CSS and Javascript files.
 * No tabs at all times.
 * Markdown is used for all markup.
-* The maximum width of each line should be no more than 90 characters, this makes it 
-easier to read code in terminals or when using split view modes.
+* The maximum width of each line should be no more than 80 characters, this
+  makes it easier to read code in terminals or when using split view modes. The
+  limit used to be 90 characters but this was decreased to fit the Ruby coding
+  standards. Existing code using the 90 character limit will be changed over
+  time.
 
 ## Community
 
 * [Website][zen website]
 * [Mailing list][mailing list]
 
-Zen does not have it's own IRC channel at this time but you can usually find me in any
-of the following channels on Freenode:
+Zen does not have it's own IRC channel at this time but you can usually find me
+in any of the following channels on Freenode:
 
 * \#forrst-chat
 * \#ramaze
-* \#codeigniter
-* \#mootools
 
 ## License
 
-Zen is licensed under the MIT license. For more information about this license open
-the file "LICENSE".
+Zen is licensed under the MIT license. For more information about this license
+open the file "LICENSE".
 
 [zen website]: http://zen-cms.com/
-[zen documentation]: http://zen-cms.com/userguide/
+[zen documentation]: http://zen-cms.com/userguide/index.html
 [nvie branch model]: http://nvie.com/posts/a-successful-git-branching-model/
 [mailing list]: https://groups.google.com/forum/#!forum/zen-cms

data/Rakefile

@@ -1,5 +1,9 @@
 require File.expand_path('../lib/zen', __FILE__)
 
+module Zen
+  Gemspec = Gem::Specification::load(__DIR__('zen.gemspec'))
+end
+
 # Load all tasks
 Dir.glob(File.expand_path('../lib/zen/task/*.rake', __FILE__)).each do |f|
   import(f)

data/bin/zen

@@ -1,34 +1,9 @@
 #!/usr/bin/env ruby
-require 'ramaze'
-require File.expand_path('../../lib/zen/version', __FILE__)
-
-Ramaze.setup(:verbose => false) do
-  gem 'commander', ['~> 4.0.4']
-end
-
-require 'commander/import'
-
-# Set the extra information message
-information = <<-MSG
-* Website: http://zen-cms.com/
-    * Github: https://github.com/zen-cms
-    * License: MIT License
-MSG
 
-# Set the details of the application
-program :name       , 'Zen'
-program :version    , Zen::Version
-program :description, 'Zen is a modular CMS written using Ramaze.'
-
-program :help, 'Example'    , '$ zen [COMMAND] [OPTIONS]'
-program :help, 'Information', information.strip
-
-program :help_formatter, Commander::HelpFormatter::TerminalCompact
+require 'ramaze'
+require 'optparse'
 
-# Load all the commands
-commands = File.expand_path('../../lib/zen/bin/*.rb', __FILE__)
-commands = Dir.glob(commands)
+require __DIR__('../lib/zen/version')
+require __DIR__('../lib/zen/bin/runner')
 
-commands.each do |cmd|
-  require cmd
-end
+Zen::Bin::Runner.run

data/lib/zen.rb

@@ -3,7 +3,7 @@ require 'ramaze'
 require 'yaml'
 
 Ramaze.setup(:verbose => false) do
-  gem 'sequel'          , ['~> 3.24.1']
+  gem 'sequel'          , ['~> 3.26']
   gem 'bcrypt-ruby'     , ['~> 2.1.4'], :lib => 'bcrypt'
   gem 'sequel_sluggable', ['~> 0.0.6']
   gem 'loofah'          , ['~> 1.0.0']
@@ -12,8 +12,9 @@ end
 require __DIR__('zen/version')
 
 ##
-# Main module for Zen, all other modules and classes will be placed inside this module.
-# This module loads all required classes and is used for starting the application.
+# Main module for Zen, all other modules and classes will be placed inside this
+# module. This module loads all required classes and is used for starting the
+# application.
 #
 # @author Yorick Peterse
 # @since  0.1
@@ -25,8 +26,8 @@ module Zen
 
   class << self
     ##
-    # Variable that will contain a database connection that was established using
-    # Sequel.connect.
+    # Variable that will contain a database connection that was established
+    # using Sequel.connect.
     #
     # @author Yorick Peterse
     # @since  0.2.6
@@ -63,15 +64,8 @@ module Zen
         css = File.join(p, 'admin/css/global.css')
         js  = File.join(p, 'admin/js/global.js')
 
-        # Load the CSS file if it's there
-        if File.exist?(css)
-          ::Zen::Asset.stylesheet(['global'], :global => true)
-        end
-
-        # Load the JS file if it's there
-        if File.exist?(js)
-          ::Zen::Asset.javascript(['global'], :global => true)
-        end
+        Zen::Asset.stylesheet(['global'], :global => true) if File.exist?(css)
+        Zen::Asset.javascript(['global'], :global => true) if File.exist?(js)
       end
     end
 
@@ -85,9 +79,10 @@ module Zen
       # Migrate all settings
       begin
         plugin(:settings, :migrate)
-      rescue
+      rescue => e
         Ramaze::Log.warn(
-          "Failed to migrate the settings, make sure the database table is up to date"
+          'Failed to migrate the settings, make sure the database ' + \
+            'table is up to date'
         )
       end
     end
@@ -110,7 +105,6 @@ Zen::Language.load('zen_general')
 
 # Load all additional files
 require __DIR__('zen/plugin/helper')
-require __DIR__('zen/plugin/controller')
 require __DIR__('zen/plugin/markup/lib/markup')
 
 require __DIR__('zen/package')
@@ -123,7 +117,7 @@ require __DIR__('zen/controller/admin_controller')
 require __DIR__('zen/controller/main_controller')
 require __DIR__('zen/controller/preview')
 
-# Load the cache for the settings. This has to be done outside any of the init methods as
-# that would make it impossible to set a custom cache.
+# Load the cache for the settings. This has to be done outside any of the init
+# methods as that would make it impossible to set a custom cache.
 Ramaze::Cache.options.names.push(:settings)
 Ramaze::Cache.options.settings = Ramaze::Cache::LRU

data/lib/zen/asset.rb

@@ -3,16 +3,18 @@ require 'ramaze/gestalt'
 #:nodoc:
 module Zen
   ##
-  # The Asset module is a module used to register what Javascript files and stylesheets
-  # should be loaded for the current request. This can be very useful if you want to add
-  # a widget to all pages or override a certain stylesheet.
+  # The Asset module is a module used to register what Javascript files and
+  # stylesheets should be loaded for the current request. This can be very
+  # useful if you want to add a widget to all pages or override a certain
+  # stylesheet.
   #
   # ## Adding Assets
   #
-  # Assets can be added by calling either Zen::Asset.stylesheet or Zen::Asset.javascript.
-  # Both take an array of files and a hash with some configuration options, for more info
-  # on the exact usage and all the available parameters see the individual methods. Here
-  # are a few quick examples of loading files:
+  # Assets can be added by calling either Zen::Asset.stylesheet or
+  # Zen::Asset.javascript. Both take an array of files and a hash with some
+  # configuration options, for more info on the exact usage and all the
+  # available parameters see the individual methods. Here are a few quick
+  # examples of loading files:
   #
   #     # Load 3 Javascript files of which 2 will be loaded globally
   #     Zen::Asset.javascript(
@@ -27,18 +29,19 @@ module Zen
   #
   # ## Customizing Options
   #
-  # This module uses Innate::Optioned to provide a few options that can be changed. The
-  # following options are available:
+  # This module uses Innate::Optioned to provide a few options that can be
+  # changed. The following options are available:
   #
   # * prefix: The global prefix to use for all assets, set to "admin" by default.
-  # * javascript_prefix: The prefix to use for all Javascript files on top of the global
-  # prefix.
-  # * stylesheet_prefix: Similar to the javascript_prefix option but for stylesheets.
+  # * javascript_prefix: The prefix to use for all Javascript files on top of
+  #   the globalprefix.
+  # * stylesheet_prefix: Similar to the javascript_prefix option but for
+  #   stylesheets.
   #
   # ## Building Assets
   #
-  # Building assets shouldn't be required as Zen already does this but if you happen to
-  # need it you can build the files as following:
+  # Building assets shouldn't be required as Zen already does this but if you
+  # happen to need it you can build the files as following:
   #
   #     Zen::Asset.build(:stylesheet)
   #     Zen::Asset.build(:javascript)
@@ -46,9 +49,9 @@ module Zen
   # ## Controller Usage
   #
   # While this module can be called by any other piece of code the class
-  # Zen::Controller::AdminController provides shortcuts to Zen::Asset.javascript and
-  # Zen::Asset.stylesheet. These shortcuts work identical but are defined as class methods
-  # and thus can be used inside your class declaration:
+  # Zen::Controller::AdminController provides shortcuts to Zen::Asset.javascript
+  # and Zen::Asset.stylesheet. These shortcuts work identical but are defined
+  # as class methods and thus can be used inside your class declaration:
   #
   #     class Something < Zen::Controller::AdminController
   #       stylesheet ['reset'], :global => true
@@ -60,19 +63,15 @@ module Zen
   module Asset
     include ::Innate::Optioned
 
-    class << self
-      include ::Innate::Trinity
-    end
-
     options.dsl do
-      o 'Prefix for both Javascript files and stylesheets', :prefix           , 'admin'
-      o 'Prefix for Javascript files on top of :prefix'   , :javascript_prefix, 'js'
-      o 'Prefix for stylesheets on top of :prefix'        , :stylesheet_prefix, 'css'
+      o 'Prefix for JS and CSS files'          , :prefix           , 'admin'
+      o 'Prefix for JS files on top of :prefix', :javascript_prefix, 'js'
+      o 'Prefix for CSS on top of :prefix'     , :stylesheet_prefix, 'css'
     end
 
     ##
-    # Hash containing all the global and controller specific stylesheets that have to be
-    # loaded when calling build_stylesheets.
+    # Hash containing all the global and controller specific stylesheets that
+    # have to be loaded when calling build_stylesheets.
     #
     # @author Yorick Peterse
     # @since  0.2.5
@@ -82,8 +81,8 @@ module Zen
     }
 
     ##
-    # Hash containing all the global and controller specific stylesheets to load when
-    # calling build_javascripts.
+    # Hash containing all the global and controller specific stylesheets to
+    # load when calling build_javascripts.
     #
     # @author Yorick Peterse
     # @since  0.2.5
@@ -93,9 +92,9 @@ module Zen
     }
 
     ##
-    # Registers the given Javascripts files so that they're either loaded for the
-    # current action or for all actions. Note that the first argument of this method
-    # should always be an array.
+    # Registers the given Javascripts files so that they're either loaded for
+    # the current action or for all actions. Note that the first argument of
+    # this method should always be an array.
     #
     # @example
     #  # Loads /admin/js/users/access_rules.js for the current action only
@@ -106,17 +105,13 @@ module Zen
     #
     # @author Yorick Peterse
     # @since  0.2.5
-    # @param  [Array] files An array of Javascript files (without their extensions) to
-    # load relatively to the root of the application (/).
-    # @param  [Hash] options A hash containing additional options.
-    # @option options [TrueClass] :global When set to true the specified files will be
-    # loaded globally rather than just for the current action.
-    # @option options [String/Symbol] controller The name of the controller for which
-    # the specified files should be loaded.
+    # @see    Zen::Asset.process
     #
     def self.javascript(files, options = {})
       options = {
-        :prefix => File.join('/', self.options.prefix, self.options.javascript_prefix),
+        :prefix => File.join(
+          '/', self.options.prefix, self.options.javascript_prefix
+        ),
         :type   => :javascript
       }.merge(options)
 
@@ -124,24 +119,21 @@ module Zen
     end
 
     ##
-    # Registers a number of stylesheets that can either be loaded globally or for the
-    # current action.
+    # Registers a number of stylesheets that can either be loaded globally or
+    # for the current action.
     #
     # @example
     #  Zen::Asset.stylesheet ['foobar/admin_template'], :global => true
     #
     # @author Yorick Peterse
     # @since  0.2.5
-    # @param  [Array] files A list of stylesheets (without their extensions) to load.
-    # @param  [Hash] options A hash containing additional options to use.
-    # @option options [TrueClass] :global When set to true all the specified stylesheets
-    # will be loaded globally rather than just for the current action.
-    # @option options [String/Symbol] controller The name of the controller for which
-    # the specified files should be loaded.
+    # @see    Zen::Asset.process
     #
     def self.stylesheet(files, options = {})
       options = {
-        :prefix => File.join('/', self.options.prefix, self.options.stylesheet_prefix),
+        :prefix => File.join(
+          '/', self.options.prefix, self.options.stylesheet_prefix
+        ),
         :type   => :stylesheet
       }.merge(options)
 
@@ -149,8 +141,8 @@ module Zen
     end
 
     ##
-    # Builds either all Javascript files or stylesheets. This method will load both the
-    # global and action specific files.
+    # Builds either all Javascript files or stylesheets. This method will load
+    # both the global and action specific files.
     #
     # @example
     #  # Build the HTML tags for all stylesheets
@@ -167,9 +159,16 @@ module Zen
     def self.build(type)
       type       = type.to_sym
       attrs      = {}
-      controller = action.node.to_s.to_sym
+      controller = Ramaze::Current.action.node.to_s.to_sym
+      method     = Ramaze::Current.action.method.to_s.to_sym
       gestalt    = Ramaze::Gestalt.new
 
+      # The method in Ramaze::Current.action.method does not always contain the
+      # method since the assets are built in a layout.
+      if method.empty? and Ramaze::Current.actions[-2]
+        method = Ramaze::Current.actions[-2].method.to_s.to_sym
+      end
+
       # Set the basic elements of the tag
       if type === :stylesheet
         tag         = :link
@@ -184,7 +183,13 @@ module Zen
 
       # Get all the files to build
       if !files[controller].nil?
-        files = files[:global] + files[controller]
+        if files[controller].key?(method)
+          files = files[:global] + files[controller][method]
+        elsif !files[controller][:__all].nil?
+          files = files[:global] + files[controller][:__all]
+        else
+          files = files[:global]
+        end
       else
         files = files[:global]
       end
@@ -211,19 +216,29 @@ module Zen
     # Stores the given files in the correct hash based on the specified options.
     #
     # @example
-    #  process(['foobar', 'baz'], :global => false, :type => :javascript, :prefix => 'js')
+    #  process(
+    #    ['foobar', 'baz'],
+    #    :global => false,
+    #    :type   => :javascript,
+    #    :prefix => 'js'
+    #  )
     #
     # @author Yorick Peterse
     # @since  0.2.5
     # @param  [Array] files An array of files to load.
     # @param  [Hash] options A hash containing all the required options.
-    # @option options [TrueClass] :global Specifies that all the files should be loaded
-    # globally.
-    # @option options [Symbol] :type The type of asset that's loaded, can either be
-    # :javascript or :stylesheet.
+    # @option options [TrueClass] :global Specifies that all the files should be
+    # loaded globally.
+    # @option options [Symbol] :type The type of asset that's loaded, can either
+    # be :javascript or :stylesheet.
     # @option options [String] :prefix The prefix to use for all the assets.
-    # @option options [TrueClass] :global
-    # @option options [Symbol/String] :controller
+    # @option options [TrueClass] :global When set to true the specified files
+    # will be loaded globally.
+    # @option options [Symbol/String] :controller The class of the controller
+    # for which the assets should be loaded.
+    # @option options [Symbol/String/Array] :method A string or symbol that
+    # represents a single method for which to load the assets OR an array of
+    # methods.
     #
     def self.process(files, options)
       # Determine whether the files should be loaded globally
@@ -242,14 +257,34 @@ module Zen
         ext  = '.css'
       end
 
+      # Get the method to load the assets for
+      if options.key?(:method) and options[:method].class != Array
+        options[:method] = [options[:method]]
+      end
+
       # Add all the files
       files.each do |f|
-        f           = f.to_s + ext
-        f           = File.join(options[:prefix], f)
-        save[key] ||= []
+        f = f.to_s + ext
+        f = File.join(options[:prefix], f)
 
-        if !save[key].include?(f)
-          save[key].push(f)
+        # Load the assets for all the given methods
+        if options.key?(:method)
+          options[:method].each do |method|
+            method              = method.to_sym
+            save[key]         ||= {}
+            save[key][method] ||= []
+
+            save[key][method].push(f) unless save[key][method].include?(f)
+          end
+        # Load the assets for all methods in the controller
+        else
+          if key === :global
+            save[key].push(f) unless save[key].include?(f)
+          else
+            save[key]         ||= {}
+            save[key][:__all] ||= []
+            save[key][:__all].push(f) unless save[key][:__all].include?(f)
+          end
         end
       end
     end