mack 0.4.6 → 0.4.7

data/lib/tasks/rake_rules.rake

@@ -22,6 +22,5 @@ rule /^generate:/ do |t|
   klass = t.name.gsub("generate:", '')
   Rake::Task["environment"].invoke
   klass = "#{klass.camelcase}Generator"
-  gen = klass.constantize.new(ENV)
-  gen.run
+  gen = klass.constantize.run(ENV.to_hash)
 end

data/lib/utils/html.rb

@@ -89,6 +89,14 @@ module Mack
           html = "<#{tag} #{options.join("%s=\"%s\"", " ")}>#{content}</#{tag}>"
         end
         
+        # Builds a HTML image tag.
+        #
+        def image_tag(image_src, options = {})
+          html = "<img src=\"#{image_src}\""
+          html << " " << options.join("%s=\"%s\"", " ") unless options.empty?
+          html << ">"
+        end
+        
       end # self
       
     end # Html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-18 00:00:00 -04:00
+date: 2008-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.0
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -102,6 +102,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.5.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: genosaurus
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.1.1
+    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
 executables: 
@@ -120,24 +129,51 @@ files:
 - lib/distributed/routing/urls.rb
 - lib/distributed/utils/rinda.rb
 - lib/errors/errors.rb
-- lib/generators/base.rb
-- lib/generators/migration/base.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/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
+- lib/generators/mack_application_generator/templates/config/app_config/development.yml.template
+- lib/generators/mack_application_generator/templates/config/app_config/production.yml.template
+- lib/generators/mack_application_generator/templates/config/app_config/test.yml.template
+- lib/generators/mack_application_generator/templates/config/database.yml.template
+- lib/generators/mack_application_generator/templates/config/initializers/gems.rb.template
+- lib/generators/mack_application_generator/templates/config/routes.rb.template
+- lib/generators/mack_application_generator/templates/config/thin.ru.template
+- lib/generators/mack_application_generator/templates/config/thin.yml.template
+- lib/generators/mack_application_generator/templates/public/favicon.ico.template
+- lib/generators/mack_application_generator/templates/public/stylesheets/scaffold.css.template
+- lib/generators/mack_application_generator/templates/Rakefile.template
+- lib/generators/mack_application_generator/templates/test/functional.template
+- 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/migration.rb.template
+- 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/app/models/active_record.rb.template
-- lib/generators/model_generator/templates/app/models/data_mapper.rb.template
+- 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/init.rb.template
-- lib/generators/plugin_generator/templates/lib/plugin.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/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/app/controllers/controller.rb.template
+- lib/generators/scaffold_generator/templates/no_orm/controller.rb.template
+- lib/generators/scaffold_generator/templates/test.rb.template
 - lib/initialization/configuration.rb
 - lib/initialization/console.rb
 - lib/initialization/initializer.rb
@@ -164,10 +200,12 @@ files:
 - 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
 - lib/tasks/mack_dump_tasks.rake
 - lib/tasks/mack_ring_server_tasks.rake
@@ -183,23 +221,6 @@ files:
 - lib/utils/gem_manager.rb
 - lib/utils/html.rb
 - lib/utils/server.rb
-- 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/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/bin/templates/config/app_config/default.yml.template

@@ -1,7 +0,0 @@
-whiny_config_missing: false
-
-mack::session_id: _<%= app.downcase %>_session_id
-
-# log::level: error
-
-<%= options.orm ? "orm: #{options.orm}" : "" %>

data/lib/generators/base.rb

@@ -1,94 +0,0 @@
-module Mack
-  module Generator # :nodoc:
-    # All generator classes should extend this class if they're expected to be used by the rake generate:<generator_name> task.
-    # A generator must by name in the following style: <name>Generator. 
-    # 
-    # Example:
-    #   class MyCoolGenerator < Mack::Generator::Base
-    #     require_param :name, :foo
-    #     
-    #     def generate
-    #       # do work...
-    #     end
-    #   end
-    # 
-    #   rake generate:my_cool # => calls MyCoolGenerator
-    class Base
-
-      include FileUtils
-      
-      # Used to define arguments that are required by the generator.
-      def self.require_param(*args)
-        required_params << args
-        required_params.flatten!
-      end
-      
-      # Returns the required_params array.
-      def self.required_params
-        @required_params ||= []
-      end
-      
-      # Takes a Hash of parameters.
-      # Raise Mack::Errors::RequiredGeneratorParameterMissing if a required parameter
-      # is missing.
-      def initialize(env = {})
-        @env = env.to_hash
-        self.class.required_params.each do |p|
-          raise Mack::Errors::RequiredGeneratorParameterMissing.new(p) unless param(p)
-        end
-      end
-      
-      # Runs the generate method.
-      def run
-        generate
-      end
-      
-      # Returns a parameter from the initial Hash of parameters.
-      def param(key)
-        (@env[key.to_s.downcase] ||= @env[key.to_s.upcase])
-      end
-      
-      # Needs to be implemented by the subclass.
-      needs_method :generate
-      
-      # Takes an input_file runs it through Erubis::Eruby and 
-      # saves it to the specified output_file. If the output_file exists it will
-      # be skipped. If you would like to force the writing of the file, use the
-      # :force => true option.
-      def template(input_file, output_file, options = {})
-        if File.exists?(output_file)
-          unless options[:force]
-            puts "Skipped: #{output_file}"
-            return
-          end
-        end
-        File.open(output_file, "w") {|f| f.puts ERB.new(File.open(input_file).read, nil, "->").result(binding)}
-        puts "Wrote: #{output_file}"
-      end
-      
-      # Creates the specified directory.
-      def directory(output_dir, options = {})
-        if File.exists?(output_dir)
-          puts "Exists: #{output_dir}"
-          return
-        end
-        mkdir_p(output_dir)
-        puts "Created: #{output_dir}"
-      end
-      
-      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::Generator::ModelColumn.new(name, x)
-            end
-          end
-          cs
-        end
-      end
-            
-    end # Base
-  end # Generator
-end # Mack

data/lib/generators/migration/base.rb

@@ -1,26 +0,0 @@
-module Mack
-  module Generator
-    module Migration # :nodoc:
-      class Base < Mack::Generator::Base
-        
-        attr_reader :db_directory
-        attr_reader :migrations_directory
-        
-        def initialize(env = {})
-          super(env)
-          @db_directory = File.join(MACK_ROOT, "db")
-          @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
-        
-      end # Base
-    end # Migration
-  end # Generator
-end # Mack

data/lib/generators/plugin_generator/templates/init.rb.template

@@ -1 +0,0 @@
-require '<%= param(:name) %>'

data/lib/generators/plugin_generator/templates/lib/plugin.rb.template

@@ -1 +0,0 @@
-# Do work here for <%= param(:name) %>