mack 0.4.6 → 0.4.7

data/lib/generators/plugin_generator/templates/vendor/plugins/<%= @plugin_name %>/init.rb.template

@@ -0,0 +1 @@
+require '<%= @plugin_name %>'

data/lib/generators/plugin_generator/templates/vendor/plugins/<%= @plugin_name %>/lib/<%= @plugin_name %>.rb.template

@@ -0,0 +1 @@
+# Do work here for <%= @plugin_name %>

data/lib/generators/plugin_generator/templates/vendor/plugins/<%= @plugin_name %>/lib/tasks/<%= @plugin_name %>_tasks.rake.template

@@ -0,0 +1 @@
+# Place any Rake tasks for your plugin here:

data/lib/generators/scaffold_generator/manifest.yml

@@ -0,0 +1,31 @@
+<% if app_config.orm -%>
+controller_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "generic", "app", "controllers", "controller.rb.template") %>
+  output_path: <%= File.join("app", "controllers", "#{@name_plural}_controller.rb") %>
+edit_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "generic", "app", "views", "edit.html.erb.template") %>
+  output_path: <%= File.join("app", "views", @name_plural, "edit.html.erb") %>
+index_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "generic", "app", "views", "index.html.erb.template") %>
+  output_path: <%= File.join("app", "views", @name_plural, "index.html.erb") %>
+new_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "generic", "app", "views", "new.html.erb.template") %>
+  output_path: <%= File.join("app", "views", @name_plural, "new.html.erb") %>
+show_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "generic", "app", "views", "show.html.erb.template") %>
+  output_path: <%= File.join("app", "views", @name_plural, "show.html.erb") %>
+<% else -%>
+controller_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "no_orm", "controller.rb.template") %>
+  output_path: <%= File.join("app", "controllers", "#{@name_plural}_controller.rb") %>
+<% end -%>
+functional_teat_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test.rb.template") %>
+  output_path: <%= File.join("test", "functional", "#{@name_plural}_controller_test.rb") %>

data/lib/generators/scaffold_generator/scaffold_generator.rb

@@ -2,16 +2,25 @@
 # 
 # Example:
 #   rake generate:scaffold name=post
-class ScaffoldGenerator < Mack::Generator::Base
+class ScaffoldGenerator < Genosaurus
   
   require_param :name
   
-  def generate # :nodoc:
+  def setup
     @name_singular = param(:name).singular.underscore
     @name_plural = param(:name).plural.underscore
     @name_singular_camel = @name_singular.camelcase
-    @name_plural_camel = @name_plural.camelcase
-    
+    @name_plural_camel = @name_plural.camelcase    
+  end
+  
+  def after_generate
+    if app_config.orm
+      ModelGenerator.run(@options)
+    end
+    update_routes_file
+  end
+  
+  def update_routes_file
     # update routes.rb
     routes = File.join(MACK_CONFIG, "routes.rb")
     rf = File.open(routes).read
@@ -28,30 +37,7 @@ class ScaffoldGenerator < Mack::Generator::Base
       File.open(routes, "w") do |f|
         f.puts nrf
       end
