mack 0.4.7 → 0.5.0

data/lib/tasks/mack_tasks.rake

@@ -2,17 +2,14 @@ namespace :mack do
   
   desc "Loads the Mack environment. Default is development."
   task :environment do
-    MACK_ENV = ENV["MACK_ENV"] ||= "development" unless Object.const_defined?("MACK_ENV")
-    MACK_ROOT = FileUtils.pwd unless Object.const_defined?("MACK_ROOT")
-    require 'mack'
-    # require File.join(MACK_ROOT, "config", "boot.rb")
+    require File.join(File.dirname(__FILE__), '..', 'mack')
   end # environment
 
   desc "Loads an irb console allow you full access to the application w/o a browser."
   task :console do
     libs = []
     libs << "-r irb/completion"
-    libs << "-r #{File.join(File.dirname(__FILE__), '..', 'mack')}"
+    # libs << "-r #{File.join(File.dirname(__FILE__), '..', 'mack')}"
     libs << "-r #{File.join(File.dirname(__FILE__), '..', 'initialization', 'console')}"
     exec "irb #{libs.join(" ")} --simple-prompt"
   end # console

data/lib/tasks/rake_rules.rake

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

data/lib/tasks/test_tasks.rake

@@ -8,9 +8,28 @@ end
 
 namespace :test do
   
+  desc "Report code statistics (KLOCs, etc) from the application. Requires the rcov gem."
+  task :stats do |t|
+    x = `rcov test/**/*_test.rb -T --no-html -x Rakefile,config\/`
+    @print = false
+    x.each do |line|
+      puts line if @print
+      unless @print
+        if line.match(/\d+ tests, \d+ assertions, \d+ failures, \d+ errors/)
+          @print = true
+        end
+      end
+    end
+  end
+  
+  desc "Generates test coverage from the application. Requires the rcov gem."
+  task :coverage do |t|
+    `rcov test/**/*_test.rb -x Rakefile,config\/`
+    `open coverage/index.html`
+  end
+  
   task :empty do |t|
     ENV["TEST:EMPTY"] = "true"
-    puts ENV["TEST:EMPTY"]
   end
   
   task :raise_exception do |t|
@@ -20,3 +39,5 @@ namespace :test do
 end
 
 alias_task :test, :default
+alias_task :stats, "test:stats"
+alias_task :coverage, "test:coverage"

data/lib/test_extensions/test_case.rb

@@ -0,0 +1,50 @@
+module Test
+  module Unit # :nodoc:
+    class TestCase # :nodoc:
+      
+      def name # :nodoc:
+        "#{self.class.name}\t\t#{@method_name}"
+      end
+      
+      # Let's alias the run method in the class above us so we can create a new one here
+      # but still reference it.
+      alias_method :super_run, :run # :nodoc:
+
+      # We need to wrap the run method so we can do things like
+      # run a cleanup method if it exists
+      def run(result, &progress_block) # :nodoc:
+        super_run(result) do |state, name|
+          if state == Test::Unit::TestCase::STARTED
+            cleanup if self.respond_to?(:cleanup)
+            log_start(name)
+          else
+            cleanup if self.respond_to?(:cleanup)
+            log_end(name)
+          end
+        end
+      end
+      
+      def log_start(name = "")
+        @log_start_time = Time.now      
+        puts "\n#{format_log_time(@log_start_time)}: Starting\t#{name}"
+      end
+
+      def log_end(name = "")                 
+        @log_end_time = Time.now
+        puts "#{format_log_time(@log_end_time)}: Ending\t#{name}"
+        et = @log_end_time - @log_start_time
+        suffix = ""
+        et.round.times { suffix += "!" } if et > 1.0
+        if et > 0.5
+          puts "#{suffix}Elapsed Time: #{et} seconds#{suffix}"
+        end
+      end
+      
+      private
+      def format_log_time(time = Time.now)
+        time.strftime("%I:%M:%S %p")
+      end
+      
+    end # TestCase
+  end # Unit
+end # Test

