mack 0.8.2 → 0.8.3

data/lib/mack/generators/mack_application_generator/templates/config/database.yml.template

@@ -5,7 +5,7 @@ when "data_mapper"
 # development:
 #   default:
 #     adapter: mysql
-#     database: <%= @options["app"].downcase %>_development
+#     database: <%= @options['app'].downcase %>_development
 #     host: localhost
 #     username: root
 #     password: 
@@ -13,7 +13,7 @@ when "data_mapper"
 # test:
 #   default:
 #     adapter: mysql
-#     database: <%= @options["app"].downcase %>_test
+#     database: <%= @options['app'].downcase %>_test
 #     host: localhost
 #     username: root
 #     password:
@@ -21,7 +21,7 @@ when "data_mapper"
 # production:
 #   default:
 #     adapter: mysql
-#     database: <%= @options["app"].downcase %>_production
+#     database: <%= @options['app'].downcase %>_production
 #     host: localhost
 #     username: root
 #     password:
@@ -29,7 +29,7 @@ when "data_mapper"
 # development:
 #   default:
 #     adapter: postgres
-#     database: <%= @options["app"].downcase %>_development
+#     database: <%= @options['app'].downcase %>_development
 #     host: localhost
 #     username: root
 #     password: 
@@ -37,7 +37,7 @@ when "data_mapper"
 # test:
 #   default:
 #     adapter: postgres
-#     database: <%= @options["app"].downcase %>_test
+#     database: <%= @options['app'].downcase %>_test
 #     host: localhost
 #     username: root
 #     password:
@@ -45,7 +45,7 @@ when "data_mapper"
 # production:
 #   default:
 #     adapter: postgres
-#     database: <%= @options["app"].downcase %>_production
+#     database: <%= @options['app'].downcase %>_production
 #     host: localhost
 #     username: root
 #     password:
@@ -53,49 +53,49 @@ when "data_mapper"
 development:
   default:
     adapter: sqlite3
-    database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_development.db") %>
+    database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_development.db") %>
  
 test:
   default:
     adapter: sqlite3
-    database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_test.db") %>
+    database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_test.db") %>
  
 production:
   default:
     adapter: sqlite3
-    database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_production.db") %>
+    database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_production.db") %>
 
 <% else -%>
 # development:
 #   adapter: mysql
-#   database: <%= @options["app"].downcase %>_development
+#   database: <%= @options['app'].downcase %>_development
 #   host: localhost
 #   username: root
 #   password: 
 #     
 # test:
 #   adapter: mysql
-#   database: <%= @options["app"].downcase %>_test
+#   database: <%= @options['app'].downcase %>_test
 #   host: localhost
 #   username: root
 #   password:
 # 
 # production:
 #   adapter: mysql
-#   database: <%= @options["app"].downcase %>_production
+#   database: <%= @options['app'].downcase %>_production
 #   host: localhost
 #   username: root
 #   password:
 
 development:
   adapter: sqlite3
-  database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_development.db") %>
+  database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_development.db") %>
  
 test:
   adapter: sqlite3
-  database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_test.db") %>
+  database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_test.db") %>
  
 production:
   adapter: sqlite3
-  database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_production.db") %>
+  database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_production.db") %>
 <% end -%>

data/lib/mack/generators/mack_application_generator/templates/config/initializers/gems.rb.template

@@ -6,7 +6,10 @@
 # :source, options, is the source you want to use to install a particular gem.
 require_gems do |gem|
 <% if @options["orm"] -%>
-  gem.add "mack-<%=@options["orm"]%>", :libs => "mack-<%=@options["orm"]%>"
+  gem.add 'mack-<%=@options["orm"]%>', :libs => 'mack-<%=@options["orm"]%>', :version => '<%= Mack::VERSION %>'
+  <% if @options["orm"] == 'data_mapper' -%>
+gem.add 'do_sqlite3'
+  <% end -%>
 <% end -%>
   # examples:
   # gem.add :redgreen, :version => "1.2.2", :libs => :redgreen

data/lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_spec.rb.template

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
+require File.join(File.dirname(__FILE__), '..', "spec_helper.rb")
 
 describe DefaultController do
   

data/lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_test.rb.template

@@ -1,5 +1,5 @@
 # This is a sample TestCase file.  You can safely delete this file
-require File.join(File.dirname(__FILE__), "..", "test_helper.rb")
+require File.join(File.dirname(__FILE__), '..', "test_helper.rb")
 
 class DefaultControllerTest < Test::Unit::TestCase
   

data/lib/mack/generators/mack_application_generator/templates/test/spec_helper.rb.template

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'pathname'
 require 'spec'
 
