mack 0.8.0.101 → 0.8.1

data/lib/mack/boot/plugins.rb

@@ -0,0 +1,26 @@
+require 'mack-facets'
+
+run_once do
+  
+  require File.join_from_here('gems.rb')
+  
+  init_message('plugins')
+  
+  plugins = [] # a list of all plugins
+  
+  Mack.search_path(:plugins).each do |path|
+    Dir.glob(File.join(path, '*')).each do |d|
+      plugins << d
+      $: << File.join(d, "lib") # add the lib for this plugin to the global load path
+    end
+  end
+  plugins.sort.each do |plug|
+    begin
+      require File.join(plug, "init.rb") # load the init.rb for each plugin.
+    rescue Exception => e
+      puts e.message
+    end
+    $:.delete(File.join(plug, "lib")) # remove the plugins lib directory from the global load path.
+  end
+  
+end

data/lib/mack/boot/portlets.rb

@@ -0,0 +1,20 @@
+run_once do
+  
+  require File.join_from_here('paths.rb')
+  
+  Dir.glob(File.join_from_here('..', 'portlets', '**/*.rb')).each do |d|
+    require File.expand_path(d)
+  end
+  
+  Mack.search_path(:initializers).each do |path|
+    f = File.join(path, 'portlets.rb')
+    require f if File.exists?(f)
+  end
+  
+  required_portlets_list.each do |p|
+    puts "portlet: #{p}"
+    gem p.to_s
+    require p.to_s
+  end
+  
+end

data/lib/mack/boot/routes.rb

@@ -0,0 +1,15 @@
+require 'mack-facets'
+
+run_once do
+  
+  require File.join_from_here('lib')
+  
+  init_message('routes')
+  
+  # We want local routes to be first
+  Mack.search_path_local_first(:config).each do |path|
+    f = File.join(path, 'routes.rb')
+    require f if File.exists?(f)
+  end
+  
+end

data/lib/mack/boot/version.rb

@@ -0,0 +1,7 @@
+require 'mack-facets'
+
+run_once do
+  
+  require File.join_from_here('..', 'version.rb')
+  
+end

data/lib/mack/controller/request.rb

@@ -6,13 +6,14 @@ module Mack
       alias_instance_method :[], :old_hash
       alias_instance_method :store
       def [](key)
-        data = old_hash(key.to_sym) || old_hash(key.to_s)
+        key = key.to_s.downcase
+        data = old_hash(key.to_sym) || old_hash(key)
         data = data.to_s if data.is_a?(Symbol)
         return data
       end
       
       def []=(key, value)
-        _original_store(key.to_sym, value)
+        _original_store(key.downcase.to_sym, value)
       end
       
       def to_s
@@ -135,6 +136,8 @@ module Mack
         if k.to_s.match(/.+\[.+\]/)
           nv = k.to_s.match(/.+\[(.+)\]/).captures.first
           nk = k.to_s.match(/(.+)\[.+\]/).captures.first
+          nk.downcase!
+          nv.downcase!
           @mack_params[nk.to_sym] = {} if @mack_params[nk.to_sym].nil?
           v = v.uri_unescape if v.is_a?(String)
           @mack_params[nk.to_sym].merge!(nv.to_sym => v)

data/lib/mack/controller/uploaded_file.rb

@@ -53,5 +53,9 @@ module Mack
       FileUtils.mv(self.temp_file.path, self.destination_path)
     end
     
+    def valid?
+      !self.file_name.blank? && !self.temp_file.nil?
+    end
+    
   end
 end # :nodoc:

data/lib/mack/core_extensions/kernel.rb

@@ -1,5 +1,31 @@
 module Kernel
   
+  def init_message(message) # :nodoc:
+    message = "Initializing '#{message}' ..."
+    if Mack.methods.include?('logger')
+      Mack.logger.debug(message) unless configatron.mack.log.disable_initialization_logging
+    else
+      puts message
+    end
+  end
+  
+  # Returns Mack::Portlets::Manager
+  def require_portlets
+    yield Mack::Portlet::Manager.instance
+  end
+  
+  # Returns an Array of gems required by the Mack::Portlets::Manager
+  def required_portlets_list
+    Mack::Portlet::Manager.instance.required_portlet_list
+  end
+  
+  #
+  # Return the instance of the AssetManager class.
+  #
+  def assets_mgr
+    return Mack::Assets::Manager.instance
+  end
+  
   # Returns Mack::Utils::GemManager
   def require_gems
     yield Mack::Utils::GemManager.instance

data/lib/mack/core_extensions/object.rb

@@ -0,0 +1,16 @@
+class Object
+  
+  def errors_for(meth_name)
+    if self.respond_to?("errors") and self.errors
+      return self.errors[meth_name.to_sym]
+    end
+    return nil
+  end
+  
+  def has_errors?(meth_name)
+    res = errors_for(meth_name)
+    return !res.empty? if res.is_a?(Array)
+    return !res.blank?
+  end
+  
+end

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

