mack 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,5 +1,14 @@
+===0.4.2
+* Added config/initializers directory. All files in this directory will be required at start up time.
+* Gems can now be required simply using the initializers/gems.rb file and the require_gems method.
+* Added gems:list and gems:install rake tasks. The gems:list task will list any gems being required for the application. The gems:install task will install all the gems being required for the application.
+* Filters in controllers can now be inherited from parent controller classes.
+* gem: mack_ruby_core_extensions 0.1.5
+* gem: thing 0.7.1
+
 ===0.4.1
 * Improved testing support.
+* Added assigns support to testing. This is allows for pulling instance variables that were set in a controller to tests.
 * Added ability to do 'session' based tests.
 * Added assert_difference method.
 * Added ability to set/remove cookies before requests are made.

data/bin/mack

@@ -36,6 +36,7 @@ create_dir(File.join(app, "app", "models"))
 create_dir(File.join(app, "app", "views", "default"))
 create_dir(File.join(app, "app", "views", "layouts"))
 create_dir(File.join(app, "config", "app_config"))
+create_dir(File.join(app, "config", "initializers"))
 create_dir(File.join(app, "lib", "tasks"))
 create_dir(File.join(app, "log"))
 create_dir(File.join(app, "public", "images"))

data/bin/templates/config/initializers/gems.rb.template

@@ -0,0 +1,12 @@
+# Using this file you can add gems dependencies to your application.
+# gem_name, options
+# gem_name is the name of the gem you want to add.
+# :version, optional, is the version of the gem you want to use.
+# :libs, optional, is an array of files you want to require.
+# :source, options, is the source you want to use to install a particular gem.
+require_gems do |gem|
+  # examples:
+  # gem.add :redgreen, :version => "1.2.2", :libs => :redgreen
+  # gem.add :termios
+  # gem.add :rubyzip, :source => "http://gems.rubyforge.org"
+end

data/bin/templates/test/test_helper.rb.template

@@ -0,0 +1,16 @@
+require 'rubygems'
+require "test/unit"
+require 'fileutils'
+
+ENV["MACK_ENV"] = "test"
+
+# load the mack framework:
+gem 'mack'
+require 'mack'
+
+# place common methods, assertions, and other type things in this file so
+# other tests will have access to them.
+
+class Test::Unit::TestCase
+  
+end

data/lib/core_extensions/kernel.rb

@@ -12,4 +12,9 @@ module Kernel
     Mack::Utils::Crypt::Keeper.instance.worker(worker).decrypt(value)
   end
   
+  # Returns Mack::Utils::GemManager
+  def require_gems
+    yield Mack::Utils::GemManager.instance
+  end
+  
 end

data/lib/initialization/initializer.rb

@@ -57,7 +57,13 @@ unless Object.const_defined?("MACK_INITIALIZED")
   # set up application stuff:
 
   # set up routes:
-  require File.join(MACK_ROOT, "config", "routes")
+  require File.join(MACK_CONFIG, "routes")
+  
+  # set up initializers:
+  Dir.glob(File.join(MACK_CONFIG, "initializers", "**/*.rb")) do |d|
+    require d
+  end
+  Mack::Utils::GemManager.instance.do_requires
 
   # require 'plugins':
   require File.join(File.dirname(__FILE__), "initializers", "plugins.rb")

data/lib/sea_level/controller_base.rb

@@ -320,11 +320,23 @@ module Mack
         end
         
         def add_filter(type, meth, options) # :nodoc:
-          controller_filters[type.to_sym] << Mack::Controller::Filter.new(meth, options)
+          controller_filters[type.to_sym] << Mack::Controller::Filter.new(meth, self, options)
         end
         
         def controller_filters # :nodoc:
-          @controller_filters = {:before => [], :after => [], :after_render => []} unless @controller_filters
+          unless @controller_filters
+            @controller_filters = {:before => [], :after => [], :after_render => []}
+            # inherit filters from the superclass, if any, to this parent
+            sc = self.superclass
+            if sc.class_is_a?(Mack::Controller::Base)
+              ch = sc.controller_filters
+              [:before, :after, :after_render].each do |v|
+                @controller_filters[v] << ch[v]
+                @controller_filters[v].flatten!
+                @controller_filters[v].uniq!
+              end
+            end
+          end
           @controller_filters
         end
         