data/lib/test_extensions/test_helpers.rb

@@ -125,6 +125,20 @@ module Mack
       test_cookies.delete(name)
     end
     
+    def method_missing(sym, *args)
+      sym = sym.to_s
+      case sym
+      when /^clean_(.+)/
+        captures = sym.match(/^clean_(.+)/).captures
+        thing = eval(captures.first)
+        if File.exists?(thing)
+          FileUtils.rm_rf(thing)
+        end
+      else
+        raise NoMethodError.new(sym)
+      end
+    end
+    
     private
     def test_cookies
       @test_cookies = {} if @test_cookies.nil?
@@ -145,12 +159,15 @@ module Mack
     def build_response(res)
       @responses = [res]
       strip_cookies_from_response(res)
-      until res.successful?
-        [res].flatten.each do |r|
-          strip_cookies_from_response(r)
+      # only retry if it's a redirect request
+      if res.redirect? 
+        until res.successful?
+          [res].flatten.each do |r|
+            strip_cookies_from_response(r)
+          end
+          res = request.get(res["Location"])
+          @responses << res
         end
-        res = request.get(res["Location"])
-        @responses << res
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-25 00:00:00 -04:00
+date: 2008-05-06 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.5
+        version: 0.1.23
     version: 
 - !ruby/object:Gem::Dependency 
   name: application_configuration
@@ -100,7 +100,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.6.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: genosaurus
@@ -109,7 +109,25 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 1.1.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.8.1.2.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mack-data_mapper
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
     version: 
 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.
 email: mark@mackframework.com
@@ -129,11 +147,11 @@ files:
 - lib/distributed/routing/urls.rb
 - lib/distributed/utils/rinda.rb
 - lib/errors/errors.rb
-- lib/generators/genosaurus_helpers.rb
 - lib/generators/mack_application_generator/mack_application_generator.rb
 - lib/generators/mack_application_generator/manifest.yml
 - lib/generators/mack_application_generator/templates/app/controllers/default_controller.rb.template
 - lib/generators/mack_application_generator/templates/app/helpers/application_helper.rb.template
+- lib/generators/mack_application_generator/templates/app/models.template
 - lib/generators/mack_application_generator/templates/app/views/default/index.html.erb.template
 - lib/generators/mack_application_generator/templates/app/views/layouts/application.html.erb.template
 - lib/generators/mack_application_generator/templates/config/app_config/default.yml.template
@@ -152,28 +170,11 @@ files:
 - lib/generators/mack_application_generator/templates/test/test_helper.rb.template
 - lib/generators/mack_application_generator/templates/test/unit.template
 - lib/generators/mack_application_generator/templates/vendor/plugins.template
-- lib/generators/migration_generator/migration_generator.rb
-- lib/generators/migration_generator/templates/db/migrations/<%=@migration_name%>.rb.template
-- lib/generators/model_column.rb
-- lib/generators/model_generator/manifest.yml
-- lib/generators/model_generator/model_generator.rb
-- lib/generators/model_generator/templates/active_record.rb.template
-- lib/generators/model_generator/templates/data_mapper.rb.template
-- lib/generators/model_generator/templates/test.rb.template
 - lib/generators/plugin_generator/plugin_generator.rb
-- lib/generators/plugin_generator/templates/vendor/plugins/<%= @plugin_name %>/init.rb.template
-- lib/generators/plugin_generator/templates/vendor/plugins/<%= @plugin_name %>/lib/<%= @plugin_name %>.rb.template
-- lib/generators/plugin_generator/templates/vendor/plugins/<%= @plugin_name %>/lib/tasks/<%= @plugin_name %>_tasks.rake.template
-- lib/generators/plugin_generator/templates/vendor/plugins/<%= @plugin_name %>/lib/tasks.template
-- lib/generators/scaffold_generator/manifest.yml
-- lib/generators/scaffold_generator/scaffold_generator.rb
-- lib/generators/scaffold_generator/templates/generic/app/controllers/controller.rb.template
-- lib/generators/scaffold_generator/templates/generic/app/views/edit.html.erb.template
-- lib/generators/scaffold_generator/templates/generic/app/views/index.html.erb.template
-- lib/generators/scaffold_generator/templates/generic/app/views/new.html.erb.template
-- lib/generators/scaffold_generator/templates/generic/app/views/show.html.erb.template
-- lib/generators/scaffold_generator/templates/no_orm/controller.rb.template
-- lib/generators/scaffold_generator/templates/test.rb.template
+- lib/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/init.rb.template
+- lib/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/%=@plugin_name%.rb.template
+- lib/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/tasks/%=@plugin_name%_tasks.rake.template
+- lib/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/tasks.template
 - lib/initialization/configuration.rb
 - lib/initialization/console.rb
 - lib/initialization/initializer.rb
