mack 0.6.1.2 → 0.7.0

data/CHANGELOG

@@ -1,6 +1,52 @@
-===0.6.1.2
-* gem: application_configuration 1.5.3
-* gem: cachetastic 1.7.4
+=== 0.7.0
+* [#114] Javascript link_helper
+* [#112] Error generating mack application
+* [#109] DataMapper 0.9.4
+* [#103] Log colors for the console are now configurable per log level.
+* [#102] New association method in data_factory
+* [#101] Update to file upload testing (build_file -> file_for_upload, and multipart support in put)
+* [#100] Inline routing parameters are being mutated
+* [#99] Upgraded to facets 2.4.3
+* [#98] Fixed mack-facets not being loaded before app_config files.
+* [#97] Fixed sessions only working with 'local_memory' mode
+* [#96] Distributed Views module now uses file cache
+* [#92] Removed deprecated app_config.orm code.
+* [#91] Fixed Mack blowing up if there is no config/initializers/gems.rb file.
+* [#90] Added deprecation system.
+* [#89] rake gems:* will now only display warning if any gem required is not installed (and not break)
+* [#88] Implemented pending SQLite3 tests in mack-activerecord
+* [#87] Refactored out common ORM code from mack-active_record and mack-data_mapper into mack-orm
+* [#86] stylesheet link helper
+* [#85] Refactored out Mack::ViewHelpers::HtmlHelpers into Mack::ViewHelpers::HtmlHelpers, Mack::ViewHelpers::FormHelpers and
+        Mack::ViewHelpers::linkHelpers
+* [#84] Added Mack::Distributed.lookup(url) to retrieve specific distributed services.
+* [#83] Added mail_to HTML helper.
+* [#82] Added ACL support to mack-distributed
+* [#81] Fixed sessions working with redirects in testing
+* [#80] Distributed objects present both the DRb::DRbObject inspect and the original object's inspect when asked.
+* [#79] Renamed app_config.mack.use_distributed_routes to app_config.mack.share_routes
+* [#76] Move mack_ring_server to mack-distributed
+* [#75] Left over mack-distributed rake tasks
+* [#74] Added optional feature to disable initialization logging.
+* [#73] Tests no longer use the functional/unit directories
+* [#69] Added ViewHelperGenerator and ControllerHelperGenerator
+* [#68] Transactional support in mack-AR
+* [#67] Added test:setup tasks for active_record and data_mapper
+* [#62] Removed const redefined warnings if mack-l10n is used along with mack-activerecord
+* [#39] HAML 2.0.2 support
+* [#28] Refactored out encryption into the mack-encryption gem.
+* [#25] Added ControllerGenerator
+* [#19] Added HTML form helpers
+* [#15] File upload testing support (ability to do multipart form post in testing)
+* [#11] Distributed Layout/Views
+* [#10] Added distributed objects to mack-distributed.
+* [#8]  Move distributed code from mack-core to mack-more
+* [#5] Added tell messaging
+* gem: genosaurus 1.2.2
+* gem: haml 2.0.2
+* gem: addressable 1.0.4
+* gem: facets 2.4.3
+* gem: data_mapper 0.9.4
 
 ===0.6.1.1
 * [#72] Fixed serial data type in DataMapper doesn't work with SQLite3

data/README

@@ -12,7 +12,7 @@ First things first, let's generate your application:
   $ mack <app_name>
 
 To run a Mack application:
-  $ rake script:server
+  $ rake mack:server:start
 
 It will try and run the app using the following servers in this order:
   * Thin
@@ -20,15 +20,15 @@ It will try and run the app using the following servers in this order:
   * WEBrick
 
 rake script:server takes the following options:
-  $ rake script:server PORT=<port> Mack.env=<environment> HANDLER=<rack_handler>
+  $ rake server PORT=<port> Mack.env=<environment> HANDLER=<rack_handler>
   
 The port and rack_handler flags don't apply if you're using Thin[http://code.macournoyer.com/thin] to run the app, which is the default if it is installed. Use the thin.yml file in your application's config directory to configure Thin. The rack_handler one will allow you to switch which server is used to run the app. See Rack for more Rack::Handlers.
   
 The environment can also be changed like this:
-  $ rake script:server#<environment>
+  $ rake mack:server:start#<environment>
   
 You can also run:
-  $ rake console
+  $ rake mack:console
 This will give you console level access to your application.
 
 

data/bin/mack

@@ -15,7 +15,6 @@ options = OpenStruct.new
 options.orm = "data_mapper"
 options.testing_framework = "rspec"
 options.js_framework = "jquery"
-options.version = "0.6.1.2"
 
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: mack <application_name> [options]"
@@ -36,4 +35,4 @@ end
 
 opts.parse!(ARGV)
 
-MackApplicationGenerator.run({"version" => options.version, "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/lib/mack/controller/controller.rb

@@ -38,7 +38,7 @@ module Mack
 
     # Gives access to all the parameters for this request.
     def params
-      self.request
+      self.request.all_params
     end
 
     # Gives access to the session. See Mack::Session for more information.

data/lib/mack/controller/cookie_jar.rb

@@ -63,6 +63,10 @@ module Mack
       self.all_cookies
     end
     
+    def inspect
+      self.all_cookies.inspect
+    end
+    
   end # CookieJar
   
 end # Mack

data/lib/mack/controller/request.rb

@@ -82,7 +82,28 @@ module Mack
     
     private
     def parse_params(ps)
-      ps.each_pair do |k, v|
+      
+      # look for date time selects:
+      dts = ps.select {|k,v| k.to_s.match(/\(.+\)/)}
+      unless dts.empty?
+        dtsh = {}
+        dts.each do |k,v|
+          # convert dilbert[created_at(year)] # => dilbert[created_at]
+          p_name = k.gsub(/\(.+\)/, '')
+          # get 'year'
+          sub_p_name = k.match(/\((.+)\)/).captures.first.to_s
+          # create a new DateTimeParameter if one doesn't exist for this parameter yet
+          dtsh[p_name] = DateTimeParameter.new if dtsh[p_name].nil?
+          # set the accessor for this part of the select
+          dtsh[p_name].add(sub_p_name, v)
+        end
+        # Add the final DateTimeParameter's back onto the request stack.
+        dtsh.each do |k,v|
+          ps[k] = v.to_time
+        end
+      end
+      
+      ps.reject {|k,v| k.to_s.match(/\(.+\)/)}.each do |k,v|
         if k.to_s.match(/.+\[.+\]/)
           nv = k.to_s.match(/.+\[(.+)\]/).captures.first
           nk = k.to_s.match(/(.+)\[.+\]/).captures.first
@@ -96,5 +117,36 @@ module Mack
       end
     end
     
-  end
-end
+    class DateTimeParameter # :nodoc:
+      attr_accessor :year
+      attr_accessor :month
+      attr_accessor :day
+      attr_accessor :hour
+      attr_accessor :minute
+      attr_accessor :second
+      
+      def initialize
+        self.year = Time.now.year
+        self.month = 1
+        self.day = 1
+        self.hour = 0
+        self.minute = 0
+        self.second = 0
+      end
+      
+      def add(key, value)
+        self.send("#{key}=", value)
+      end
+      
+      def to_s
+        "#{year}-#{month}-#{day} #{hour}:#{minute}:#{second}"
+      end
+      
+      def to_time
+        Time.parse(self.to_s)
+      end
+      
+    end
+    
+  end # Request
+end # Mack

data/lib/mack/controller/session.rb

@@ -30,6 +30,15 @@ module Mack
       @sess_hash = {}
     end
     
+    # Deletes a value from the session
+    def delete(key)
+      @sess_hash.delete(key.to_sym)
+    end
+    
+    def inspect
+      "#{self.id}: #{@sess_hash.inspect}"
+    end
+    
     private
     attr_reader :sess_hash # :nodoc:
     

data/lib/mack/controller/tell.rb

@@ -0,0 +1,13 @@
+module Mack
+  module Controller
+    module Tell
+      
+      def tell
+        (session[:tell] ||= {})
+      end
+      
+      include_safely_into(Mack::Controller, Mack::Rendering::ViewTemplate)
+      
+    end # Tell
+  end # Controller
+end # Mack

data/lib/mack/core_extensions/kernel.rb

@@ -1,20 +1,48 @@
 module Kernel
   
-  # A helper method that calls Mack::Utils::Crypt::Keeper with the specified worker
-  # and calls the encrypt method on that worker.
-  def _encrypt(value, worker = :default)
-    Mack::Utils::Crypt::Keeper.instance.worker(worker).encrypt(value)
+  # Returns Mack::Utils::GemManager
+  def require_gems
+    yield Mack::Utils::GemManager.instance
   end
   
-  # A helper method that calls Mack::Utils::Crypt::Keeper with the specified worker
-  # and calls the decrypt method on that worker.
-  def _decrypt(value, worker = :default)
-    Mack::Utils::Crypt::Keeper.instance.worker(worker).decrypt(value)
+  # Returns an Array of gems required by the Mack::Utils::GemManager
+  def required_gem_list
+    Mack::Utils::GemManager.instance.required_gem_list
   end
   
-  # Returns Mack::Utils::GemManager
-  def require_gems
-    yield Mack::Utils::GemManager.instance
+  # Aliases the deprecated method to the new method and logs a warning.
+  def alias_deprecated_method(deprecated_method, new_method, version_deprecrated = nil, version_to_be_removed = nil)
+    eval %{
+      def #{deprecated_method}(*args)
+        deprecate_method(:#{deprecated_method}, :#{new_method}, "#{version_deprecrated}", "#{version_to_be_removed}")
+        #{new_method}(*args)
+      end
+    }
+  end
+  
+  # Logs a warning that a method has been deprecated. Warnings will only get logged once.
+  def deprecate_method(deprecated_method, new_method = nil, version_deprecrated = nil, version_to_be_removed = nil)
+    message = "DEPRECATED: '#{deprecated_method}'."
+    if new_method
+      message << " Please use '#{new_method}' instead."
+    end
+    if version_deprecrated
+      message << " Deprecated in version: '#{version_deprecrated}'."
+      if version_to_be_removed.nil?
+        version_to_be_removed = ">=#{version_deprecrated.succ}"
+      end
+    end
+    if version_to_be_removed
+      message << " To be removed in version: '#{version_to_be_removed}'."
+    end
+    unless Kernel::DeprecatedRegistryList.registered_items.include?(message)
+      Mack.logger.warn(message)
+      Kernel::DeprecatedRegistryList.add(message)
+    end
+  end
+  
+  private
+  class DeprecatedRegistryList < Mack::Utils::RegistryList # :nodoc:
   end
   
 end

data/lib/mack/core_extensions/symbol.rb

@@ -0,0 +1,107 @@
+class Symbol
+  
+  # See Mack::ViewHelpers::FormHelpers date_time_select for more information
+  def date_time_select(*args)
+    Thread.current[:view_template].date_time_select(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers date_select for more information
+  def date_select(*args)
+    Thread.current[:view_template].date_select(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers check_box for more information
+  # 
+  # Examples:
+  #   @user = User.new(:accepted_tos => true)
+  #   <%= :user.check_box :accepted_tos %> # => <input checked="checked" id="user_accepted_tos" name="user[accepted_tos]" type="checkbox" />
+  #   <%= :i_dont_exist.check_box %> # => <input id="i_dont_exist" name="i_dont_exist" type="checkbox" />
+  def check_box(*args)
+    Thread.current[:view_template].check_box(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers file_field for more information
+  # 
+  # Examples:
+  #   @user = User.new(:bio_file => "~/bio.doc")
+  #   <%= :user.file_field :bio_file %> # => <input id="user_bio_field" name="user[bio_field]" type="file" value="~/bio.doc" />
+  #   <%= :i_dont_exist.file_field %> # => <input id="i_dont_exist" name="i_dont_exist" type="file" value="" />
+  def file_field(*args)
+    Thread.current[:view_template].file_field(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers hidden_field for more information
+  # 
+  # Examples:
+  #   @user = User.new(:email => "mark@mackframework.com")
+  #   <%= :user.hidden_field :email %> # => <input id="user_email" name="user[email]" type="hidden" value="mark@mackframework.com" />
+  #   <%= :i_dont_exist.hidden_field %> # => <input id="i_dont_exist" name="i_dont_exist" type="hidden" />
+  def hidden_field(*args)
+    Thread.current[:view_template].hidden_field(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers label_tag for more information
+  # 
+  # Examples:
+  #   @user = User.new
+  #   <%= :user.label_tag :email %> # => <label for="user_email">Email</label>
+  #   <%= :i_dont_exist.label_tag %> # => <label for="i_dont_exist">I don't exist</label>
+  #   <%= :i_dont_exist.label_tag :value => "Hello" %> # => <label for="i_dont_exist">Hello</label>
+  def label_tag(*args)
+    Thread.current[:view_template].label_tag(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers password_field for more information
+  # 
+  # Examples:
+  #   @user = User.new(:email => "mark@mackframework.com")
+  #   <%= :user.password_field :email %> # => <input id="user_email" name="user[email]" type="password" value="mark@mackframework.com" />
+  #   <%= :i_dont_exist.password_field %> # => <input id="i_dont_exist" name="i_dont_exist" type="password" />
+  def password_field(*args)
+    Thread.current[:view_template].password_field(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers radio_button for more information
+  # 
+  # Examples:
+  #   @user = User.new(:level => 1)
+  #   <%= :user.radio_button :level %> # => <input checked="checked" id="user_level" name="user[level]" type="radio" value="1" />
+  #   <%= :user.radio_button :level, :value => 2 %> # => <input id="user_level" name="user[level]" type="radio" value="2" />
+  #   <%= :i_dont_exist.radio_button %> # => <input id="i_dont_exist" name="i_dont_exist" type="radio" value="" />
+  def radio_button(*args)
+    Thread.current[:view_template].radio_button(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers select_tag for more information
+  # 
+  # Examples:
+  #   @user = User.new(:level => 1)
+  #   <%= :user.select_tag :level, :options => [["one", 1], ["two", 2]] %> # => <select id="user_level" name="user[level]"><option value="1" selected>one</option><option value="2" >two</option></select>
+  #   <%= :user.select_tag :level, :options => {:one => 1, :two => 2} %> # => <select id="user_level" name="user[level]"><option value="1" selected>one</option><option value="2" >two</option></select>
+  #   <%= :i_dont_exist.select_tag :options => [["one", 1], ["two", 2]], :selected => 1 %> # => <select id="i_dont_exist" name="i_dont_exist"><option value="1" selected>one</option><option value="2" >two</option></select>
+  def select_tag(*args)
+    Thread.current[:view_template].select_tag(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers text_area for more information
+  # 
+  # Examples:
+  #   @user = User.new(:bio => "my bio here")
+  #   <%= :user.text_area :bio %> # => <textarea id="user_bio" name="user[bio]">my bio here</textarea>
+  #   <%= :i_dont_exist.text_area %> # => <textarea id="i_dont_exist" name="i_dont_exist"></textarea>
+  #   <%= :i_dont_exist.text_area :value => "hi there" %> # => <textarea id="i_dont_exist" name="i_dont_exist">hi there</textarea>
+  def text_area(*args)
+    Thread.current[:view_template].text_area(self, *args)
+  end
+  
+  # See Mack::ViewHelpers::FormHelpers text_field for more information
+  # 
+  # Examples:
+  #   @user = User.new(:email => "mark@mackframework.com")
+  #   <%= :user.text_field :email %> # => <input id="user_email" name="user[email]" type="text" value="mark@mackframework.com" />
+  #   <%= :i_dont_exist.text_field %> # => <input id="i_dont_exist" name="i_dont_exist" type="text" />
+  def text_field(*args)
+    Thread.current[:view_template].text_field(self, *args)
+  end
+  
+end

data/lib/mack/generators/controller_generator/controller_generator.rb

@@ -0,0 +1,64 @@
+# Generates a controller for Mack applications.
+# 
+# Example:
+#   rake generate:controller name=post
+class ControllerGenerator < Genosaurus
+  
+  require_param :name
+  
+  def setup # :nodoc:
+    @name_singular = param(:name).singular.underscore
+    @name_plural = param(:name).plural.underscore
+    @name_singular_camel = @name_singular.camelcase
+    @name_plural_camel = @name_plural.camelcase
+    @actions = []
+    @actions = param(:actions).split(",") unless param(:actions).blank?
+  end
+  
+  def after_generate # :nodoc:
+    add_actions
+    update_routes_file
+    ControllerHelperGenerator.run(@options)
+  end
+  
+  private
+  def update_routes_file # :nodoc:
+    unless @actions.empty?
+      routes = File.join(Mack.root, "config", "routes.rb")
+      rf = File.open(routes).read
+      unless rf.match(".resource :#{@name_plural}")
+        puts "Updating routes.rb"
+        nrf = ""
+        rf.each do |line|
+          if line.match("Mack::Routes.build")
+            x = line.match(/\|(.+)\|/).captures
+            line << "\n  # Added by rake generate:controller name=#{param(:name)} actions=#{param(:actions)}"
+            line << "\n  r.with_options(:controller => :#{@name_plural}) do |map|"
+            @actions.each do |action|
+              line << "\n    map.#{@name_plural}_#{action} \"/#{@name_plural}#{action == "index" ? "" : "/#{action}"}\", :action => :#{action}"
+            end
+            line << "\n  end # #{@name_plural}\n"
+          end
+          nrf << line
+        end
+        File.open(routes, "w") do |f|
+          f.puts nrf
+        end
+      end
+    end
+  end
+  
+  def add_actions
+    @actions.each do |action|
+      template(action_template(action), File.join("app", "views", @name_plural, "#{action}.html.erb"))
+    end    
+  end
+  
+  def action_template(action) # :nodoc:
+    %{
+<h1>#{@name_plural_camel}Controller##{action}</h1>
+<p>You can find me in app/views/#{@name_plural}/#{action}.html.erb</p>
+    }.strip
+  end
+  
+end