-    end 
-    
-    app_cont_dir = File.join(MACK_APP, "controllers")
-    directory(app_cont_dir)
-    
-    temp_dir = File.join(File.dirname(__FILE__), "templates")
-
-    if app_config.orm
-      app_model_dir = File.join(MACK_APP, "models")
-      directory(app_model_dir)
-
-      app_views_dir = File.join(MACK_APP, "views", @name_plural)
-      directory(app_views_dir)
-      
-      template(File.join(temp_dir, "generic", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
-      template(File.join(temp_dir, "generic", "app", "views", "index.html.erb.template"), File.join(app_views_dir, "index.html.erb"), :force => param(:force))
-      template(File.join(temp_dir, "generic", "app", "views", "edit.html.erb.template"), File.join(app_views_dir, "edit.html.erb"), :force => param(:force))
-      template(File.join(temp_dir, "generic", "app", "views", "new.html.erb.template"), File.join(app_views_dir, "new.html.erb"), :force => param(:force))
-      template(File.join(temp_dir, "generic", "app", "views", "show.html.erb.template"), File.join(app_views_dir, "show.html.erb"), :force => param(:force))
-      ModelGenerator.new(@env).run
-    else
-      template(File.join(temp_dir, "no_orm", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
     end
-
   end
   
 end

data/lib/generators/scaffold_generator/templates/test.rb.template

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+class <%= @name_plural_camel %>ControllerTest < Test::Unit::TestCase
+  
+  def test_truth
+    assert true
+  end
+  
+end

data/lib/initialization/initializer.rb

@@ -15,6 +15,7 @@ require 'rinda/tuplespace'
 require 'builder'
 require 'erubis'
 require 'erb'
+require 'genosaurus'
 
 # Set up Mack constants, if they haven't already been set up.
 unless Object.const_defined?("MACK_ENV")
@@ -75,9 +76,23 @@ unless Object.const_defined?("MACK_INITIALIZED")
   # require 'plugins':
   require File.join(File.dirname(__FILE__), "initializers", "plugins.rb")
   
+  # make sure that default_controller is available to other controllers
+  path = File.join(MACK_APP, "controllers", "default_controller.rb")
+  require path if File.exists?(path) 
+  
   # require 'app' files:
   Dir.glob(File.join(MACK_APP, "**/*.rb")).each do |d|
-    require d
+    begin
+      require d
+    rescue NameError => e
+      mod = e.message.gsub("uninitialized constant ", "")
+      x =%{
+        module ::#{mod}
+        end
+      }
+      eval(x)
+      require d
+    end
   end
   
   # require 'lib' files:

data/lib/initialization/initializers/orm_support.rb

@@ -2,47 +2,62 @@
 # setup ORM:
 #++
 
-$using_active_record = false
-$using_data_mapper = false
-
-# Returns true if the system is setup to use ActiveRecord
-def using_active_record?
-  $using_active_record
-end
-
-# Returns true if the system is setup to use DataMapper
-def using_data_mapper?
-  $using_data_mapper
-end
-
-module ActiveRecord # :nodoc:
-end
-module DataMapper # :nodoc:
-end
-
 unless app_config.orm.nil?
   dbs = YAML::load(Erubis::Eruby.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
   case app_config.orm
   when 'active_record'
-    require 'activerecord'
-    ActiveRecord::Base.establish_connection(dbs[MACK_ENV])
-    class ArSchemaInfo < ActiveRecord::Base # :nodoc:
-      set_table_name :schema_info
-    end
-    $using_active_record = true
-    $using_data_mapper = false # set to false, in case we're flipping back and forth
   when 'data_mapper'
-    require 'data_mapper'
-    DataMapper::Database.setup(dbs[MACK_ENV])
-    class DmSchemaInfo < DataMapper::Base # :nodoc:
-      set_table_name "schema_info"
-      property :version, :integer, :default => 0
-    end
-    $using_data_mapper = true
-    $using_active_record = false # set to false, in case we're flipping back and forth
   else
     MACK_DEFAULT_LOGGER.warn("Attempted to configure an unknown ORM: #{app_config.orm}")
   end
 else
   MACK_DEFAULT_LOGGER.warn("No ORM has been configured!")
+end
+
+if app_config.orm == 'active_record'
+  
+  begin
+  
+    module ActiveRecord # :nodoc:
+    end
+  
+    require 'activerecord'
+
+    ActiveRecord::Base.establish_connection(dbs[MACK_ENV])
+    class ArSchemaInfo < ActiveRecord::Base # :nodoc:
+      set_table_name :schema_info
+    end
+
+  rescue Exception => e
+  end
+
+end
+
+begin
+  
+  module DataMapper # :nodoc:
+  end
+  
+  require 'data_mapper'
+  
+  DataMapper::Database.setup(dbs[MACK_ENV])
+  class DmSchemaInfo # :nodoc:
+    include DataMapper::Persistence
+    
+    set_table_name "schema_info"
+    property :version, :integer, :default => 0
+  end
+  
+rescue Exception => e
+end
+
+
+# Returns true if the system is setup to use ActiveRecord
+def using_active_record?
+  app_config.orm == 'active_record'
+end
+
+# Returns true if the system is setup to use DataMapper
+def using_data_mapper?
+  app_config.orm == 'data_mapper'
 end

data/lib/mack.rb

@@ -22,12 +22,17 @@ module Mack
               redirect_to(route)
             else
               # let's handle a normal request:
-              c = "#{route[:controller].to_s.camelcase}Controller".constantize.new(self.request, self.response, self.cookies)
+              begin
+                cont = "#{route[:controller].to_s.camelcase}Controller".constantize
+              rescue NameError => e
+                raise Mack::Errors::ResourceNotFound.new(self.request.path_info)
+              end
+              c = cont.new(self.request, self.response, self.cookies)
               self.response.controller = c
               self.response.write(c.run)
             end
           rescue Mack::Errors::ResourceNotFound, Mack::Errors::UndefinedRoute => e
-            return try_to_find_resource(env, self.request.path_info, e)
+            return try_to_find_resource(env, e)
           end
         end # setup
       rescue Exception => e
@@ -102,12 +107,13 @@ module Mack
       id
     end
     
-    def try_to_find_resource(env, path_info, exception)
+    def try_to_find_resource(env, exception)
+      env = env.dup
       # we can't find a route for this, so let's try and see if it's in the public directory:
-      if File.extname(path_info).blank?
-        path_info << ".html"
+      if File.extname(env["PATH_INFO"]).blank?
+        env["PATH_INFO"] << ".html"
       end
-      if File.exists?(File.join(MACK_PUBLIC, path_info))
+      if File.exists?(File.join(MACK_PUBLIC, env["PATH_INFO"]))
         return Rack::File.new(File.join(MACK_PUBLIC)).call(env)
       else
         raise exception

data/lib/mack_tasks.rb

@@ -2,12 +2,12 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 # Requires all rake tasks that ship with the Mack framework.
-[File.join(File.dirname(__FILE__)), File.join(FileUtils.pwd, "lib")].each do |dir|
+[File.join(File.dirname(__FILE__)), File.join(FileUtils.pwd, "lib"), File.join(FileUtils.pwd, "vendor", "plugins")].each do |dir|
   begin
     require File.join(dir, "tasks", "rake_helpers.rb")
   rescue Exception => e
   end
-  files = Dir.glob(File.join(dir, "tasks", "*.rake"))
+  files = Dir.glob(File.join(dir, "**/*.rake"))
   files.each do |f|
     unless f == __FILE__
       load f

data/lib/routing/route_map.rb

@@ -162,6 +162,7 @@ module Mack
       
       # Sets up mappings and named routes for a resource.
       def resource(controller)
+        
         connect_with_named_route("#{controller}_index", "/#{controller}", {:controller => controller, :action => :index, :method => :get})
         connect_with_named_route("#{controller}_create", "/#{controller}", {:controller => controller, :action => :create, :method => :post})
         connect_with_named_route("#{controller}_new", "/#{controller}/new", {:controller => controller, :action => :new, :method => :get})
@@ -206,6 +207,7 @@ module Mack
       
       private
       def connect_with_named_route(n_route, pattern, options = {})
+        n_route = n_route.methodize
         route = connect(pattern, options)
         
         url = %{

data/lib/sea_level/helpers/view_helpers/html_helpers.rb

@@ -28,6 +28,14 @@ module Mack
         Mack::Utils::Html
       end
       
+      # A wrapper method for image link.
+      # 
+      # Examples:
+      #   <%= link_image_to("/images/foo.jpg", "#" %> # => <a href="#"><img src="/images/foo.jpg"></a>
+      def link_image_to(image_url, url, image_options = {}, html_options = {})
+        link_to(Mack::Utils::Html.image_tag(image_url, image_options), url, html_options)
+      end
+      
       # A wrapper to Mack::Utils::Html rss method.
       # 
       # Example:

data/lib/sea_level/request.rb

@@ -53,16 +53,29 @@ module Mack
     #   route: '/users/:id' => {:controller => 'users', :action => 'show'}
     #   parameters: {:controller => 'users', :action => 'show', :id => 1, :foo => "bar"}
     def params(key)
-      p = (@mack_params[key.to_sym] || @mack_params[key.to_s])
-      unless p.nil?
-        p = p.to_s if p.is_a?(Symbol)
-        if p.is_a?(String)
-          p = p.to_s.uri_unescape
-        elsif p.is_a?(Hash)
-          p.each_pair {|k,v| p[k] = v.to_s.uri_unescape}
+      ivar_cache("params_#{key}") do
+        p = (@mack_params[key.to_sym] || @mack_params[key.to_s])
+        unless p.nil?
+          p = p.to_s if p.is_a?(Symbol)
+          if p.is_a?(String)
+            p = p.to_s.uri_unescape
+          elsif p.is_a?(Hash)
+            p.each_pair do |k,v|
+              if v.is_a?(String)
+                p[k] = v.to_s.uri_unescape
+              end
+            end
+          end
         end
+        p
+      end
+    end
+    
+    # Returns a Mack::Request::UploadedFile object.
+    def file(key)
+      ivar_cache("file_#{key}") do
+        Mack::Request::UploadedFile.new(params(key))
       end
-      p
     end
     
     private

data/lib/sea_level/uploaded_file.rb

@@ -0,0 +1,56 @@
+module Mack
+  # Wraps the Hash that Rack creates when you post a file.
+  class Request::UploadedFile
+    
+    # The name of the file uploaded
+    attr_reader :file_name
+    # The type of the file uploaded
+    attr_reader :file_type
+    # The name of the parameter used to upload the file
+    attr_reader :param_name
+    # A File object representing the uploaded file.
+    attr_reader :temp_file
+    attr_reader :head
+    # The destination path you want the file to be saved to.
+    attr_accessor :destination_path
+    
+    def initialize(param, destination_path = nil)
+      @file_name = param[:filename]
+      @file_type = param[:type]
+      @param_name = param[:name]
+      @temp_file = param[:tempfile]
+      @head = param[:head]
+      @destination_path = nil
+    end
+    
+    # Set the destination_path you want the file to be saved to.
+    # This can be a full path, or an array that will get joined with File.join.
+    # 
+    # Examples:
+    #   @uploaded_file.destination_path = "/path/to/my/destination/foo.jpg"
+    #   @uploaded_file.destination_path = ["path", "to", "my", "destination", "foo.jpg"]
+    def destination_path=(path)
+      if path.is_a?(Array)
+        @destination_path = File.join(path)
+      else
+        @destination_path = path
+      end
+    end
+    
+    # Takes/sets the destination_path and then calls the save method.
+    def save_to(*destination_path)
+      self.destination_path = *destination_path
+      save
+    end
+    
+    # Saves the temp_file to the destination_path. This method will create the directory
+    # tree of the destination_path if it does not exists.
+    # Raises ArgumentError if the destination_path has not been set.
+    def save
+      raise ArgumentError.new("Destination path must be set!") if self.destination_path.blank?
+      FileUtils.mkdir_p(File.dirname(self.destination_path))
+      FileUtils.mv(self.temp_file.path, self.destination_path)
+    end
+    
+  end
+end # :nodoc:

data/lib/tasks/generator_tasks.rake

@@ -0,0 +1,18 @@
+namespace :generator do
+  
+  desc "Lists all the generators available"
+  task :list => :environment do
+    list = "\nAvailable Generators:\n\n"
+    Object.constants.sort.each do |g|
+      g = g.constantize
+      if g.respond_to?(:superclass) && g.superclass == Genosaurus
+        list << g.name
+        list << "\n\t" << "rake generate:#{g.name.underscore}\n"
+      end
+    end
+    list << "\n\n"
+    ENV["__generator_list"] = list
+    puts list
+  end
+  
+end