@@ -196,14 +197,13 @@ files:
 - lib/sea_level/cookie_jar.rb
 - lib/sea_level/filter.rb
 - lib/sea_level/helpers/view_helpers/html_helpers.rb
-- lib/sea_level/helpers/view_helpers/orm_helpers.rb
+- lib/sea_level/helpers/view_helpers/string_helpers.rb
 - lib/sea_level/request.rb
 - lib/sea_level/response.rb
 - lib/sea_level/session.rb
 - lib/sea_level/uploaded_file.rb
 - lib/sea_level/view_binder.rb
 - lib/tasks/cachetastic_tasks.rake
-- lib/tasks/db_tasks.rake
 - lib/tasks/gem_tasks.rake
 - lib/tasks/generator_tasks.rake
 - lib/tasks/log_tasks.rake
@@ -215,11 +215,11 @@ files:
 - lib/tasks/rake_rules.rake
 - lib/tasks/test_tasks.rake
 - lib/test_extensions/test_assertions.rb
+- lib/test_extensions/test_case.rb
 - 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
 - CHANGELOG
 has_rdoc: true

data/lib/generators/genosaurus_helpers.rb

@@ -1,38 +0,0 @@
-module Mack
-  module Genosaurus
-    module Helpers
-      
-      def columns(name = param(:name))
-        ivar_cache("form_columns") do
-          cs = []
-          cols = (param(:cols) || param(:columns))
-          if cols
-            cols.split(",").each do |x|
-              cs << Mack::Genosaurus::ModelColumn.new(name, x)
-            end
-          end
-          cs
-        end
-      end
-
-      def db_directory
-        File.join(MACK_ROOT, "db")
-      end
-      
-      def migrations_directory
-        File.join(db_directory, "migrations")
-      end
-      
-      def next_migration_number
-        last = Dir.glob(File.join(migrations_directory, "*.rb")).last
-        if last
-          return File.basename(last).match(/^\d+/).to_s.succ
-        end
-        return "001"
-      end
-      
-      ::Genosaurus.send(:include, self)
-      
-    end # Helpers
-  end # Genosaurus
-end # Mack

data/lib/generators/migration_generator/migration_generator.rb

@@ -1,67 +0,0 @@
-# This will generate a migration for your application.
-# 
-# Example without columns:
-#   rake generate:migration name=create_users
-# If using ActiveRecord generates:
-# db/migrations/<number>_create_users.rb:
-#   class CreateUsers < ActiveRecord::Migration
-#     self.up
-#     end
-# 
-#     self.down
-#     end
-#   end
-# 
-# If using DataMapper generates:
-# db/migrations/<number>_create_users.rb:
-#   class CreateUsers < DataMapper::Migration
-#     self.up
-#     end
-# 
-#     self.down
-#     end
-#   end
-# 
-# Example with columns:
-#   rake generate:migration name=create_users cols=username:string,email_address:string,created_at:datetime,updated_at:datetime
-# If using ActiveRecord generates:
-# db/migrations/<number>_create_users.rb:
-#   class CreateUsers < ActiveRecord::Migration
-#     self.up
-#       create_table :users do |t|
-#         t.column :username, :string
-#         t.column :email_address, :string
-#         t.column :created_at, :datetime
-#         t.column :updated_at, :datetime
-#     end
-# 
-#     self.down
-#       drop_table :users
-#     end
-#   end
-# 
-# If using DataMapper generates:
-# db/migrations/<number>_create_users.rb:
-#   class CreateUsers < DataMapper::Migration
-#     self.up
-#       create_table :users do |t|
-#         t.column :username, :string
-#         t.column :email_address, :string
-#         t.column :created_at, :datetime
-#         t.column :updated_at, :datetime
-#     end
-# 
-#     self.down
-#       drop_table :users
-#     end
-#   end
-class MigrationGenerator < Genosaurus
-
-  require_param :name
-  
-  def setup
-    @table_name = param(:name).underscore.plural.gsub("create_", "")
-    @migration_name = "#{next_migration_number}_#{param(:name).underscore}"
-  end
-  
-end