-ENV["MACK_ENV"] = "test"
-ENV["MACK_ROOT"] = File.join(File.dirname(__FILE__), "..")
-load(File.join(File.dirname(__FILE__), "..", "Rakefile"))
+ENV['MACK_ENV'] = 'test'
+ENV['MACK_ROOT'] = File.join(File.dirname(__FILE__), '..')
+load(File.join(File.dirname(__FILE__), '..', "Rakefile"))
 require 'mack'

data/lib/mack/generators/mack_application_generator/templates/test/test_helper.rb.template

@@ -2,11 +2,11 @@ require 'rubygems'
 require "test/unit"
 require 'fileutils'
 
-ENV["MACK_ENV"] = "test"
-ENV["MACK_ROOT"] = File.join(File.dirname(__FILE__), "..")
+ENV['MACK_ENV'] = 'test'
+ENV['MACK_ROOT'] = File.join(File.dirname(__FILE__), '..')
 
 # load the mack framework:
-load(File.join(File.dirname(__FILE__), "..", "Rakefile"))
+load(File.join(File.dirname(__FILE__), '..', "Rakefile"))
 require 'mack'
 
 # place common methods, assertions, and other type things in this file so

data/lib/mack/generators/passenger_generator/templates/config.ru.template

@@ -1,4 +1,4 @@
-ENV["MACK_ENV"] = 'development'
+ENV['MACK_ENV'] = 'development'
 require 'rubygems'
 load("Rakefile")
 require 'mack'

data/lib/mack/generators/view_helper_generator/manifest.yml

@@ -1,15 +1,15 @@
 helper_template:
   type: file
-  template_path: <%= File.join(templates_directory_path, "app", "helpers", "views", "helper.rb.template") %>
-  output_path: <%= File.join("app", "helpers", "views", "#{@name_singular}_helper.rb") %>
+  template_path: <%= File.join(templates_directory_path, 'app', 'helpers', 'views', "helper.rb.template") %>
+  output_path: <%= File.join('app', 'helpers', 'views', "#{@name_singular}_helper.rb") %>
 <% if configatron.mack.testing_framework.to_s == "test_case" -%>
 helper_test_template:
   type: file
-  template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "test_case.rb.template") %>
-  output_path: <%= File.join("test", "helpers", "views", "#{@name_singular}_helper_test.rb") %>
+  template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'views', "test_case.rb.template") %>
+  output_path: <%= File.join('test', 'helpers', 'views', "#{@name_singular}_helper_test.rb") %>
 <% elsif configatron.mack.testing_framework.to_s == "rspec" -%>
 helper_test_template:
   type: file
-  template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "rspec.rb.template") %>
-  output_path: <%= File.join("test", "helpers", "views", "#{@name_singular}_helper_spec.rb") %>
+  template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'views', "rspec.rb.template") %>
+  output_path: <%= File.join('test', 'helpers', 'views', "#{@name_singular}_helper_spec.rb") %>
 <% end -%>

data/lib/mack/rendering/engine/builder.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "view_template")
+require File.join(File.dirname(__FILE__), '..', "view_template")
 require File.join(File.dirname(__FILE__), 'base')
 module Mack
   module Rendering # :nodoc:

data/lib/mack/routing/route_map.rb

@@ -130,21 +130,7 @@ module Mack
       def connect_with_name(name, path, options = {}, &block) # :nodoc:
         n_route = name.methodize
         route = connect(path, {:action => n_route.to_sym}.merge(options), &block)
-        
-        Mack::Routes::Urls.create_method("#{n_route}_url") do |*options|
-          options = *options
-          options = {} if options.nil? || !options.is_a?(Hash)
-          url_for_pattern(route.path, (route.options.reject{|k,v| k.to_sym == :action || k.to_sym == :controller || k.to_sym == :method}).merge(options))
-        end
-        
-        Mack::Routes::Urls.create_method("#{n_route}_full_url") do |*options|
-          options = *options
-          options = {} if options.nil? || !options.is_a?(Hash)
-          if @request
-            options = {:host => @request.host, :scheme => @request.scheme, :port => @request.port}.merge(options)
-          end
-          self.send("#{n_route}_url", options)
-        end        
+        Mack::Routes::Urls.create_method(n_route, route)        
       end
       
       def build_resource_routes(method_base, path_base, controller, options) # :nodoc:

data/lib/mack/routing/urls.rb

@@ -78,8 +78,22 @@ module Mack
         }
       end
       