@@ -35,10 +35,12 @@ database_yml:
   template_path: <%= File.join(templates_directory_path, "config", "#{f}.template") %>
   output_path: <%= File.join(app_name, "config", f) %>
 <% end -%>
-gems_rb:
+<% [:gems, :inflections, :mime_types, :portlets].each do |f| -%>
+initializers_<%= f %>_rb:
   type: file
-  template_path: <%= File.join(templates_directory_path, "config", "initializers", "gems.rb.template") %>
-  output_path: <%= File.join(app_name, "config", "initializers", "gems.rb") %>
+  template_path: <%= File.join(templates_directory_path, "config", "initializers", "#{f}.rb.template") %>
+  output_path: <%= File.join(app_name, "config", "initializers", "#{f}.rb") %>
+<% end -%>
 favicon:
   type: file
   template_path: <%= File.join(templates_directory_path, "public", "favicon.ico.template") %>

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

@@ -0,0 +1,9 @@
+# Using this file you can Portlets to your application. 
+# Portlets are Mack applications that have been packaged as Gems using
+# a few simple Rake tasks. These Portlets can extend your application
+# and bring new functionality to them very, very easily.
+require_portlets do |p|
+  # examples:
+  # p.add :my_cool_portlet, :version => "1.2.2"
+  # p.add :my_cool_portlet, :source => "http://gems.rubyforge.org"
+end

data/lib/mack/generators/mack_application_generator/templates/public/stylesheets/scaffold.css.template

@@ -168,3 +168,7 @@ label {
   display: inline-block;
 }
 
+.error {
+  border: 2px solid red;
+  padding: 2px 2px 2px 2px;
+}

data/lib/mack/generators/portlet_generator/portlet_generator.rb

@@ -0,0 +1,2 @@
+class PortletGenerator < Genosaurus # :nodoc:
+end

data/lib/mack/generators/portlet_generator/templates/README.template

@@ -0,0 +1,3 @@
+<%= File.basename(Mack.root) %> Portlet for the Mack Framework
+-----------------------------------------------------------------
+Developed by: <%= (ENV["USERNAME"] || ENV["USER"]) %>

data/lib/mack/generators/portlet_generator/templates/portlet_config/portlet.spec.template

@@ -0,0 +1,28 @@
+Mack::Portlet.portlet_spec = Gem::Specification.new do |s|
+  s.name = "<%= File.basename(Mack.root) %>"
+  s.version = "0.0.1"
+  s.summary = "<%= File.basename(Mack.root) %> portlet for the Mack Framework"
+  s.description = "<%= File.basename(Mack.root) %> portlet for the Mack Framework"
+  s.author = "<%= (ENV["USERNAME"] || ENV["USER"]) %>"
+  s.email = ""
+  s.homepage = ""
+
+  s.test_files = FileList['test/**/*']
+
+  s.files = FileList['lib/**/*', 'README', 'doc/**/*.*', 'bin/**/*']
+  s.require_paths << 'lib'
+
+  s.bindir = "bin"
+  # s.executables << ""
+  #s.default_executable = ""
+  #s.add_dependency("", "")
+  #s.add_dependency("", "")
+  #s.extensions << ""
+  s.extra_rdoc_files = ["README"]
+  s.has_rdoc = true
+  #s.platform = "Gem::Platform::Ruby"
+  #s.required_ruby_version = ">= 1.8.6"
+  #s.requirements << "An ice cold beer."
+  #s.requirements << "Some free time!"
+  s.rubyforge_project = "<%= File.basename(Mack.root) %>"
+end

data/lib/mack/portlets/manager.rb

@@ -0,0 +1,27 @@
+require File.join_from_here('..', 'utils', 'gem_manager.rb')
+
+module Mack
+  module Portlet # :nodoc:
+    
+    # Used to manage the Portlets associated with the application.
+    class Manager
+      include Singleton
+
+      attr_accessor :required_portlet_list
+      
+      def initialize # :nodoc:
+        @required_portlet_list = []
+      end
+      
+      # Adds a Portlet to the application. This takes the same parameters as
+      # Mack::Utils::GemManager.instance.add
+      def add(name, options = {})
+        @required_portlet_list << name
+        @required_portlet_list.uniq!
+        Mack::Utils::GemManager.instance.add(name, options)
+      end
+      
+      
+    end # Manager
+  end # Portlet
+end # Mack

data/lib/mack/portlets/portlet.rb