data/lib/generators/migration_generator/templates/db/migrations/<%=@migration_name%>.rb.template

@@ -1,31 +0,0 @@
-class <%= param(:name).camelcase %> < <%= app_config.orm.camelcase %>::Migration
-
-  def self.up
-<%
-    unless columns.empty?
--%>
-    create_table :<%= @table_name %> do |t|
-<%
-      for column in columns
--%>
-      t.column :<%= column.column_name %>, :<%= column.column_type %>
-<%
-      end
--%>
-    end
-<%
-    end
--%>
-  end
-
-  def self.down
-<%
-    unless columns.empty?
--%>
-    drop_table :<%= @table_name %>
-<%
-    end
--%>
-  end
-
-end

data/lib/generators/model_column.rb

@@ -1,55 +0,0 @@
-module Mack
-  module Genosaurus
-    
-    # Used to represent a 'column' from the param cols or columns for generators.
-    class ModelColumn
-      
-      # The name of the column.
-      attr_accessor :column_name
-      # The type of the column. Ie. string, integer, datetime, etc...
-      attr_accessor :column_type
-      # The name of the model associated with the column. Ie. user, post, etc...
-      attr_accessor :model_name
-      
-      # Takes in the model_name (user, post, etc...) and the column (username:string, body:text, etc...)
-      def initialize(model_name, column_unsplit)
-        self.model_name = model_name.singular.underscore
-        cols = column_unsplit.split(":")
-        self.column_name = cols.first.singular.underscore
-        self.column_type = cols.last.singular.underscore
-      end
-      
-      # Examples:
-      #   Mack::Generator::ColumnObject.new("user", "username:string").form_element_name # => "user[username]"
-      #   Mack::Generator::ColumnObject.new("Post", "body:text").form_element_name # => "post[body]"
-      def form_element_name
-        "#{self.model_name}[#{self.column_name}]"
-      end
-
-      # Examples:
-      #   Mack::Generator::ColumnObject.new("user", "username:string").form_element_id # => "user_username"
-      #   Mack::Generator::ColumnObject.new("Post", "body:text").form_element_id # => "post_body"
-      def form_element_id
-        "#{self.model_name}_#{self.column_name}"
-      end
-
-      # Generates the appropriate HTML form field for the type of column represented.
-      # 
-      # Examples:
-      #   Mack::Generator::ColumnObject.new("user", "username:string").form_field 
-      #     => "<input type="text" name="user[username]" id="user_username" size="30" value="<%= user.username %>" />"
-      #   Mack::Generator::ColumnObject.new("Post", "body:text").form_field
-      #     => "<textarea name="post[body]" id="post_id"><%= post.body %></textarea>"
-      def form_field
-        case self.column_type
-        when "text"
-          %{<textarea name="#{self.form_element_name}" id="#{self.form_element_id}"><%= @#{self.model_name}.#{self.column_name} %></textarea>}
-        else
-          %{<input type="text" name="#{self.form_element_name}" id="#{self.form_element_id}" size="30" value="<%= @#{self.model_name}.#{self.column_name} %>" />}
-        end
-      end
-      
-    end # ModelColumn
-    
-  end # Generator
-end # Mack