data/lib/sea_level/filter.rb

@@ -33,9 +33,10 @@ module Mack
       attr_reader :filter_method
       attr_reader :action_list
   
-      def initialize(filter_method, action_list = {})
+      def initialize(filter_method, klass, action_list = {})
         @filter_method = filter_method
         clean_action_list(action_list)
+        @klass = klass
       end
   
       def run?(action)
@@ -47,6 +48,22 @@ module Mack
         end
         return false
       end
+      
+      def to_s
+        "#{@klass}.#{filter_method}"
+      end
+      
+      def ==(other)
+        self.to_s == other.to_s
+      end
+      
+      def eql?(other)
+        self.to_s == other.to_s
+      end
+      
+      def hash
+        self.to_s.hash
+      end
     
       private
       def clean_action_list(action_list)

data/lib/tasks/gem_tasks.rake

@@ -0,0 +1,34 @@
+namespace :gems do
+  
+  desc "lists all the gem required for this application."
+  task :list => :setup do
+    Mack::Utils::GemManager.instance.required_gem_list.each do |g|
+      puts g
+    end
+  end # list
+  
+  desc "installs the gems needed for this application."
+  task :install => :setup do
+    runner = Gem::GemRunner.new
+    Mack::Utils::GemManager.instance.required_gem_list.each do |g|
+      params = ["install", g.name.to_s]
+      params << "--version=#{g.version}" if g.version?
+      params << "--source=#{g.source}" if g.source?
+      runner.run(params)
+    end
+  end # install
+  
+  private
+  task :setup do
+    gem 'mack'
+    require 'core_extensions/kernel'
+    require 'utils/gem_manager'
+    gem 'mack_ruby_core_extensions'
+    require 'mack_ruby_core_extensions'
+    require File.join(FileUtils.pwd, "config", "gems")
+    require 'rubygems'
+    require 'rubygems/gem_runner'
+    Gem.manage_gems
+  end
+  
+end # gem

data/lib/utils/gem_manager.rb

@@ -0,0 +1,79 @@
+module Mack
+  module Utils
+    # This class is used to add gems to your application in an easy to use way.
+    # 
+    #   require_gems do |gem|
+    #     gem.add :redgreen, :version => "1.2.2", :libs => :redgreen
+    #     gem.add :termios
+    #     gem.add "rubyzip", :source => "http:// gems.rubyforge.org"
+    #   end
+    class GemManager
+      include Singleton
+
+      attr_accessor :required_gem_list
+      
+      def initialize # :nodoc:
+        @required_gem_list = []
+      end
+      
+      # Adds a new gem to the system. This does NOT actually require the gem
+      # or any of it's 'libs'. You need to call the do_requires method to actually
+      # require any of the 'libs' defined for this gem.
+      # 
+      # Options:
+      # * <code>:source => "http:// gems.rubyforge.org"</code>
+      # * <code>:version => "1.2.3"</code>
+      # * <code>:libs => "file" or :libs => ["file1", "file2"]</code>
+      def add(name, options = {})
+        @required_gem_list << Mack::Utils::GemManager::GemObject.new(name, options)
+      end
+      
+      # Requires the gem and any libs that you've specified.
+      def do_requires
+        @required_gem_list.each do |g|
+          if g.version?
+            gem(g.name, g.version)
+          else
+            gem(g.name)
+          end
+          g.libs.each {|l| require l.to_s} if g.libs?
+        end
+      end
+      
+      private
+      class GemObject # :nodoc:
+        attr_accessor :name
+        attr_accessor :version
+        attr_accessor :libs
+        attr_accessor :source
+        
+        def initialize(name, options = {})
+          self.name = name
+          self.version = options[:version]
+          self.libs = [options[:libs]].flatten.compact
+          self.source = options[:source]
+        end
+        
+        def to_s
+          t = self.name.to_s
+          t << "-#{self.version}" if self.version?
+          t.downcase
+        end
+        
+        def libs?
+          !self.libs.empty?
+        end
+        
+        def version?
+          !self.version.blank?
+        end
+        
+        def source?
+          !self.source.blank?
+        end
+        
+      end
+      
+    end # GemManager
+  end # Utils
+end # Mack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-27 00:00:00 -04:00
+date: 2008-04-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.4
+        version: 0.1.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: application_configuration
@@ -64,7 +64,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.0
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -95,22 +95,6 @@ extra_rdoc_files:
 - CHANGELOG
 files: 
 - README
