mack 0.8.1 → 0.8.2

data/CHANGELOG

@@ -1,3 +1,24 @@
+=== 0.8.2
+* [#237] Fixed render :rjs throws errors
+* [#236] Upgraded to ActiveRecord 2.2.2
+* [#235] Upgraded to DataMapper 0.9.7
+* [#230] Upgraded to facets 2.4.5
+* [#229] Upgraded to english 0.3.1
+* [#227] Removed WEBrick logging
+* [#226] Bundled gems.
+* [#225] Removed dependency on Thin
+* [#223] Fixed mackery console fails
+* [#148] Added button_to_remote helper method. 
+* [#16] Added deferred? routes.
+* gem: active_record 2.2.2
+* gem: data_mapper 0.9.7
+* gem: addressable 2.0.0
+* gem: facets 2.4.5
+* gem: english 0.3.1
+* gem: rspec 1.1.11
+* gem: haml 2.0.4
+
+=== 0.8.1
 * [#217] Fixed rake mack:dump:routes throws errors
 * [#216] Added ability to turn off view caching in distributed app
 * [#215] Asset path lookup flow update
@@ -410,4 +431,4 @@ gem: cachetastic 1.7.4
 
 ===0.0.4
 * gem: rack 0.3.0
-* gem: ruby_extensions 1.0.11 
+* gem: ruby_extensions 1.0.11

data/bin/mack

@@ -1,4 +1,7 @@
 #!/usr/local/bin/ruby
+require File.join(File.dirname(__FILE__), '..', 'lib', 'gems')
+# add_gem_path(File.join(File.dirname(__FILE__), '..', 'lib', 'gems'))
+
 require 'fileutils'
 require 'optparse'
 require 'optparse/time'

data/bin/mackery-console

@@ -1,6 +1,10 @@
 #!/usr/local/bin/ruby
 # require File.join(File.dirname(__FILE__), "options_handler")
 
+require File.join(File.dirname(__FILE__), '..', 'lib', 'gems')
+
+require 'rubygems'
+
 require File.expand_path(File.join(File.dirname(__FILE__), "env_handler.rb"))
 
 require File.expand_path(File.join(File.dirname(__FILE__), "gem_load_path.rb"))

data/bin/mackery-server

@@ -1,5 +1,6 @@
 #!/usr/local/bin/ruby
-# require File.join(File.dirname(__FILE__), "options_handler")
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'gems')
 
 require File.expand_path(File.join(File.dirname(__FILE__), "env_handler.rb"))
 
@@ -8,11 +9,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), "gem_load_path.rb"))
 require 'rubygems'
 
 require 'fileutils'
-require 'thin'
 
 require 'mack'
 
-handler = "thin"
+handler = nil
 
 if ARGV.include?("-h")
   handler = ARGV[ARGV.index("-h") + 1]
@@ -20,6 +20,22 @@ if ARGV.include?("-h")
   ARGV.delete(handler)
 end
 
+unless handler
+  begin
+    require 'thin'
+    handler = 'thin'
+  rescue Exception => e
+    # puts e.message
+    # puts e.backtrace
+    begin
+      require 'mongrel'
+      handler = 'mongrel'
+    rescue Exception => e
+      handler = 'WEBrick'
+    end
+  end
+end
+
 if handler == "thin"
   # thin_opts = ["start", ARGV]
   thin_opts = []
@@ -32,6 +48,7 @@ if handler == "thin"
   thin_opts << ARGV
   Thin::Runner.new(thin_opts.flatten.reject{|a| a.match(/^_[\d\.]+_$/)}).run!
 else
+  require 'logger'
   port = 3000
   if ARGV.include?("-p")
     port = ARGV[ARGV.index("-p") + 1]
@@ -49,7 +66,7 @@ else
         def run(options)
           r = "Rack::Handler::#{options[:handler].camelcase}"
           puts "Starting app using: #{r} in #{options[:environment]} mode on port: #{options[:port]}"
-          eval(r).run(Mack::Utils::Server.build_app, :Port => options[:port])
+          eval(r).run(Mack::Utils::Server.build_app, :Port => options[:port], :Logger => ::Logger.new(StringIO.new), :AccessLog => [])
         end
 
       end

data/lib/gems.rb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), 'mack', 'core_extensions', 'gem_kernel')
+
+path = File.expand_path(File.join(File.dirname(__FILE__), 'gems'))
+Gem.set_paths(path)
+
+Dir.glob(File.join(path, '*')).each do |p|
+  full_gem_name = File.basename(p)
+  version = full_gem_name.match(/([\d\.?]+)/).to_s
+  gem_name = full_gem_name.gsub("-#{version}", '')
+  $:.unshift(File.join(p, 'lib'))
+  begin
+    gem gem_name, "~> #{version}"
+  rescue Gem::LoadError
+  end
+end

data/lib/gems/abstract-1.0.0/lib/abstract.rb

@@ -0,0 +1,75 @@
+##
+## $Rev: 1 $
+## $Release: 1.0.0 $
+## copyright(c) 2006 kuwata-lab.com all rights reserved.
+##
+##
+## helper to define abstract method in Ruby.
+##
+##
+## example1. (shorter notation)
+##
+##   require 'abstract'
+##   class Foo
+##     abstract_method 'arg1, arg2=""', :method1, :method2, :method3
+##   end
+##
+##
+## example2. (RDoc friendly notation)
+##
+##   require 'abstract'
+##   class Bar
+##     # ... method1 description ...
+##     def method1(arg1, arg2="")
+##       not_implemented
+##     end
+##
+##     # ... method2 description ...
+##     def method2(arg1, arg2="")
+##       not_implemented
+##     end
+##   end
+##
+
+
+##
+class Module
+
+  ##
+  ## define abstract methods
+  ##
+  def abstract_method args_str, *method_names
+    method_names.each do |name|
+      module_eval <<-END
+        def #{name}(#{args_str})
+          mesg = "class \#{self.class.name} must implement abstract method `#{self.name}##{name}()'."
+          #mesg = "\#{self.class.name}##{name}() is not implemented."
+          err = NotImplementedError.new mesg
+          err.set_backtrace caller()
+          raise err
+        end
+      END
+    end
+  end
+
+end
+
+
+##
+module Kernel
+
+  ##
+  ## raise NotImplementedError
+  ##
+  def not_implemented     #:doc:
+    backtrace = caller()
+    method_name = (backtrace.shift =~ /`(\w+)'$/) && $1
+    mesg = "class #{self.class.name} must implement abstract method '#{method_name}()'."
+    #mesg = "#{self.class.name}##{method_name}() is not implemented."
+    err = NotImplementedError.new mesg
+    err.set_backtrace backtrace
+    raise err
+  end
+  private :not_implemented
+
+end

data/lib/gems/builder-2.1.2/lib/blankslate.rb

@@ -0,0 +1,113 @@
+#!/usr/bin/env ruby
+#--
+# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+######################################################################
+# BlankSlate provides an abstract base class with no predefined
+# methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
+# BlankSlate is useful as a base class when writing classes that
+# depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
+#
+class BlankSlate
+  class << self
+
+    # Hide the method named +name+ in the BlankSlate class.  Don't
+    # hide +instance_eval+ or any method beginning with "__".
+    def hide(name)
+      if instance_methods.include?(name.to_s) and
+        name !~ /^(__|instance_eval)/
+        @hidden_methods ||= {}
+        @hidden_methods[name.to_sym] = instance_method(name)
+        undef_method name
+      end
+    end
+
+    def find_hidden_method(name)
+      @hidden_methods ||= {}
+      @hidden_methods[name] || superclass.find_hidden_method(name)
+    end
+
+    # Redefine a previously hidden method so that it may be called on a blank
+    # slate object.
+    def reveal(name)
+      bound_method = nil
+      unbound_method = find_hidden_method(name)
+      fail "Don't know how to reveal method '#{name}'" unless unbound_method
+      define_method(name) do |*args|
+        bound_method ||= unbound_method.bind(self)
+        bound_method.call(*args)
+      end
+    end
+  end
+
+  instance_methods.each { |m| hide(m) }
+end
+
+######################################################################
+# Since Ruby is very dynamic, methods added to the ancestors of
+# BlankSlate <em>after BlankSlate is defined</em> will show up in the
+# list of available BlankSlate methods.  We handle this by defining a
+# hook in the Object and Kernel classes that will hide any method
+# defined after BlankSlate has been loaded.
+#
+module Kernel
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+
+    # Detect method additions to Kernel and remove them in the
+    # BlankSlate class.
+    def method_added(name)
+      result = blank_slate_method_added(name)
+      return result if self != Kernel
+      BlankSlate.hide(name)
+      result
+    end
+  end
+end
+
+######################################################################
+# Same as above, except in Object.
+#
+class Object
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+
+    # Detect method additions to Object and remove them in the
+    # BlankSlate class.
+    def method_added(name)
+      result = blank_slate_method_added(name)
+      return result if self != Object
+      BlankSlate.hide(name)
+      result
+    end
+
+    def find_hidden_method(name)
+      nil
+    end
+  end
+end
+
+######################################################################
+# Also, modules included into Object need to be scanned and have their
+# instance methods removed from blank slate.  In theory, modules
+# included into Kernel would have to be removed as well, but a
+# "feature" of Ruby prevents late includes into modules from being
+# exposed in the first place.
+#
+class Module
+  alias blankslate_original_append_features append_features
+  def append_features(mod)
+    result = blankslate_original_append_features(mod)
+    return result if mod != Object
+    instance_methods.each do |name|
+      BlankSlate.hide(name)
+    end
+    result
+  end
+end

data/lib/gems/builder-2.1.2/lib/builder.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+#--
+# Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+require 'builder/xmlmarkup'
+require 'builder/xmlevents'

data/lib/gems/builder-2.1.2/lib/builder/blankslate.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+#--
+# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+require 'blankslate'
+
+######################################################################
+# BlankSlate has been promoted to a top level name and is now
+# available as a standalone gem.  We make the name available in the
+# Builder namespace for compatibility.
+#
+module Builder
+  BlankSlate = ::BlankSlate
+end

data/lib/gems/builder-2.1.2/lib/builder/css.rb

@@ -0,0 +1,250 @@
+#!/usr/bin/env ruby
+#--
+# Copyright 2004, 2005 by Jim Weirich  (jim@weirichhouse.org).
+# Copyright       2005 by Scott Barron (scott@elitists.net).
+# All rights reserved.
+#
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#
+# Much of this is taken from Jim's work in xmlbase.rb and xmlmarkup.rb.
+# Documentation has also been copied and pasted and modified to reflect
+# that we're building CSS here instead of XML.  Jim is conducting the
+# orchestra here and I'm just off in the corner playing a flute.
+#++
+
+# Provide a flexible and easy to use Builder for creating Cascading
+# Style Sheets (CSS).
+
+
+require 'builder/blankslate'
+
+module Builder
+
+  # Create a Cascading Style Sheet (CSS) using Ruby.
+  #
+  # Example usage:
+  #
+  #   css = Builder::CSS.new
+  #
+  #   text_color      = '#7F7F7F'
+  #   preferred_fonts = 'Helvetica, Arial, sans_serif'
+  #
+  #   css.comment! 'This is our stylesheet'
+  #   css.body {
+  #     background_color '#FAFAFA'
+  #     font_size        'small'
+  #     font_family      preferred_fonts
+  #     color            text_color
+  #   }
+  #
+  #   css.id!('navbar') {
+  #     width            '500px'
+  #   }
+  #
+  #   css.class!('navitem') {
+  #     color            'red'
+  #   }
+  #
+  #   css.a :hover {
+  #     text_decoration  'underline'
+  #   }
+  #
+  #   css.div(:id => 'menu') {
+  #     background       'green'
+  #   }
+  #
+  #   css.div(:class => 'foo') {
+  #     background       'red'
+  #   }
+  #
+  # This will yield the following stylesheet:
+  #
+  #   /* This is our stylesheet */
+  #   body {
+  #     background_color: #FAFAFA;
+  #     font_size:        small;
+  #     font_family:      Helvetica, Arial, sans_serif;
+  #     color:            #7F7F7F;
+  #   }
+  #
+  #   #navbar {
+  #     width:            500px;
+  #   }
+  #
+  #   .navitem {
+  #     color:            red;
+  #   }
+  #
+  #   a:hover {
+  #     text_decoration:  underline;
+  #   }
+  #
+  #   div#menu {
+  #     background:       green;
+  #   }
+  #
+  #   div.foo {
+  #     background:       red;
+  #   }
+  #
+  class CSS < BlankSlate
+
+    # Create a CSS builder.
+    #
+    # out::     Object receiving the markup.1  +out+ must respond to
+    #           <tt><<</tt>.
+    # indent::  Number of spaces used for indentation (0 implies no
+    #           indentation and no line breaks).
+    #
+    def initialize(indent=2)
+      @indent      = indent
+      @target      = []
+      @parts       = []
+      @library     = {}
+    end
+
+    def +(part)
+      _join_with_op! '+'
+      self
+    end
+
+    def >>(part)
+      _join_with_op! ''
+      self
+    end
+
+    def >(part)
+      _join_with_op! '>'
+      self
+    end
+
+    def |(part)
+      _join_with_op! ','
+      self
+    end
+
+    # Return the target of the builder
+    def target!
+      @target * ''
+    end
+
+    # Create a comment string in the output.
+    def comment!(comment_text)
+      @target << "/* #{comment_text} */\n"
+    end
+
+    def id!(arg, &block)
+      _start_container('#'+arg.to_s, nil, block_given?)
+      _css_block(block) if block
+      _unify_block
+      self
+    end
+
+    def class!(arg, &block)
+      _start_container('.'+arg.to_s, nil, block_given?)
+      _css_block(block) if block
+      _unify_block
+      self
+    end
+
+    def store!(sym, &block)
+      @library[sym] = block.to_proc
+    end
+
+    def group!(*args, &block)
+      args.each do |arg|
+        if arg.is_a?(Symbol)
+          instance_eval(&@library[arg])
+        else
+          instance_eval(&arg)
+        end
+        _text ', ' unless arg == args.last
+      end
+      if block
+        _css_block(block)
+        _unify_block
+      end
+    end
+
+    def method_missing(sym, *args, &block)
+      sym = "#{sym}:#{args.shift}" if args.first.kind_of?(Symbol)
+      if block
+        _start_container(sym, args.first)
+        _css_block(block)
+        _unify_block
+      elsif @in_block
+        _indent
+        _css_line(sym, *args)
+        _newline
+        return self
+      else
+        _start_container(sym, args.first, false)
+        _unify_block
+      end
+      self
+    end
+
+    # "Cargo culted" from Jim who also "cargo culted" it.  See xmlbase.rb.
+    def nil?
+      false
+    end
+
+    private
+    def _unify_block
+      @target << @parts * ''
+      @parts = []
+    end
+
+    def _join_with_op!(op)
+      rhs, lhs = @target.pop, @target.pop
+      @target << "#{lhs} #{op} #{rhs}"
+    end
+
+    def _text(text)
+      @parts << text
+    end
+
+    def _css_block(block)
+      _newline
+      _nested_structures(block)
+      _end_container
+      _end_block
+    end
+
+    def _end_block
+      _newline
+      _newline
+    end
+
+    def _newline
+      _text "\n"
+    end
+
+    def _indent
+      _text ' ' * @indent
+    end
+
+    def _nested_structures(block)
+      @in_block = true
+      self.instance_eval(&block)
+      @in_block = false
+    end
+
+    def _start_container(sym, atts = {}, with_bracket = true)
+      selector = sym.to_s
+      selector << ".#{atts[:class]}" if atts && atts[:class]
+      selector << '#' + "#{atts[:id]}" if atts && atts[:id]
+      @parts << "#{selector}#{with_bracket ? ' {' : ''}"
+    end
+
+    def _end_container
+      @parts << "}"
+    end
+
+    def _css_line(sym, *args)
+      _text("#{sym.to_s.gsub('_','-')}: #{args * ' '};")
+    end
+  end
+end