mack 0.8.2 → 0.8.3

data/CHANGELOG

@@ -1,3 +1,19 @@
+=== 0.8.3
+* [#243] Upgraded to Rack 0.9.1
+* [#242] Upgraded to DataMapper 0.9.9
+* [#241] Removed dependency on Facets
+* [#239] Add do_sqlite3 to gems.rb
+* [#166] Effects for mack-javascript
+* [#133] Added Form Builders
+* [#22] Ruby 1.9 Support
+* gem: rack 0.9.1
+* gem: rspec 1.1.12
+* gem: configatron 2.2.2
+* gem: cachetastic 2.1.2
+* gem: data_mapper 0.9.8
+* gem: addressable 2.0.1
+* gem: extlib 0.9.9
+
 === 0.8.2
 * [#237] Fixed render :rjs throws errors
 * [#236] Upgraded to ActiveRecord 2.2.2
@@ -244,7 +260,7 @@ gem: cachetastic 1.7.4
 * INCOMPATIBILITY NOTICE: Test::Unit::TestCase is no longer the default testing framework, RSpec is. If you wish to use
   Test::Unit::TestCase add the following config parameter to your config/app_config/default.yml file:
   mack::testing_framework: test_case
-* INCOMPATIBILITY NOTICE: ENV["_mack_env"] and ENV["_mack_root"] are no longer supported, please use ENV["MACK_ENV"] and ENV["MACK_ROOT"], or just Mack.env and Mack.root
+* INCOMPATIBILITY NOTICE: ENV["_mack_env"] and ENV["_mack_root"] are no longer supported, please use ENV['MACK_ENV'] and ENV['MACK_ROOT'], or just Mack.env and Mack.root
 * INCOMPATIBILITY NOTICE: MACK_DEFAULT_LOGGER constant is no longer available. Please use Mack.logger instead.
 * INCOMPATIBILITY NOTICE: The ApplicationHelper module is now deprecated. Please move view level helpers into Mack::ViewHelpers::* and controller helpers into Mack::ControllerHelpers::<controller_name>
 * thin.ru and thin.yml are no longer needed, you may delete them.

data/bin/env_handler.rb

@@ -1,5 +1,5 @@
 if ARGV.include?("-e")
-  ENV["MACK_ENV"] = ARGV[ARGV.index("-e") + 1] unless ENV["MACK_ENV"]
+  ENV['MACK_ENV'] = ARGV[ARGV.index("-e") + 1] unless ENV['MACK_ENV']
 end
 
 @mack_gem_version = nil

data/bin/mack

@@ -10,7 +10,7 @@ require 'pp'
 require 'erb'
 require 'genosaurus'
 require 'mack-facets'
-require File.join(File.dirname(__FILE__), "..", "lib", "mack", "generators", "mack_application_generator", "mack_application_generator")
+require File.join(File.dirname(__FILE__), '..', 'lib', 'mack', "generators", "mack_application_generator", "mack_application_generator")
 
 app = ARGV[0]
 raise "You must specify a name for this application!" if app.nil?
@@ -39,4 +39,4 @@ end
 
 opts.parse!(ARGV)
 
-MackApplicationGenerator.run({"app" => app, "orm" => options.orm, "testing_framework" => options.testing_framework, "js_framework" => options.js_framework})
+MackApplicationGenerator.run({'app' => app, "orm" => options.orm, "testing_framework" => options.testing_framework, "js_framework" => options.js_framework})

data/bin/mackery-server

@@ -74,5 +74,5 @@ else
     end
   end
   
-  Mack::SimpleServer.run(:handler => handler, :port => port, :environment => ENV["MACK_ENV"])
+  Mack::SimpleServer.run(:handler => handler, :port => port, :environment => ENV['MACK_ENV'])
 end

data/lib/gems.rb

@@ -1,3 +1,4 @@
+require 'mack-facets'
 require File.join(File.dirname(__FILE__), 'mack', 'core_extensions', 'gem_kernel')
 
 path = File.expand_path(File.join(File.dirname(__FILE__), 'gems'))
@@ -9,7 +10,11 @@ Dir.glob(File.join(path, '*')).each do |p|
   gem_name = full_gem_name.gsub("-#{version}", '')
   $:.unshift(File.join(p, 'lib'))
   begin
-    gem gem_name, "~> #{version}"
+    if v1_9?
+      gem gem_name
+    else
+      gem gem_name, "~> #{version}"
+    end
   rescue Gem::LoadError
   end
 end

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

@@ -16,7 +16,7 @@
 #
 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)
@@ -45,7 +45,7 @@ class BlankSlate
       end
     end
   end
-
+  
   instance_methods.each { |m| hide(m) }
 end
 

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

@@ -10,7 +10,7 @@
 
 module Builder
   def self.check_for_name_collision(klass, method_name, defined_constant=nil)
-    if klass.instance_methods.include?(method_name.to_s)
+    if klass.instance_methods.include?(method_name)
       fail RuntimeError,
 	"Name Collision: Method '#{method_name}' is already defined in #{klass}"
     end
@@ -27,7 +27,7 @@ module Builder
 
   ####################################################################
   # XML Character converter, from Sam Ruby:
-  # (see http://intertwingly.net/stories/2005/09/28/xchar.rb).
+  # (see http://intertwingly.net/stories/2005/09/28/xchar.rb). 
   #
   module XChar # :nodoc:
 
@@ -74,7 +74,7 @@ module Builder
     # See http://www.w3.org/TR/REC-xml/#charsets for details.
     VALID = [
       0x9, 0xA, 0xD,
-      (0x20..0xD7FF),
+      (0x20..0xD7FF), 
       (0xE000..0xFFFD),
       (0x10000..0x10FFFF)
     ]

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

@@ -23,9 +23,9 @@ module Builder
       @indent = indent
       @level  = initial
     end
-
+    
     # Create a tag named +sym+.  Other than the first argument which
-    # is the tag name, the arguments are the same as the tags
+    # is the tag name, the arguements are the same as the tags
     # implemented via <tt>method_missing</tt>.
     def tag!(sym, *args, &block)
       method_missing(sym.to_sym, *args, &block)
@@ -74,15 +74,15 @@ module Builder
     end
 
     # Append text to the output target.  Escape any markup.  May be
-    # used within the markup brackets as:
+    # used within the markup brakets as:
     #
     #   builder.p { |b| b.br; b.text! "HI" }   #=>  <p><br/>HI</p>
     def text!(text)
       _text(_escape(text))
     end
-
+    
     # Append text to the output target without escaping any markup.
-    # May be used within the markup brackets as:
+    # May be used within the markup brakets as:
     #
     #   builder.p { |x| x << "<br/>HI" }   #=>  <p><br/>HI</p>
     #
@@ -97,7 +97,7 @@ module Builder
     def <<(text)
       _text(text)
     end
-
+    
     # For some reason, nil? is sent to the XmlMarkup object.  If nil?
     # is not defined and method_missing is invoked, some strange kind
     # of recursion happens.  Since nil? won't ever be an XML tag, it
@@ -109,7 +109,7 @@ module Builder
     end
 
     private
-
+    
     require 'builder/xchar'
     def _escape(text)
       text.to_xs
@@ -123,12 +123,12 @@ module Builder
       return if @indent == 0
       text! "\n"
     end
-
+    
     def _indent
       return if @indent == 0 || @level == 0
       text!(" " * (@level * @indent))
     end
-
+    
     def _nested_structures(block)
       @level += 1
       block.call(self)

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

@@ -38,7 +38,7 @@ module Builder
   #       xm.title("History")        #     <title>History</title>
   #     }                            #   </head>
   #     xm.body {                    #   <body>
-  #       xm.comment! "HI"           #     <! -- HI -->
+  #       xm.comment! "HI"           #     <!-- HI -->
   #       xm.h1("Header")            #     <h1>Header</h1>
   #       xm.p("paragraph")          #     <p>paragraph</p>
   #     }                            #   </body>
@@ -47,7 +47,7 @@ module Builder
   # == Notes:
   #
   # * The order that attributes are inserted in markup tags is
-  #   undefined.
+  #   undefined. 
   #
   # * Sometimes you wish to insert text without enclosing tags.  Use
   #   the <tt>text!</tt> method to accomplish this.
@@ -78,7 +78,7 @@ module Builder
   #   <tt>tag!</tt> will also take text and attribute arguments (after
   #   the tag name) like normal markup methods.  (But see the next
   #   bullet item for a better way to handle XML namespaces).
-  #
+  #   
   # * Direct support for XML namespaces is now available.  If the
   #   first argument to a tag call is a symbol, it will be joined to
   #   the tag to produce a namespace:tag combination.  It is easier to
@@ -93,7 +93,7 @@ module Builder
   # * XmlMarkup builds the markup in any object (called a _target_)
   #   that accepts the <tt><<</tt> method.  If no target is given,
   #   then XmlMarkup defaults to a string target.
-  #
+  # 
   #   Examples:
   #
   #     xm = Builder::XmlMarkup.new
@@ -110,7 +110,7 @@ module Builder
   #     xm = Builder::XmlMarkup.new
   #     x2 = Builder::XmlMarkup.new(:target=>xm)
   #     # Markup written to +x2+ will be send to +xm+.
-  #
+  #   
   # * Indentation is enabled by providing the number of spaces to
   #   indent for each level as a second argument to XmlBuilder.new.
   #   Initial indentation may be specified using a third parameter.
@@ -119,7 +119,7 @@ module Builder
   #
   #     xm = Builder.new(:indent=>2)
   #     # xm will produce nicely formatted and indented XML.
-  #
+  #  
   #     xm = Builder.new(:indent=>2, :margin=>4)
   #     # xm will produce nicely formatted and indented XML with 2
   #     # spaces per indent and an over all indentation level of 4.
@@ -165,15 +165,15 @@ module Builder
     # :target=><em>target_object</em>::
     #    Object receiving the markup.  +out+ must respond to the
     #    <tt><<</tt> operator.  The default is a plain string target.
-    #
+    #    
     # :indent=><em>indentation</em>::
     #    Number of spaces used for indentation.  The default is no
     #    indentation and no line breaks.
-    #
+    #    
     # :margin=><em>initial_indentation_level</em>::
     #    Amount of initial indentation (specified in levels, not
     #    spaces).
-    #
+    #    
     # :escape_attrs=><b>OBSOLETE</em>::
     #    The :escape_attrs option is no longer supported by builder
     #    (and will be quietly ignored).  String attribute values are
@@ -181,14 +181,14 @@ module Builder
     #    values (perhaps you are using entities in the attribute
     #    values), then give the value as a Symbol.  This allows much
     #    finer control over escaping attribute values.
-    #
+    #    
     def initialize(options={})
       indent = options[:indent] || 0
       margin = options[:margin] || 0
       super(indent, margin)
       @target = options[:target] || ""
     end
-
+    
     # Return the target of the builder.
     def target!
       @target
@@ -260,7 +260,7 @@ module Builder
       _ensure_no_block block_given?
       _special("<![CDATA[", "]]>", text, nil)
     end
-
+    
     private
 
     # NOTE: All private methods of a builder object are prefixed when
@@ -270,8 +270,8 @@ module Builder
     def _text(text)
       @target << text
     end
-
-    # Insert special instruction.
+    
+    # Insert special instruction. 
     def _special(open, close, data=nil, attrs=nil, order=[])
       _indent
       @target << open
@@ -289,7 +289,7 @@ module Builder
       @target << "/" if end_too
       @target << ">"
     end
-
+    
     # Insert an ending tag.
     def _end_tag(sym)
       @target << "</#{sym}>"

data/lib/gems/configatron-2.2.2/lib/configatron.rb

@@ -0,0 +1,9 @@
+base = File.join(File.dirname(__FILE__), 'configatron')
+require 'yaml'
+require File.join(base, 'configatron')
+require File.join(base, 'store')
+require File.join(base, 'errors')
+require File.join(base, 'core_ext', 'kernel')
+require File.join(base, 'core_ext', 'object')
+require File.join(base, 'core_ext', 'string')
+require File.join(base, 'core_ext', 'class')

data/lib/gems/{configatron-2.1.5 → configatron-2.2.2}/lib/configatron/configatron.rb

@@ -3,14 +3,16 @@ require 'singleton'
 class Configatron
   include Singleton
   
+  alias_method :send!, :send
+  
   def initialize # :nodoc:
-    @_namespace = :default
+    @_namespace = [:default]
     reset!
   end
   
   # Forwards the method call onto the 'namespaced' Configatron::Store
   def method_missing(sym, *args)
-    @_store[@_namespace].send(sym, *args)
+    @_store[@_namespace.last].send(sym, *args)
   end
   
   # Removes ALL configuration parameters
@@ -34,16 +36,16 @@ class Configatron
   end
   
   def temp_start(options = nil)
-    @_namespace = rand
-    @_store[@_namespace] = @_store[:default].deep_clone
+    n_space = rand
+    @_store[n_space] = @_store[@_namespace.last].deep_clone
+    @_namespace << n_space
     if options
       self.method_missing(:configure_from_hash, options)
     end
   end
   
   def temp_end
-    @_store.delete(@_namespace)
-    @_namespace = :default
+    @_store.delete(@_namespace.pop)
   end
   
   undef :inspect # :nodoc:

data/lib/gems/configatron-2.2.2/lib/configatron/core_ext/class.rb

@@ -0,0 +1,26 @@
+class Class
+  
+  # Returns access to configuration parameters named after the class.
+  # 
+  # Examples:
+  #   configatron.foo.bar = :bar
+  #   configatron.a.b.c.d = 'D'
+  #   
+  #   class Foo
+  #   end
+  #   
+  #   module A
+  #     module B
+  #       class C
+  #       end
+  #     end
+  #   end
+  # 
+  #   Foo.to_configatron.bar # => :bar
+  #   A::B::C.to_configatron.d # => 'D'
+  def to_configatron
+    name_spaces = self.name.split("::").collect{|s| s.methodize}
+    configatron.send_with_chain(name_spaces)
+  end
+  
+end

data/lib/gems/configatron-2.2.2/lib/configatron/core_ext/object.rb

@@ -0,0 +1,9 @@
+class Object # :nodoc:
+  
+  def send_with_chain(methods, *args) # :nodoc:
+    obj = self
+    [methods].flatten.each {|m| obj = obj.send(m, *args)}
+    obj
+  end
+  
+end

data/lib/gems/configatron-2.2.2/lib/configatron/core_ext/string.rb

@@ -0,0 +1,84 @@
+class String # :nodoc:
+  
+  def underscore # :nodoc:
+    self.to_s.gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").
+      downcase
+  end
+  
+  def methodize # :nodoc:
+    x = self
+    
+    # if we get down to a nil or an empty string raise an exception! 
+    raise NameError.new("#{self} cannot be converted to a valid method name!") if x.nil? || x == ''
+    
+    # get rid of the big stuff in the front/back
+    x.strip!
+    
+    # if we get down to a nil or an empty string raise an exception! 
+    raise NameError.new("#{self} cannot be converted to a valid method name!") if x.nil? || x == ''
+    
+    x = x.underscore
+    
+    # get rid of spaces and make the _
+    x.gsub!(' ', '_')
+    # get rid of everything that isn't 'safe' a-z, 0-9, ?, !, =, _
+    x.gsub!(/([^ a-zA-Z0-9\_\?\!\=]+)/n, '_')
+    
+    # if we get down to a nil or an empty string raise an exception! 
+    raise NameError.new("#{self} cannot be converted to a valid method name!") if x.nil? || x == ''
+    
+    # condense multiple 'safe' non a-z chars to just one.
+    # ie. ___ becomes _ !!!! becomes ! etc...
+    [' ', '_', '?', '!', "="].each do |c|
+      x.squeeze!(c)
+    end
+    
+    # if we get down to a nil or an empty string raise an exception! 
+    raise NameError.new("#{self} cannot be converted to a valid method name!") if x.nil? || x == ''
+    
+    #down case the whole thing
+    x.downcase!
+    
+    # get rid of any characters at the beginning that aren't a-z
+    while !x.match(/^[a-z]/)
+      x.slice!(0)
+      
+      # if we get down to a nil or an empty string raise an exception! 
+      raise NameError.new("#{self} cannot be converted to a valid method name!") if x.nil? || x == ''
+    end
+    
+    # let's trim this bad boy down a bit now that we've cleaned it up, somewhat.
+    # we should do this before cleaning up the end character, because it's possible to end up with a 
+    # bad char at the end if you trim too late.
+    x = x[0..100] if x.length > 100
+    
+    # get rid of any characters at the end that aren't safe
+    while !x.match(/[a-z0-9\?\!\=]$/)
+      x.slice!(x.length - 1)
+      # if we get down to a nil or an empty string raise an exception! 
+      raise NameError.new("#{self} cannot be converted to a valid method name!") if x.nil? || x == ''
+    end
+    
+    # if we get down to a nil or an empty string raise an exception! 
+    raise NameError.new("#{self} cannot be converted to a valid method name!") if x.nil? || x == ''
+    
+    # let's get rid of characters that don't belong in the 'middle' of the method.
+    orig_middle = x[1..(x.length - 2)]
+    n_middle = orig_middle.dup
+    
+    ['?', '!', "="].each do |c|
+      n_middle.gsub!(c, "_")
+    end
+    
+    # the previous gsub can leave us with multiple underscores that need cleaning up.
+    n_middle.squeeze!("_")
+    
+    x.gsub!(orig_middle, n_middle)
+    x.gsub!("_=", "=")
+    x
+  end
+  
+end