-- bin/templates/app/controllers/default_controller.rb.template
-- bin/templates/app/helpers/application_helper.rb.template
-- bin/templates/app/views/default/index.html.erb.template
-- bin/templates/app/views/layouts/application.html.erb.template
-- bin/templates/config/app_config/default.yml.template
-- bin/templates/config/app_config/development.yml.template
-- bin/templates/config/app_config/production.yml.template
-- bin/templates/config/app_config/test.yml.template
-- bin/templates/config/boot.rb.template
-- bin/templates/config/database.yml.template
-- bin/templates/config/routes.rb.template
-- bin/templates/config/thin.ru.template
-- bin/templates/config/thin.yml.template
-- bin/templates/public/favicon.ico
-- bin/templates/public/stylesheets/scaffold.css.template
-- bin/templates/Rakefile.template
 - lib/core_extensions/kernel.rb
 - lib/core_extensions/string.rb
 - lib/distributed/errors/errors.rb
@@ -159,6 +143,7 @@ files:
 - lib/sea_level/session.rb
 - lib/sea_level/view_binder.rb
 - lib/tasks/cachetastic_tasks.rake
+- lib/tasks/gem_tasks.rake
 - lib/tasks/log_tasks.rake
 - lib/tasks/mack_dump_tasks.rake
 - lib/tasks/mack_server_tasks.rake
@@ -170,10 +155,27 @@ files:
 - lib/test_extensions/test_helpers.rb
 - lib/utils/crypt/default_worker.rb
 - lib/utils/crypt/keeper.rb
+- lib/utils/gem_manager.rb
 - lib/utils/html.rb
 - lib/utils/server.rb
-- tasks/gem_helper.rb
-- tasks/gem_tasks.rake
+- bin/templates/app/controllers/default_controller.rb.template
+- bin/templates/app/helpers/application_helper.rb.template
+- bin/templates/app/views/default/index.html.erb.template
+- bin/templates/app/views/layouts/application.html.erb.template
+- bin/templates/config/app_config/default.yml.template
+- bin/templates/config/app_config/development.yml.template
+- bin/templates/config/app_config/production.yml.template
+- bin/templates/config/app_config/test.yml.template
+- bin/templates/config/boot.rb.template
+- bin/templates/config/database.yml.template
+- bin/templates/config/initializers/gems.rb.template
+- bin/templates/config/routes.rb.template
+- bin/templates/config/thin.ru.template
+- bin/templates/config/thin.yml.template
+- bin/templates/public/favicon.ico
+- bin/templates/public/stylesheets/scaffold.css.template
+- bin/templates/Rakefile.template
+- bin/templates/test/test_helper.rb.template
 - CHANGELOG
 has_rdoc: true
 homepage: http://www.mackframework.com

data/tasks/gem_helper.rb