@@ -0,0 +1,93 @@
+module Mack
+  
+  module Portlet # :nodoc:
+    
+    class << self
+      
+      attr_accessor :portlet_spec # :nodoc:
+      
+      def clean # :nodoc:
+        FileUtils.rm_rf(Mack::Paths.portlet_package, :verbose => configatron.mack.portlet.verbose)
+      end
+    
+      def prepare # :nodoc:
+        unless File.exists?(Mack::Paths.portlet_config)
+          PortletGenerator.run
+        end
+        load Mack::Paths.portlet_config('portlet.spec')
+        FileUtils.mkdir_p(Mack::Paths.portlet_package('lib'), :verbose => configatron.mack.portlet.verbose)
+        files = []
+        File.open(Mack::Paths.portlet_package('lib', "#{@portlet_spec.name}.rb"), 'w') do |f|
+          
+          f.puts %{
+Mack.add_search_path(:app, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'app'))
+Mack.add_search_path(:controllers, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'app', 'controllers'))
+Mack.add_search_path(:helpers, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'app', 'helpers'))
+Mack.add_search_path(:models, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'app', 'models'))
+Mack.add_search_path(:views, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'app', 'views'))
+Mack.add_search_path(:config, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'config'))
+Mack.add_search_path(:configatron, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'config', 'configatron'))
+Mack.add_search_path(:initializers, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'config', 'initializers'))
+Mack.add_search_path(:db, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'db'))
+Mack.add_search_path(:lib, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'lib'))
+Mack.add_search_path(:public, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'public'))
+Mack.add_search_path(:vendor, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'vendor'))
+Mack.add_search_path(:plugins, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}', 'vendor', 'plugins'))
+
+Mack.set_base_path(:#{@portlet_spec.name.methodize}, File.join(File.dirname(__FILE__), '#{@portlet_spec.name}'))
+          }.strip
+          
+        end # File.open
+        
+        files << Dir.glob(Mack::Paths.app('**/*.*'))
+        files << Dir.glob(Mack::Paths.config('**/*.*'))
+        files << Dir.glob(Mack::Paths.db('**/*.*'))
+        files << Dir.glob(Mack::Paths.lib('**/*.*'))
+        files << Dir.glob(Mack::Paths.public('**/*.*'))
+        files << Dir.glob(Mack::Paths.plugins('**/*.*'))
+        
+        files.flatten.compact.uniq.each do |file|
+          copy_file(file)
+        end
+        
+        Dir.glob(Mack::Paths.bin('**/*')).each do |file|
+          copy_bin_file(file)
+        end
+        
+        copy_bin_file(Mack::Paths.root('README'))
+        
+      end # prepare
+      
+      def package # :nodoc:
+        FileUtils.rm_rf(Mack::Paths.root('pkg'), :verbose => configatron.mack.portlet.verbose)
+        FileUtils.cd(Mack::Paths.portlet_package, :verbose => configatron.mack.portlet.verbose)
+        load Mack::Paths.portlet_config('portlet.spec')
+        Rake::GemPackageTask.new(Mack::Portlet.portlet_spec) do |pkg|
+          pkg.need_zip = configatron.mack.portlet.need_zip
+          pkg.need_tar = configatron.mack.portlet.need_tar
+          pkg.package_dir = Mack::Paths.root('pkg')
+        end
+        Rake::Task['package'].invoke
+        FileUtils.cd(Mack.root, :verbose => configatron.mack.portlet.verbose)
+      end
+      
+      private
+      def copy_file(file)
+        n_path = file.gsub(Mack.root, '')
+        n_path = Mack::Paths.portlet_package('lib', @portlet_spec.name, n_path)
+        FileUtils.mkdir_p(File.dirname(n_path), :verbose => configatron.mack.portlet.verbose)
+        FileUtils.cp(file, n_path, :verbose => configatron.mack.portlet.verbose)
+      end
+      
+      def copy_bin_file(file)
+        n_path = file.gsub(Mack.root, '')
+        n_path = Mack::Paths.portlet_package(n_path)
+        FileUtils.mkdir_p(File.dirname(n_path), :verbose => configatron.mack.portlet.verbose)
+        FileUtils.cp(file, n_path, :verbose => configatron.mack.portlet.verbose)
+      end
+      
+    end # class << self
+    
+  end # Portlet
+  
+end # Mack

data/lib/mack/portlets/unpacker.rb

@@ -0,0 +1,34 @@
+module Mack
+  module Portlet
+    class Unpacker < Mack::Utils::RegistryMap
+      
+      def unpack(key, force = false)
+        m = self.registered_items[key.to_sym]
+        if m
+          m.call((force || false))
+        else
+          Mack.search_path(key.to_sym, false).each do |path|
+            Dir.glob(File.join(path, '**/*')).each do |f|
+              f = File.expand_path(f)
+              dest = f.gsub(path, Mack::Paths.send(key))
+              FileUtils.mkdir_p(File.dirname(dest))
+              if File.file?(f)
+                cp = File.exists?(dest) ? force : true
+                if cp
+                  FileUtils.cp(f, f.gsub(path, Mack::Paths.send(key)), :verbose => true) if cp
+                else
+                  puts "Skipping: #{dest}"
+                end
+              end
+            end
+          end
+        end
+      end
+      
+      def initial_state
+        {}
+      end
+      
+    end # Unpacker
+  end # Portlet
+end # Mack

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