-      def self.create_method(sym, &block) # :nodoc:
-        define_method(sym, &block)
+      def self.create_method(n_route, route)
+        define_method("#{n_route}_url") do |*options|
+          options = *options
+          options = options.parse_splat_args if options.is_a?(Array)
+          options = {} if options.nil? || !options.is_a?(Hash)
+          url_for_pattern(route.path, (route.options.reject{|k,v| k.to_sym == :action || k.to_sym == :controller || k.to_sym == :method}).merge(options))
+        end
+        
+        define_method("#{n_route}_full_url") do |*options|
+          options = *options
+          options = {} if options.nil? || !options.is_a?(Hash)
+          if @request
+            options = {:host => @request.host, :scheme => @request.scheme, :port => @request.port}.merge(options)
+          end
+          self.send("#{n_route}_url", options)
+        end
       end
       
       private

data/lib/mack/runner_helpers/request_logger.rb

@@ -19,7 +19,7 @@ module Mack
         if configatron.mack.log.detailed_requests
           msg = "\n\t[#{request.params[:method].to_s.upcase}] '#{request.path_info}'\n"
           msg << "\tSession ID: #{request.session.id}\n" if configatron.mack.use_sessions
-          msg << "\tParameters: #{request.all_params}\n"
+          msg << "\tParameters: #{request.params}\n"
           msg << Mack::Utils::Ansi::Color.wrap(configatron.mack.log.colors.completed, "\tCompleted in #{@total_time} (#{@requests_per_second} reqs/sec) | #{response.status} (#{Mack::Utils::HttpStatusCodes.get(response.status)}) [#{request.full_host}]")
         else
           msg = "[#{request.request_method.upcase}] '#{request.path_info}' (#{total_time})"

data/lib/mack/tasks/mack_update_tasks.rake

@@ -4,7 +4,7 @@ namespace :mack do
     
     desc "Convert application configuration yml file into Configatron file"
     task :configuration do
-      file = ENV['FILE'] || ENV['file'] || File.join(Mack.root, "config", "app_config")
+      file = ENV['FILE'] || ENV['file'] || File.join(Mack.root, 'config', "app_config")
       raise "Cannot find: #{file}" if !File.exists?(file)
       if File.directory?(file)
         Dir.glob(File.join(file, "**", "*.yml")).each do |f|
@@ -23,11 +23,11 @@ namespace :mack do
   #   desc "Renames thin.ru to rackup.ru and updates your thin.yml, if necessary."
   #   task :rackup do
   #     require 'fileutils'
-  #     ru = File.join(Mack.root, "config", "thin.ru")
+  #     ru = File.join(Mack.root, 'config', "thin.ru")
   #     if File.exists?(ru)
-  #       FileUtils.mv(ru, File.join(Mack.root, "config", "rackup.ru"))
+  #       FileUtils.mv(ru, File.join(Mack.root, 'config', "rackup.ru"))
   #     end
-  #     thin_yml = File.join(Mack.root, "config", "thin.yml")
+  #     thin_yml = File.join(Mack.root, 'config', "thin.yml")
   #     if File.exists?(thin_yml)
   #       contents = File.open(thin_yml).read
   #       contents.gsub!("thin.ru", "rackup.ru")
@@ -97,7 +97,7 @@ def cleanup_key(key)
   end
 end
 
-def hash_to_configatron(hash, configs = [], current_config = "configatron")
+def hash_to_configatron(hash, configs = [], current_config = 'configatron')
   hash.each_key do |key|
     if hash[key].is_a?Hash
       hash_to_configatron(hash[key], configs, (current_config + ".#{cleanup_key(key)}"))

data/lib/mack/tasks/rake_rules.rake