@@ -1,48 +0,0 @@
-class GemHelper # :nodoc:
-  include Singleton
-  
-  attr_accessor :project
-  attr_accessor :package
-  attr_accessor :gem_name
-  attr_accessor :version
-  
-  def initialize
-    self.project = "magrathea"
-    self.package = "mack"
-    self.gem_name = "mack"
-    self.version = "0.4.1"
-  end
-  
-  def gem_name_with_version
-    "#{self.gem_name}-#{self.version}"
-  end
-  
-  def full_gem_name
-    "#{self.gem_name_with_version}.gem"
-  end
-  
-  def release
-    begin
-      rf = RubyForge.new
-      rf.login
-      begin
-        rf.add_release(self.project, self.package, self.version, File.join("pkg", full_gem_name))
-      rescue Exception => e
-        if e.message.match("Invalid package_id") || e.message.match("no <package_id> configured for")
-          puts "You need to create the package!"
-          rf.create_package(self.project, self.package)
-          rf.add_release(self.project, self.package, self.version, File.join("pkg", full_gem_name))
-        else
-          raise e
-        end
-      end
-    rescue Exception => e
-      puts e
-    end
-  end
-  
-  def install
-    puts `sudo gem install #{File.join("pkg", full_gem_name)}`
-  end
-  
-end

data/tasks/gem_tasks.rake

@@ -1,93 +0,0 @@
-require 'rake'
-require 'rake/gempackagetask'
-require 'rake/clean'
-require 'rake/testtask'
-require 'find'
-require 'fileutils'
-
-require 'rubyforge'
-require 'rubygems'
-require 'rubygems/gem_runner'
-require 'singleton'
-
-require 'tasks/gem_helper'
-
-namespace :gem do
-  
-  namespace :package  do
-  
-    desc "Package up the mack gem."
-    task :mack do |t|
-      pwd = FileUtils.pwd
-      gh = GemHelper.instance
-      FileUtils.rm_rf("#{pwd}/pkg", :verbose => true)
-      gem_spec = Gem::Specification.new do |s|
-        s.name = gh.gem_name
-        s.version = gh.version
-        s.summary = "Mack is a powerful, yet simple, web application framework."
-        s.description = %{
-          Mack is a powerful, yet simple, web application framework. 
-          It takes some cues from the likes of Rails and Merb, so it's not entirely unfamiliar.
-          Mack hopes to provide developers a great framework for building, and deploying, portal and
-          distributed applications.
-        }
-        s.author = "markbates"
-        s.email = "mark@mackframework.com"
-        s.homepage = "http://www.mackframework.com"
-        s.has_rdoc = true
-        s.extra_rdoc_files = ["README", "CHANGELOG"]
-        s.files = FileList["README", "**/*.*"].exclude("pkg/").exclude("test/").exclude("tasks/private").exclude("doc")
-        s.require_paths << '.'
-        s.require_paths << 'bin'
-        s.require_paths << 'lib'
-        
-        s.bindir = "bin"
-        s.executables << "mack"
-        
-        s.rdoc_options << '--title' << 'Mack' << '--main' << 'README' << '--line-numbers' << "--inline-source"
-        
-        s.add_dependency("rack", "0.3.0")
-        s.add_dependency("mack_ruby_core_extensions", "0.1.4")
-        s.add_dependency("application_configuration", "1.2.1")
-        s.add_dependency("cachetastic", "1.4.2")
-        s.add_dependency("log4r", "1.0.5")
-        s.add_dependency("thin", "0.7.0")
-        s.add_dependency("builder", "2.1.2")
-        s.add_dependency("crypt", "1.1.4")
-        
-      
-        s.rubyforge_project = gh.project
-      end
-      Rake::GemPackageTask.new(gem_spec) do |pkg|
-        pkg.package_dir = "#{pwd}/pkg"
-        pkg.need_zip = false
-        pkg.need_tar = false
-      end
-      Rake::Task["package"].invoke
-    end
-  
-  end
-  
-  namespace :install do
-    
-    desc "Package up and install the mack gem."
-    task :mack => "gem:package:mack" do |t|
-      GemHelper.instance.install
-    end
-    
-  end
-  
-  namespace :release do
-    
-    desc "Package up, install, and release the mack gem."
-    task :mack => ["gem:install:mack"] do |t|
-      GemHelper.instance.release
-    end
-    
-  end
-  
-end
-
-alias_task :pack, "gem:package:mack"
-alias_task :install, "gem:install:mack"
-alias_task :release, "gem:release:mack"