@@ -22,14 +22,14 @@ module Mack
             eruby.result(binding)
           rescue NoMethodError => e
             if file_name
-              m = NoMethodError.new("undefined method `#{e.name}' for #{e.backtrace[0].match(/(^.+:\d)/).captures.first}")
+              m = NoMethodError.new("undefined method `#{e.name}' for #{e.backtrace[0].match(/(^.+:\d+)/).captures.first}")
               m.set_backtrace(e.backtrace)
               raise m
             end
             raise e
           rescue NameError => e
             if file_name
-              m = NameError.new("undefined local variable or method `#{e.name}' for #{e.backtrace[0].match(/(^.+:\d)/).captures.first}")
+              m = NameError.new("undefined local variable or method `#{e.name}' for #{e.backtrace[0].match(/(^.+:\d+)/).captures.first}")
               m.set_backtrace(e.backtrace)
               raise m
             end

data/lib/mack/rendering/type/file_base.rb

@@ -10,10 +10,14 @@ module Mack
         # Since engines are stored in an array, the are looped through until a template is found on disk.
         # If no template is found then a Mack::Errors::ResourceNotFound exception is thrown.
         def render_file(file, type = :action)
-          Mack::Rendering::Engine::Registry.engines[type].each do |e|
-            @engine = find_engine(e).new(self.view_template)
-            find_file(file + ".#{@engine.extension}") do |f|
-              return @engine.render(File.new(f), self._binder)
+          # we want to look local first, hence the reverse
+          Mack.search_path_local_first(:app).each do |path|
+            tfile = file.gsub(Mack::Paths.app, path)
+            Mack::Rendering::Engine::Registry.engines[type].each do |e|
+              @engine = find_engine(e).new(self.view_template)
+              find_file(tfile + ".#{@engine.extension}") do |f|
+                return @engine.render(File.new(f), self._binder)
+              end
             end
           end
           raise Mack::Errors::ResourceNotFound.new(file + ".*")

data/lib/mack/rendering/type/public.rb

@@ -13,8 +13,10 @@ module Mack
           if File.extname(p_file).blank?
             p_file = "#{p_file}.#{self._options[:format]}"
           end
-          find_file(Mack::Paths.public(p_file)) do |f|
-            return File.open(f).read
+          Mack.search_path(:public).each do |path|
+            find_file(File.join(path, p_file)) do |f|
+              return File.open(f).read
+            end
           end
           raise Mack::Errors::ResourceNotFound.new(p_file)
         end

data/lib/mack/routing/resource_proxy.rb

@@ -6,27 +6,53 @@ module Mack
       
       attr_accessor :controller
       attr_accessor :routes
+      attr_accessor :resources
       
-      def initialize(controller)
+      def initialize(controller, resources = [])
         self.controller = controller
         self.routes = []
+        self.resources = resources
       end
       
       def method_missing(sym, *args)
         connect(sym, *args)
       end
       
+      def resource(name, options = {}, &block)
+        if block_given?
+          proxy = Mack::Routes::ResourceProxy.new(name, [self.resources, name].flatten)
+          yield proxy
+          proxy.routes.each do |route|
+            Mack::Routes::RouteMap.instance.connect_with_name("#{name}_#{route[:name]}", route[:path], options.merge(route[:options]))
+          end
+        end
+        Mack::Routes::RouteMap.instance.build_resource_routes(name, compile_path(name, self.resources), name, options)
+      end
+      
       private
       def connect(name, path, options = {})
         route = {}
         route[:name] = name.to_s.gsub(/^#{self.controller}/, '')
         route[:options] = {:controller => self.controller, :action => route[:name].to_sym, :method => :get}.merge(options)
-        paths = path.split('/')
-        paths.insert(0, self.controller.to_s)
-        route[:path] = paths.reject{|m| m.blank?}.uniq.join('/')
+        paths = compile_path(self.controller, self.resources.reject{|m| m === self.resources.last}).split('/')
+        paths << path.split('/')
+        paths.flatten!
+        paths.compact!
+        paths.uniq!
+        route[:path] = paths.reject{|m| m.blank?}.join('/')
         routes << route
       end
       
+      def compile_path(name, res)
+        x = []
+        res.each do |r|
+          x << r
+          x << ":#{r.to_s.singular}_id"
+        end
+        x << name
+        x.compact.join('/')
+      end
+      
     end # ResourceProxy
     
   end # Routes