Resolved conflict.

Author: wycats

CHANGELOG

@@ -1,3 +1,63 @@
+== 0.9.2 "appropriate response to reality" 2008-03-24
+* Fix merb-flat and merb-very-flat generators
+* merb-gen no longer generates apps by default
+* fix templates so merb-gen will work.
+* cache_action and cache_page should only set cache for 200 responses (closing #207)
+* use Dir.chdir(dir){ sh "#{SUDO} rake install" } for windows compat in rakefile
+* merge drnics MERB_ROM stuff for merb-gen
+* add freeze task to the app rakefiles to freeze as git submoduels.
+* ok since merb-haml is in -more we will use Merb::Config not Merb::Plugin.config
+* Set mongrel as default adapter unless other alternative options are specified
+* Clean up Merb-Gen
+* Added Autotest mappings for full Merb applications for both the RSpec and Test/Unit libraries.
+* Removing un-needed js comment sequence from bundled asset tag.
+* merb-more rake install task escalates user privileges too early
+* don't reload classes in test mode
+* fix up merb-fcgi binary to work out of the box
+* adds implementation for #220 * modifies merb.fcgi to enable really working with fcgi setups * adds default .htaccess that manages the redirection to the CGI script
+* use __send__ not send, use require in merb-haml
+* Fix merb-haml spec to pull proper config
+* Fix action-args to honor controller actions defined using :define_method
+* fix merb-more rakefiles, fix haml config options
+* Added support for charset in css_include_tag
+* added merb-cache to the array of gems in Rakefile. closing #79
+* updated page caching to use logger
+* rearranged module/class structure
+* added expire_match support for memcache backend
+* config/environments/rake.rb now defaults to log/merb_rake.log
+* Now generates config/environments/rake.rb, so Rakefile uses a real environment for Rake (which you can override with MERB_ENV)
+* Make symbolize_keys! a noop temporarily.
+* move plugin config to main file in merb-assets
+* Auto-generated spec_helper.rb now uses :testing option instead of $TESTING global var
+* merb-cache can be disabled with config key :disable
+* implemented dummy cache store in order to be able to disable caching
+* Auto-generated spec_helper.rb now uses :testing option instead of $TESTING global var
+* framework.rb needs to be here.
+* Added ability to create unique, consistant paths to a static asset (js, css, image, video, etc) based on file name to assist in browsers slowed by HTTP Pipelining.
+* Added Gem path manipulation to frozen-merb template
+* The :merb_env task now logs to log/rake.log by default
+* Added merbtasks.rb
+* Cleanup of merb-gen generated Rakefile
+* By default classes should not be reloaded (reload_classes = false) in the TEST environment.
+* add clean task
+* Update task name to have dependencies handled correctly.
+* Corrects a spec that uses a helper.  The helper needs to be in the Merb namespace
+* Fixed typo in freezer generator template
+* Template extension documentation
+* Revert "Adds a haml_buffer method to Haml::Helpers.  This was reporting being missing when using haml in a form."
+* ignore bundle, and merb-more.rb
+* create merb-more.rb
+* capture and concat from AbstractController are private
+* Adds a haml_buffer method to Haml::Helpers.  This was reporting being missing when using haml in a form.
+* Clean up flat app so it makes better use of the way custom frameworks work.
+* adding merb-cache  to merb-more, thanks booss
+* Adds merb_test_unit to init.rb when generating an app with --test
+* MERB_TEST_SUITE=test|spec for a pre-selected test suite for merb-gen app generator
+* added MERB_ORM info to merb-gen usage
+* Uses MERB_ORM env variable to preselect an ORM for config/init.rb
+* Freezer refactor.
+* Introduce the `freeze' rake task
+
 == 0.9.1 "Some are half-wild, and some are just outlaws." 2008-02-29
 * merb-action-args: Normalize calls to Merb.start
 * merb-assets: Adds a before_app_loads to merb-assets and fixes XHTML
@@ -45,4 +105,4 @@
 * merb-parts: [merb-parts] Adds method missing so that controller methods
   are available in parts
 * merb-parts: Normalize calls to Merb.start
-* merb-test: rm -rf merb-test
+* merb-test: rm -rf merb-test

Rakefile

@@ -1,10 +1,10 @@
 ## THESE ARE CRUCIAL
 module Merb
   # Set this to the version of merb-core that you are building against/for
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 
   # Set this to the version of merb-more you plan to release
-  MORE_VERSION = "0.9.1"
+  MORE_VERSION = "0.9.2"
 end
 
 require "rake/clean"
@@ -14,7 +14,7 @@ include FileUtils
 
 gems = %w[
   merb-action-args merb-assets merb-gen merb-haml
-  merb-builder merb-mailer merb-parts
+  merb-builder merb-mailer merb-parts merb-cache
 ]
 
 merb_more_spec = Gem::Specification.new do |s|
@@ -45,6 +45,7 @@ merb_spec = Gem::Specification.new do |s|
   s.files        = %w( LICENSE README Rakefile TODO )
   s.add_dependency "merb-core", "= #{Merb::VERSION}"
   s.add_dependency "merb-more", "= #{Merb::MORE_VERSION}"
+  s.add_dependency "mongrel", ">= 1.0.1"
 end
 
 CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb"]
@@ -66,21 +67,21 @@ end
 
 desc "Install it all"
 task :install => [:install_gems, :package] do
-  sh %{#{SUDO} gem install --local pkg/merb-more-#{Merb::MORE_VERSION}.gem}
-  sh %{#{SUDO} gem install --local pkg/merb-#{Merb::MORE_VERSION}.gem}
+  sh %{#{SUDO} gem install --local pkg/merb-more-#{Merb::MORE_VERSION}.gem  --no-update-sources}
+  sh %{#{SUDO} gem install --local pkg/merb-#{Merb::MORE_VERSION}.gem --no-update-sources}
 end
 
 desc "Build the merb-more gems"
 task :build_gems do
   gems.each do |dir|
-    sh %{cd #{dir}; rake package}
+    Dir.chdir(dir){ sh "rake package" }
   end
 end
 
 desc "Install the merb-more sub-gems"
 task :install_gems do
   gems.each do |dir|
-    sh %{cd #{dir}; #{SUDO} rake install}
+    Dir.chdir(dir){ sh "#{SUDO} rake install" }
   end
 end
 

merb-action-args/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb-action-args"
 NAME = "merb-action-args"
-VERSION = "0.9.1"
+VERSION = "0.9.2"
 AUTHOR = "Yehuda Katz"
 EMAIL = "[email protected]"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-haml/"
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.1')
+  s.add_dependency('merb-core', '>= 0.9.2')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
@@ -31,7 +31,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
+  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
 end
 
 namespace :jruby do
@@ -41,4 +41,4 @@ namespace :jruby do
     sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
   end
 
-end
+end

merb-action-args/lib/merb-action-args/abstract_controller.rb

@@ -31,6 +31,6 @@ def _call_action(action)
       raise BadRequest unless p || default
       p ? params[arg.to_sym] : default
     end
-    send(action, *args)
+    __send__(action, *args)
   end
 end

merb-action-args/lib/merb-action-args/get_args.rb

@@ -22,11 +22,19 @@ def arg_nodes
   end
 
   def get_args
-    arg_node = deep_array_node(:args)
-    return nil unless arg_node
-    args = arg_node.arg_nodes
-    default_node = arg_node.deep_array_node(:block)
-    return args unless default_node
+    if arg_node = deep_array_node(:args)
+      # method defined with def keyword
+      args = arg_node.arg_nodes
+      default_node = arg_node.deep_array_node(:block)
+      return args unless default_node
+    else
+      # assuming method defined with Module#define_method
+      return []
+    end
+    
+    # if it was defined with def, and we found the default_node,
+    # that should bring us back to regularly scheduled programming..
+    
     lasgns = default_node[1..-1]
     lasgns.each do |asgn|
       args.assoc(asgn[1]) << eval(RubyToRuby.new.process(asgn[2]))

merb-action-args/spec/action_args_spec.rb

@@ -22,4 +22,8 @@
     lambda { dispatch_to(ActionArgs, :index) }.should raise_error(Merb::ControllerExceptions::BadRequest)
   end
 
+  it "should treat define_method actions as equal" do
+    dispatch_to(ActionArgs, :dynamic_define_method).body.should == "mos def"
+  end
+  
 end

merb-action-args/spec/controllers/action-args.rb

@@ -16,4 +16,8 @@ def defaults_mixed(foo, bar ="bar", baz = "baz")
     "#{foo} #{bar} #{baz}"
   end
 
+  define_method :dynamic_define_method do
+    "mos def"
+  end
+  
 end

merb-action-args/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 $TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
+require "rubygems"
 require "merb-core"
 require "merb-action-args"
 require File.dirname(__FILE__) / "controllers" / "action-args"
+require "spec"
 
 Merb.start :environment => 'test'
 

merb-assets/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb-assets"
 NAME = "merb-assets"
-VERSION = "0.9.1"
+VERSION = "0.9.2"
 AUTHOR = "Ezra Zygmuntowicz"
 EMAIL = "[email protected]"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-assets/"
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.1')
+  s.add_dependency('merb-core', '>= 0.9.2')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
@@ -31,7 +31,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
+  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources --no-update-sources}
 end
 
 namespace :jruby do
@@ -41,4 +41,4 @@ namespace :jruby do
     sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
   end
 
-end
+end

merb-assets/lib/merb-assets/assets_mixin.rb

@@ -390,7 +390,7 @@ def js_include_tag(*scripts)
           :src => asset_path(:javascript, script),
           :type => "text/javascript"
         }
-        tags << %Q{<script #{attrs.to_xml_attributes}>//</script>}
+        tags << %Q{<script #{attrs.to_xml_attributes}></script>}
       end
 
       return tags
@@ -413,21 +413,24 @@ def js_include_tag(*scripts)
     #
     # ==== Examples
     #   css_include_tag 'style'
-    #   # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" />
+    #   # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" charset="utf-8" />
     #
     #   css_include_tag 'style.css', 'layout'
-    #   # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" />
-    #   #    <link href="/stylesheets/layout.css" media="all" rel="Stylesheet" type="text/css" />
+    #   # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" charset="utf-8" />
+    #   #    <link href="/stylesheets/layout.css" media="all" rel="Stylesheet" type="text/css" charset="utf-8" />
     #
     #   css_include_tag :menu
-    #   # => <link href="/stylesheets/menu.css" media="all" rel="Stylesheet" type="text/css" />
+    #   # => <link href="/stylesheets/menu.css" media="all" rel="Stylesheet" type="text/css" charset="utf-8" />
     #
     #   css_include_tag :style, :screen
-    #   # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" />
-    #   #    <link href="/stylesheets/screen.css" media="all" rel="Stylesheet" type="text/css" />
+    #   # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" charset="utf-8" />
+    #   #    <link href="/stylesheets/screen.css" media="all" rel="Stylesheet" type="text/css" charset="utf-8" />
     # 
     #  css_include_tag :style, :media => :print
-    #  # => <link href="/stylesheets/style.css" media="print" rel="Stylesheet" type="text/css" />
+    #  # => <link href="/stylesheets/style.css" media="print" rel="Stylesheet" type="text/css" charset="utf-8" />
+    #
+    #  css_include_tag :style, :charset => 'iso-8859-1'
+    #  # => <link href="/stylesheets/style.css" media="print" rel="Stylesheet" type="text/css" charset="iso-8859-1" />
     def css_include_tag(*stylesheets)
       options = stylesheets.last.is_a?(Hash) ? stylesheets.pop : {}
       return nil if stylesheets.empty?
@@ -445,6 +448,7 @@ def css_include_tag(*stylesheets)
           :href => asset_path(:stylesheet, stylesheet),
           :type => "text/css",
           :rel => "Stylesheet",
+          :charset => options[:charset] || 'utf-8',
           :media => options[:media] || :all
         }
         tags << %Q{<link #{attrs.to_xml_attributes} />}

merb-builder/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb-builder"
 NAME = "merb-builder"
-VERSION = "0.9.1"
+VERSION = "0.9.2"
 AUTHOR = "Jonathan Younger"
 EMAIL = "[email protected]"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-builder/"
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.1')
+  s.add_dependency('merb-core', '>= 0.9.2')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
@@ -31,7 +31,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
+  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
 end
 
 namespace :jruby do

merb-cache/README

@@ -17,14 +17,13 @@ Implemented cache stores:
 - database (sequel, datamapper, activerecord)
 
 == Quick intro
-  cache_fragment is helpful to put chunks of data in cache without interferring with dynamic content.
+  With fragment caching, you can mix dynamic and static content.
 
-  cache_action puts the whole action in cache but if you use before filters to restrict access,
-  you can still protect your content.
+  With action caching, the whole template is cached
+  but the before filters are still processed.
 
-  cache_page is cache_action with file store (using .html extension in a separate directory).
-  With page caching you output .html files (in public/cache/ by default) so you can then tell your proxy/webserver
-  to serve these files directly thus bypassing the framework completely.
+  With page caching, the whole template is put in html files in a special
+  directory in order to be handled directly without triggering Merb.
 
 == Quick API
 
@@ -70,7 +69,8 @@ Implemented cache stores:
   or just:
   $ cd spec
   $ STORE=<cache_store> spec merb-cache_spec.rb
-  # cache_store can be: memory, memcache, file, sequel, datamapper, activerecord
+  # cache_store can be:
+  #   memory, memcache, file, sequel, datamapper, activerecord
 
 == Sample configuration
 
@@ -89,6 +89,7 @@ Implemented cache stores:
     #:store => "memcache",
     #:host => "127.0.0.1:11211",
     #:namespace => "merb_cache",
+    #:no_tracking => "false",
 
     #:store => "memory",
     # store could be: file, memcache, memory, database, dummy, ...