@@ -1,6 +1,6 @@
 rule /\#.*/ do |t|
   env = t.name.match(/\#.*/).to_s.gsub("#", "")
-  ENV["MACK_ENV"] = env
+  ENV['MACK_ENV'] = env
   name = t.name.gsub("##{env}", "")
   Rake::Task[name].invoke
 end

data/lib/mack/tasks/test_tasks.rake

@@ -12,7 +12,7 @@ namespace :test do
   desc "Run test code."
   Rake::TestTask.new(:test_case) do |t|
     require File.join_from_here('..', 'boot', 'configuration.rb')
-    t.libs << "test"
+    t.libs << 'test'
     t.pattern = configatron.mack.send("#{configatron.mack.testing_framework}_file_pattern")
     t.verbose = true
   end
@@ -57,7 +57,7 @@ namespace :test do
   
   private
   def common_coverage
-    ENV["MACK_ENV"] = "test"
+    ENV['MACK_ENV'] = 'test'
     Rake::Task["mack:environment"].invoke
     Rake::Task["test:setup"].invoke
     

data/lib/mack/testing/helpers.rb

@@ -1,7 +1,5 @@
-require "test/unit"
-
 #--
-if Mack.env == "test"
+if Mack.env == 'test'
   module Mack
     module RunnerHelpers # :nodoc:
       class Session
@@ -45,26 +43,16 @@ module Mack
         $mack_app.instance_variable_get("@app").instance_variable_get("@response").instance_variable_get("@controller").instance_variable_get("@#{key}")
       end
 
-      # Performs a 'get' request for the specified uri.
-      def get(uri, options = {})
-        build_response(request.get(uri, build_request_options(options)))
-      end
-    
-      # Performs a 'put' request for the specified uri.
-      def put(uri, options = {})
-        if options[:multipart]
-          form_input = build_multipart_data(options)
-          build_response(request.put(uri, build_request_options({"CONTENT_TYPE" => "multipart/form-data, boundary=Mack-boundary", "CONTENT_LENGTH" => form_input.size, :input => form_input})))
-        else
-          build_response(request.put(uri, build_request_options({:input => options.to_params})))
-        end
-      end
-      
       # create a wrapper object for file upload testing.
       def file_for_upload(path)
         return Mack::Testing::FileWrapper.new(path)
       end
-          
+
+      # Performs a 'get' request for the specified uri.
+      def get(uri, options = {})
+        build_response(request.get(uri, build_request_options({:input => options.to_params})))
+      end
+
       # Performs a 'post' request for the specified uri.
       def post(uri, options = {})
         if options[:multipart]
@@ -74,10 +62,20 @@ module Mack
           build_response(request.post(uri, build_request_options({:input => options.to_params})))
         end
       end
-    
+
+      # Performs a 'put' request for the specified uri.
+      def put(uri, options = {})
+        if options[:multipart]
+          form_input = build_multipart_data(options)
+          build_response(request.put(uri, build_request_options({"CONTENT_TYPE" => "multipart/form-data, boundary=Mack-boundary", "CONTENT_LENGTH" => form_input.size, :input => form_input})))
+        else
+          build_response(request.put(uri, build_request_options({:input => options.to_params})))
+        end
+      end
+      
       # Performs a 'delete' request for the specified uri.
       def delete(uri, options = {})
-        build_response(request.delete(uri, build_request_options(options)))
+        build_response(request.delete(uri, build_request_options({:input => options.to_params})))
       end
     
       # Returns a Rack::MockRequest. If there isn't one, a new one is created.
@@ -184,7 +182,8 @@ module Mack
       end
     
       def build_request_options(options)
-        {"HTTP_COOKIE" => test_cookies.join("%s=%s", "; ")}.merge(options)
+        opts = {"HTTP_COOKIE" => test_cookies.join("%s=%s", "; ")}.merge(options)
+        opts
       end
     
       def build_response(res)
@@ -196,7 +195,7 @@ module Mack
             [res].flatten.each do |r|
               strip_cookies_from_response(r)
             end
-            res = request.get(res["Location"])
+            res = request.get(res['Location'])
             @responses << res
           end
         end
@@ -205,7 +204,8 @@ module Mack
     
       def strip_cookies_from_response(res)
         unless res.original_headers["Set-Cookie"].nil?
-          res.original_headers["Set-Cookie"].each do |ck|
+          headers = res.original_headers["Set-Cookie"]
+          headers.each do |ck|
             spt = ck.split("=")
             name = spt.first
             value = spt.last

data/lib/mack/testing/rspec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helpers")
+require File.join(File.dirname(__FILE__), 'helpers')
 
 require 'spec'
 module Spec # :nodoc:
@@ -19,33 +19,15 @@ module Spec # :nodoc:
   end # Example
   
   module Matchers # :nodoc:
+    
+    alias_method :__original_match, :match
+    
     def match(regexp)
       regexp = /#{regexp}/ if regexp.is_a?(String)
-      Matchers::Match.new(regexp)
+      __original_match(regexp)
     end
   end # Matchers
   
-  # require 'spec/runner/formatter/base_text_formatter'
-  # module Runner # :nodoc:
-  #   module Formatter # :nodoc:
-  #     class BaseTextFormatter < BaseFormatter # :nodoc:
-  # 
-  #       def dump_pending
-  #         unless @pending_examples.empty?
-  #           @output.puts
-  #           @output.puts yellow("Pending:")
-  #           @pending_examples.each do |pending_example|
-  #             @output.puts yellow("#{pending_example[0]} (#{pending_example[1]})")
-  #             # @output.puts "  Called from #{pending_example[2]}"
-  #           end
-  #         end
-  #         @output.flush
-  #       end
-  #       
-  #     end # BaseTextFormatter
-  #   end # Formatter
-  # end # Runner
-  
 end # Spec