merb-assets/spec/merb-assets_spec.rb merb-builder/spec/controllers/views/capture_builder/index.xml.builder merb-builder/spec/controllers/views/concat_builder/index.xml.builder merb-freezer/LICENSE merb-freezer/README merb-freezer/README.markdown merb-freezer/Rakefile merb-freezer/TODO merb-freezer/bin/frozen-merb merb-freezer/lib/merb-freezer.rb merb-freezer/lib/merb-freezer/freezer.rb merb-freezer/lib/merb-freezer/freezer_mode.rb merb-freezer/lib/merb-freezer/merbtasks.rb merb-freezer/spec/merb-freezer_spec.rb merb-freezer/spec/spec_helper.rb merb-gen/lib/merb-gen/controller.rb merb-gen/lib/merb-gen/generator.rb merb-gen/lib/merb-gen/merb.rb merb-gen/lib/merb-gen/merb_flat.rb merb-gen/lib/merb-gen/merb_very_flat.rb merb-gen/lib/merb-gen/migration.rb merb-gen/lib/merb-gen/model.rb merb-gen/lib/merb-gen/part_controller.rb merb-gen/lib/merb-gen/resource.rb merb-gen/lib/merb-gen/resource_controller.rb merb-gen/spec/controller_spec.rb merb-gen/spec/merb_spec.rb merb-gen/spec/migration_spec.rb merb-gen/spec/model_spec.rb merb-gen/spec/resource_controller_spec.rb merb-gen/spec/spec_helper.rb merb-gen/templates/application/merb/Rakefile merb-gen/templates/application/merb/app/controllers/application.rb merb-gen/templates/application/merb/app/controllers/exceptions.rb merb-gen/templates/application/merb/app/helpers/global_helpers.rb merb-gen/templates/application/merb/app/views/exceptions/internal_server_error.html.erb merb-gen/templates/application/merb/app/views/exceptions/not_acceptable.html.erb merb-gen/templates/application/merb/app/views/exceptions/not_found.html.erb merb-gen/templates/application/merb/app/views/layout/application.html.erb merb-gen/templates/application/merb/autotest/discover.rb merb-gen/templates/application/merb/autotest/merb.rb merb-gen/templates/application/merb/autotest/merb_rspec.rb merb-gen/templates/application/merb/config/environments/development.rb merb-gen/templates/application/merb/config/environments/production.rb merb-gen/templates/application/merb/config/environments/rake.rb merb-gen/templates/application/merb/config/environments/test.rb merb-gen/templates/application/merb/config/init.rbt merb-gen/templates/application/merb/config/rack.rb merb-gen/templates/application/merb/config/router.rb merb-gen/templates/application/merb/public/htaccess merb-gen/templates/application/merb/public/images/merb.jpg merb-gen/templates/application/merb/public/merb.fcgi merb-gen/templates/application/merb/public/stylesheets/master.css merb-gen/templates/application/merb/spec/spec.opts merb-gen/templates/application/merb/spec/spec_helper.rb merb-gen/templates/application/merb/test/test_helper.rb merb-gen/templates/application/merb_flat/README.txt merb-gen/templates/application/merb_flat/application.rb merb-gen/templates/application/merb_flat/config/framework.rb merb-gen/templates/application/merb_flat/config/init.rbt merb-gen/templates/application/merb_flat/views/foo.html.erb merb-gen/templates/application/merb_plugin/merb_plugin_generator.rb merb-gen/templates/application/merb_plugin/templates/LICENSE merb-gen/templates/application/merb_plugin/templates/README merb-gen/templates/application/merb_plugin/templates/Rakefile merb-gen/templates/application/merb_plugin/templates/TODO merb-gen/templates/application/merb_plugin/templates/lib/%base_name%.rb merb-gen/templates/application/merb_plugin/templates/lib/%base_name%/merbtasks.rb merb-gen/templates/application/merb_plugin/templates/spec/%base_name%_spec.rb merb-gen/templates/application/merb_plugin/templates/spec/spec_helper.rb merb-gen/templates/application/merb_plugin/templates/test/%base_name%_test.rb merb-gen/templates/application/merb_plugin/templates/test/test_helper.rb merb-gen/templates/application/merb_very_flat/application.rbt merb-gen/templates/component/controller/controller.rbt merb-gen/templates/component/controller/controller_spec.rbt merb-gen/templates/component/controller/controller_test_unit.rbt merb-gen/templates/component/controller/helper.rbt merb-gen/templates/component/controller/helper_spec.rbt merb-gen/templates/component/controller/index.html.erbt merb-gen/templates/component/migration/migration_activerecord.rbt merb-gen/templates/component/migration/migration_datamapper.rbt merb-gen/templates/component/migration/migration_sequel.rbt merb-gen/templates/component/model/model.rbt merb-gen/templates/component/model/model_activerecord.rbt merb-gen/templates/component/model/model_datamapper.rbt merb-gen/templates/component/model/model_sequel.rbt merb-gen/templates/component/model/spec.rbt merb-gen/templates/component/model/test_unit.rbt merb-gen/templates/component/part_controller/controller.rbt merb-gen/templates/component/part_controller/helper.rbt merb-gen/templates/component/part_controller/index.html.erbt merb-gen/templates/component/resource_controller/controller.rbt merb-gen/templates/component/resource_controller/helpers.rbt merb-gen/templates/component/resource_controller/views/edit.html.erb merb-gen/templates/component/resource_controller/views/index.html.erb merb-gen/templates/component/resource_controller/views/new.html.erb merb-gen/templates/component/resource_controller/views/show.html.erb merb-jquery/LICENSE merb-jquery/README merb-jquery/Rakefile merb-jquery/TODO merb-jquery/lib/merb-jquery.rb merb-jquery/lib/merb-jquery/merbtasks.rb merb-mailer/lib/merb-mailer/mailer_mixin.rb merb-parts/lib/merb-parts/mixins/parts_mixin.rb merb-parts/spec/fixtures/parts/done_part.rb merb-slices/.gitignore merb-slices/LICENSE merb-slices/README merb-slices/Rakefile merb-slices/TODO merb-slices/lib/merb-slices.rb merb-slices/lib/merb-slices/controller_mixin.rb merb-slices/lib/merb-slices/merbtasks.rb merb-slices/lib/merb-slices/module.rb merb-slices/lib/merb-slices/module_mixin.rb merb-slices/lib/merb-slices/router_ext.rb merb-slices/merb_generators/slice/USAGE merb-slices/merb_generators/slice/slice_generator.rb merb-slices/merb_generators/slice/templates/LICENSE merb-slices/merb_generators/slice/templates/README merb-slices/merb_generators/slice/templates/Rakefile merb-slices/merb_generators/slice/templates/TODO merb-slices/merb_generators/slice/templates/app/controllers/application.rb merb-slices/merb_generators/slice/templates/app/controllers/main.rb merb-slices/merb_generators/slice/templates/app/helpers/application_helper.rb merb-slices/merb_generators/slice/templates/app/views/layout/%underscored_base_name%.html.erb merb-slices/merb_generators/slice/templates/app/views/main/index.html.erb merb-slices/merb_generators/slice/templates/lib/%base_name%.rb merb-slices/merb_generators/slice/templates/lib/%base_name%/merbtasks.rb merb-slices/merb_generators/slice/templates/lib/%base_name%/slicetasks.rb merb-slices/merb_generators/slice/templates/public/javascripts/master.js merb-slices/merb_generators/slice/templates/public/stylesheets/master.css merb-slices/merb_generators/slice/templates/spec/%base_name%_spec.rb merb-slices/merb_generators/slice/templates/spec/controllers/main_spec.rb merb-slices/merb_generators/slice/templates/spec/spec_helper.rb merb-slices/merb_generators/slice/templates/stubs/app/controllers/application.rb merb-slices/merb_generators/slice/templates/stubs/app/controllers/main.rb merb-slices/merb_generators/thin_slice/USAGE merb-slices/merb_generators/thin_slice/templates/LICENSE merb-slices/merb_generators/thin_slice/templates/README merb-slices/merb_generators/thin_slice/templates/Rakefile merb-slices/merb_generators/thin_slice/templates/TODO merb-slices/merb_generators/thin_slice/templates/application.rb merb-slices/merb_generators/thin_slice/templates/lib/%base_name%.rb merb-slices/merb_generators/thin_slice/templates/lib/%base_name%/merbtasks.rb merb-slices/merb_generators/thin_slice/templates/lib/%base_name%/slicetasks.rb merb-slices/merb_generators/thin_slice/templates/public/javascripts/master.js merb-slices/merb_generators/thin_slice/templates/public/stylesheets/master.css merb-slices/merb_generators/thin_slice/templates/stubs/application.rb merb-slices/merb_generators/thin_slice/templates/views/layout/%underscored_base_name%.html.erb merb-slices/merb_generators/thin_slice/templates/views/main/index.html.erb merb-slices/merb_generators/thin_slice/thin_slice_generator.rb merb-slices/merb_generators/very_thin_slice/USAGE merb-slices/merb_generators/very_thin_slice/templates/LICENSE merb-slices/merb_generators/very_thin_slice/templates/README merb-slices/merb_generators/very_thin_slice/templates/Rakefile merb-slices/merb_generators/very_thin_slice/templates/TODO merb-slices/merb_generators/very_thin_slice/templates/application.rb merb-slices/merb_generators/very_thin_slice/templates/lib/%base_name%.rb merb-slices/merb_generators/very_thin_slice/templates/lib/%base_name%/merbtasks.rb merb-slices/merb_generators/very_thin_slice/templates/lib/%base_name%/slicetasks.rb merb-slices/merb_generators/very_thin_slice/very_thin_slice_generator.rb merb-slices/spec/merb-slice_spec.rb merb-slices/spec/spec_helper.rb @@ -1,3 +1,39 @@ +== 0.9.3 "We Sold Our Soul for Rock 'n' Roll" 2008-05-03 +* Add mongrel as dependency of merb meta gem +* make merb.fcgi executable +* Added /log dir back to default app generator; logger auto-flush set to true (dev/test/rake env.) +* Fixed a bug where cache_{action,page} wouldn't work with multiple controllers (closing #90) +* moved the generated frozen merb script to merb-freezer +* action-args: Add support for iherited/mixed-in controller actions +* refactored the rake tasks and added support for rubygems freeze using MODE=rubygems +* Fixes Merb::AssetsMixin errors from #103, also added specs +* finally fixed the submodules freezer +* added simple message to let the user know what merb-core gem is being used +* removed merb-core dependency so frozen-merb can work properly +* Makes frozen_merb bin work outside of the working directory by looking for the -m CLI option +* quieted missleading merb-gen warning when using rspec. Thanks ec! +* added default file logging in production mode +* merb-mailer absolute_url convenience method +* Added bundling for require_js and require_css; track cached bundles in-memory +* Made bundles stale for 60 seconds after modification/generation +* Fixed "Page caching doesn't deactivate" closing #106 +* Properly handle assets urls with query strings in them +* Arguments to require_js and require_css methods are now kept seperate +* Cached page requests now respect the original content-type, fixing #116 +* Update generated init file: add inflection examples, notes on gems bundling and lazy loading +* Add example and dependencies / installation order tricks to generated init.rb +* Updated templates for merb app generation +* Added a small fix to autotest/merb_rspec.rb template +* Make Merb::Config.use section come after dependencies. +* Make loadp paths and dependencies come first in generated config. +* Fix merb-builder, thanks atmpos +* Leave a notice on libraries under lib/ autoloading in init.rb (see details). +* A css/js auto linker based on controller/action names. +* make partials with args work in parts. +* Add missing dependency for merb-builder +* allow usage of a custom GEM_HOME when building gems in rakefile +* Make generated Autotest files Windows-friendly again. + == 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 CHANGELOG @@ -1,23 +1,25 @@ ## THESE ARE CRUCIAL module Merb # Set this to the version of merb-core that you are building against/for - VERSION = "0.9.2" + VERSION = "0.9.4" # Set this to the version of merb-more you plan to release - MORE_VERSION = "0.9.2" + MORE_VERSION = "0.9.4" end require "rake/clean" require "rake/gempackagetask" +require 'merb-core/tasks/merb_rake_helper' require 'fileutils' include FileUtils gems = %w[ merb-action-args merb-assets merb-gen merb-haml - merb-builder merb-mailer merb-parts merb-cache + merb-builder merb-mailer merb-parts merb-cache merb-freezer merb-slices ] merb_more_spec = Gem::Specification.new do |s| + s.rubyforge_project = 'merb' s.name = "merb-more" s.version = Merb::MORE_VERSION s.platform = Gem::Platform::RUBY @@ -34,6 +36,7 @@ merb_more_spec = Gem::Specification.new do |s| end merb_spec = Gem::Specification.new do |s| + s.rubyforge_project = 'merb' s.name = "merb" s.version = Merb::MORE_VERSION s.platform = Gem::Platform::RUBY @@ -50,13 +53,6 @@ end CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb"] -windows = (PLATFORM =~ /win32|cygwin/) rescue nil - -SUDO = windows ? "" : "sudo" - -# desc "Installs Merb More." -# task :default => :install - Rake::GemPackageTask.new(merb_more_spec) do |package| package.gem_spec = merb_more_spec end @@ -65,10 +61,11 @@ Rake::GemPackageTask.new(merb_spec) do |package| package.gem_spec = merb_spec end +gem_home = ENV['GEM_HOME'] ? "GEM_HOME=#{ENV['GEM_HOME']}" : "" desc "Install it all" task :install => [:install_gems, :package] do - 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} + sh %{#{sudo} gem install #{install_home} --local pkg/merb-more-#{Merb::MORE_VERSION}.gem --no-update-sources} + sh %{#{sudo} gem install #{install_home} --local pkg/merb-#{Merb::MORE_VERSION}.gem --no-update-sources} end desc "Build the merb-more gems" @@ -81,14 +78,14 @@ end desc "Install the merb-more sub-gems" task :install_gems do gems.each do |dir| - Dir.chdir(dir){ sh "#{SUDO} rake install" } + Dir.chdir(dir){ sh "rake install" } end end desc "Uninstall the merb-more sub-gems" task :uninstall_gems do gems.each do |sub_gem| - sh %{#{SUDO} gem uninstall #{sub_gem}} + sh %{#{sudo} gem uninstall #{sub_gem}} end end @@ -111,9 +108,6 @@ task :bundle => [:package, :build_gems] do cp "pkg/merb-#{Merb::MORE_VERSION}.gem", "bundle" cp "pkg/merb-more-#{Merb::MORE_VERSION}.gem", "bundle" gems.each do |gem| - File.open("#{gem}/Rakefile") do |rakefile| - rakefile.read.detect {|l| l =~ /^VERSION\s*=\s*"(.*)"$/ } - sh %{cp #{gem}/pkg/#{gem}-#{$1}.gem bundle/} - end + sh %{cp #{gem}/pkg/#{gem}-#{Merb::MORE_VERSION}.gem bundle/} end end Rakefile @@ -1,17 +1,18 @@ require 'rubygems' require 'rake/gempackagetask' +require 'merb-core/tasks/merb_rake_helper' -PLUGIN = "merb-action-args" NAME = "merb-action-args" -VERSION = "0.9.2" +GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4" AUTHOR = "Yehuda Katz" EMAIL = "ykatz@engineyard.com" -HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-haml/" +HOMEPAGE = "http://merbivore.com/" SUMMARY = "Merb plugin that provides support for ActionArgs" spec = Gem::Specification.new do |s| + s.rubyforge_project = 'merb' s.name = NAME - s.version = VERSION + s.version = GEM_VERSION s.platform = Gem::Platform::RUBY s.has_rdoc = true s.extra_rdoc_files = ["README", "LICENSE", 'TODO'] @@ -20,10 +21,11 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-core', '>= 0.9.2') + s.add_dependency('merb-core', '>= 0.9.4') + s.add_dependency('ruby2ruby', '>= 1.1.9') + s.add_dependency('ParseTree', '>= 2.2') s.require_path = 'lib' - s.autorequire = PLUGIN - s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*") + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| @@ -31,14 +33,14 @@ Rake::GemPackageTask.new(spec) do |pkg| end task :install => [:package] do - sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources} + sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} end namespace :jruby do desc "Run :package and install the resulting .gem with jruby" task :install => :package do - sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri} + sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - + end merb-action-args/Rakefile @@ -1,7 +1,7 @@ class Merb::AbstractController class << self - attr_accessor :action_argument_list + attr_accessor :action_argument_list alias_method :old_inherited, :inherited # Stores the argument lists for all methods for this class. @@ -25,10 +25,11 @@ class Merb::AbstractController # ==== Raises # BadRequest:: The params hash doesn't have a required parameter. def _call_action(action) - args = self.class.action_argument_list[action].map do |arg, default| + arguments, defaults = self.class.action_argument_list[action] + args = arguments.map do |arg, default| arg = arg p = params.key?(arg.to_sym) - raise BadRequest unless p || default + raise BadRequest unless p || (defaults && defaults.include?(arg)) p ? params[arg.to_sym] : default end __send__(action, *args) merb-action-args/lib/merb-action-args/abstract_controller.rb @@ -1,10 +1,20 @@ +require 'parse_tree' require 'ruby2ruby' -class ParseTreeArray < Array #:nodoc: +class ParseTreeArray < Array def self.translate(*args) - self.new(ParseTree.translate(*args)) + sexp = ParseTree.translate(*args) + # ParseTree.translate returns [nil] if called on an inherited method, so walk + # up the inheritance chain to find the class that the method was defined in + unless sexp.first + klass = args.first.ancestors.detect do |klass| + klass.public_instance_methods(false).include?(args.last.to_s) + end + sexp = ParseTree.translate(klass, args.last) if klass + end + self.new(sexp) end - + def deep_array_node(type = nil) each do |node| return ParseTreeArray.new(node) if node.is_a?(Array) && (!type || node[0] == type) @@ -26,20 +36,19 @@ class ParseTreeArray < Array #:nodoc: # method defined with def keyword args = arg_node.arg_nodes default_node = arg_node.deep_array_node(:block) - return args unless default_node + return [args, []] unless default_node else # assuming method defined with Module#define_method - return [] + 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])) end - args + [args, (default_node[1..-1].map { |asgn| asgn[1] })] end end @@ -75,10 +84,10 @@ module GetArgs end end -class UnboundMethod #:nodoc: +class UnboundMethod include GetArgs end -class Method #:nodoc: +class Method include GetArgs end \ No newline at end of file merb-action-args/lib/merb-action-args/get_args.rb @@ -26,4 +26,12 @@ describe Merb::AbstractController do dispatch_to(ActionArgs, :dynamic_define_method).body.should == "mos def" end + it "should be able to inherit actions for use with Action Arguments" do + dispatch_to(ActionArgs, :funky_inherited_method, :foo => "bar", :bar => "baz").body.should == "bar baz" + end + + it "should be able to handle nil defaults" do + dispatch_to(ActionArgs, :with_default_nil, :foo => "bar").body.should == "bar " + end + end \ No newline at end of file merb-action-args/spec/action_args_spec.rb @@ -1,4 +1,16 @@ +module ExtraActions + def self.included(base) + base.show_action(:funky_inherited_method) + end + + def funky_inherited_method(foo, bar) + "#{foo} #{bar}" + end +end + + class ActionArgs < Merb::Controller + include ExtraActions def index(foo) foo @@ -20,4 +32,8 @@ class ActionArgs < Merb::Controller "mos def" end + def with_default_nil(foo, bar = nil) + "#{foo} #{bar}" + end + end \ No newline at end of file merb-action-args/spec/controllers/action-args.rb @@ -1,4 +1,250 @@ merb-assets =========== -A plugin for the Merb framework that provides ... \ No newline at end of file +Provides extra functionality related to assets: + + # Assets bundling. + # Assets hosts. + # Helpers to add asset links to views. + # Deployment-time assets processing (for instance, with YUI Compressor). + +Quick overview of the API +============================== + + # asset_path generates path for asset taking type and name. + # UniqueAssetPath class handles generation of paths using subdomains. + # AbstractAssetBundler is the base asset bundlers class. + + # auto_link generates conventional asset tags based on controller/action. + # link_to creates anchor tag (a tag). + # image_tag creates img tag. + + # escape_js escapes JavaScript. + # js method translates object into JSON. + + # require_js is smart(-er) way to do includes just once per page no matter + how many times partial use it. + # require_css is like require_js but for JavaScript. + + # js_include_tag is used when you need to include script tag with bundling. + # css_include_tag works like js_include_tag but for stylesheets. + # include_required_js generates script tags for previously included files. + # include_required_css generates link tags for previously included files. + + # uniq_js_path generates a script tag for path with asset subdomain. + # uniq_css_path generates a link tag for path with asset subdomain. + + +Examples +=========== + +auto_link to include asset tags using convention: + + We want all possible matches in the FileSys up to the action name + Given: controller_name = "namespace/controller" + action_name = "action" + If all files are present should generate link/script tags for: + namespace.(css|js) + namespace/controller.(css|js) + namespace/controller/action.(css|js) + +link_to and image_tag to make anchor and image tags: + + image_tag('foo.gif') + # => <img src='/images/foo.gif' /> + + image_tag('foo.gif', :class => 'bar') + # => <img src='/images/foo.gif' class='bar' /> + + image_tag('foo.gif', :path => '/files/') + # => <img src='/files/foo.gif' /> + + image_tag('http://test.com/foo.gif') + # => <img src="http://test.com/foo.gif"> + + image_tag('charts', :path => '/dynamic/') + or + image_tag('/dynamic/charts') + # => <img src="/dynamic/charts"> + + link_to("The Merb home page", "http://www.merbivore.com/") + # => <a href="http://www.merbivore.com/">The Merb home page</a> + + link_to("The Ruby home page", "http://www.ruby-lang.org", {'class' => 'special', 'target' => 'blank'}) + # => <a href="http://www.ruby-lang.org" class="special" target="blank">The Ruby home page</a> + + link_to p.title, "/blog/show/#{p.id}" + # => <a href="/blog/show/13">The Entry Title</a> + +uniq_css_tag and uniq_js_tag for paths with asset subdomains: + + uniq_css_tag("my") + #=> <link href="http://assets2.my-awesome-domain.com/stylesheets/my.css" type="text/css" /> + + uniq_js_tag("my") + #=> <script type="text/javascript" src="http://assets2.my-awesome-domain.com/javascripts/my.js"></script> + + uniq_js_path("my") + #=> "http://assets2.my-awesome-domain.com/javascripts/my.js" + + uniq_js_path(["admin/secrets","home/signup"]) + #=> ["http://assets2.my-awesome-domain.com/javascripts/admin/secrets.js", + "http://assets1.my-awesome-domain.com/javascripts/home/signup.js"] + +re_js and require_css, include_required_js and include_requried_css +quire assets in parts/partials just once: + + + In your application layout: + + js_include_tag :prototype, :lowpro, :bundle => :base + + In your controller layout: + + require_js :bundle => :posts + + The require_js method can be used to require any JavaScript file anywhere + in your templates. Regardless of how many times a single script is + included with require_js, Merb will only include it once in the header. + + # File: app/views/layouts/application.html.erb + + <html> + <head> + <%= include_required_js %> + <%= include_required_css %> + </head> + <body> + <%= catch_content :layout %> + </body> + </html> + + # File: app/views/whatever/_part1.herb + + <% require_js 'this' -%> + <% require_css 'that', 'another_one' -%> + + # File: app/views/whatever/_part2.herb + + <% require_js 'this', 'something_else' -%> + <% require_css 'that' -%> + + # File: app/views/whatever/index.herb + + <%= partial(:part1) %> + <%= partial(:part2) %> + + # Will generate the following in the final page... + <html> + <head> + <script src="/javascripts/this.js" type="text/javascript"></script> + <script src="/javascripts/something_else.js" type="text/javascript"></script> + <link href="/stylesheets/that.css" media="all" rel="Stylesheet" type="text/css"/> + <link href="/stylesheets/another_one.css" media="all" rel="Stylesheet" type="text/css"/> + </head> + . + . + . + </html> + + # my_action.herb has a call to require_css 'style' + # File: layout/application.html.erb + include_required_css + # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css"/> + + # my_action.herb has a call to require_css 'style', 'ie-specific' + # File: layout/application.html.erb + include_required_css + # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css"/> + # <link href="/stylesheets/ie-specific.css" media="all" rel="Stylesheet" type="text/css"/> + + # my_action.herb has a call to require_js 'jquery' + # File: layout/application.html.erb + include_required_js + # => <script src="/javascripts/jquery.js" type="text/javascript"></script> + + # my_action.herb has a call to require_js 'jquery', 'effects', 'validation' + # File: layout/application.html.erb + include_required_js + # => <script src="/javascripts/jquery.js" type="text/javascript"></script> + # <script src="/javascripts/effects.js" type="text/javascript"></script> + # <script src="/javascripts/validation.js" type="text/javascript"></script> + + <% require_css('style') %> + # A subsequent call to include_required_css will render... + # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css"/> + + <% require_css('style', 'ie-specific') %> + # A subsequent call to include_required_css will render... + # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css"/> + # <link href="/stylesheets/ie-specific.css" media="all" rel="Stylesheet" type="text/css"/> + + <% require_js 'jquery' %> + # A subsequent call to include_required_js will render... + # => <script src="/javascripts/jquery.js" type="text/javascript"></script> + + <% require_js 'jquery', 'effects' %> + # A subsequent call to include_required_js will render... + # => <script src="/javascripts/jquery.js" type="text/javascript"></script> + # <script src="/javascripts/effects.js" type="text/javascript"></script> + +css_include_tag and js_include_tag that do not use asset subdomains: + + css_include_tag 'style' + # => <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" 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" charset="utf-8" /> + + css_include_tag :style, :screen + # => <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" 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" /> + + js_include_tag 'jquery' + # => <script src="/javascripts/jquery.js" type="text/javascript"></script> + + js_include_tag 'moofx.js', 'upload' + # => <script src="/javascripts/moofx.js" type="text/javascript"></script> + # <script src="/javascripts/upload.js" type="text/javascript"></script> + + js_include_tag :effects + # => <script src="/javascripts/effects.js" type="text/javascript"></script> + + js_include_tag :jquery, :validation + # => <script src="/javascripts/jquery.js" type="text/javascript"></script> + # <script src="/javascripts/validation.js" type="text/javascript"></script> + +Utility methods examples +========================== + + uniq_css_path("my") + #=> "http://assets2.my-awesome-domain.com/stylesheets/my.css" + + uniq_css_path(["admin/secrets","home/signup"]) + #=> ["http://assets2.my-awesome-domain.com/stylesheets/admin/secrets.css", + "http://assets1.my-awesome-domain.com/stylesheets/home/signup.css"] + + uniq_path("/javascripts/my.js","/javascripts/my.css") + #=> ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets1.my-awesome-domain.com/javascripts/my.css"] + + uniq_path(["/javascripts/my.js","/stylesheets/my.css"]) + #=> ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets1.my-awesome-domain.com/stylesheets/my.css"] + + uniq_path(%w(/javascripts/my.js /stylesheets/my.css)) + #=> ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets1.my-awesome-domain.com/stylesheets/my.css"] + + uniq_path('/stylesheets/somearbitrary.css') + #=> "http://assets3.my-awesome-domain.com/stylesheets/somearbitrary.css" + + uniq_path('/images/hostsexypicture.jpg') + #=>"http://assets1.my-awesome-domain.com/images/hostsexypicture.jpg" \ No newline at end of file merb-assets/README @@ -1,17 +1,18 @@ require 'rubygems' require 'rake/gempackagetask' +require 'merb-core/tasks/merb_rake_helper' -PLUGIN = "merb-assets" NAME = "merb-assets" -VERSION = "0.9.2" +GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4" AUTHOR = "Ezra Zygmuntowicz" EMAIL = "ez@engineyard.com" -HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-assets/" +HOMEPAGE = "http://merbivore.com/" SUMMARY = "Merb plugin that provides the helpers for assets and asset bundling" spec = Gem::Specification.new do |s| + s.rubyforge_project = 'merb' s.name = NAME - s.version = VERSION + s.version = GEM_VERSION s.platform = Gem::Platform::RUBY s.has_rdoc = true s.extra_rdoc_files = ["README", "LICENSE", 'TODO'] @@ -20,10 +21,9 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-core', '>= 0.9.2') + s.add_dependency('merb-core', '>= 0.9.4') s.require_path = 'lib' - s.autorequire = PLUGIN - s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*") + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| @@ -31,14 +31,19 @@ Rake::GemPackageTask.new(spec) do |pkg| end task :install => [:package] do - sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources --no-update-sources} + sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} end namespace :jruby do desc "Run :package and install the resulting .gem with jruby" task :install => :package do - sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri} + sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - + +end + +desc "Run specs" +task :spec do + sh %{spec -r spec/spec_helper.rb spec/*_spec.rb} end merb-assets/Rakefile @@ -14,7 +14,6 @@ module Merb # Helpers for handling asset files. module AssetHelpers - # :nodoc: ASSET_FILE_EXTENSIONS = { :javascript => ".js", :stylesheet => ".css" @@ -42,10 +41,12 @@ module Merb # # => "public/javascripts/dingo.js" def asset_path(asset_type, filename, local_path = false) filename = filename.to_s - if filename !~ /#{'\\' + ASSET_FILE_EXTENSIONS[asset_type]}\Z/ - filename << ASSET_FILE_EXTENSIONS[asset_type] + if filename !~ /#{'\\' + ASSET_FILE_EXTENSIONS[asset_type]}\Z/ && filename.index('?').nil? + filename = "#{filename}#{ASSET_FILE_EXTENSIONS[asset_type]}" # don't modify receiver + end + if filename !~ %r{^(/|https?://)} + filename = "/#{asset_type}s/#{filename}" end - filename = "/#{asset_type}s/#{filename}" if local_path return "public#{filename}" else @@ -59,8 +60,6 @@ module Merb # for downloading static files (css, js, images...) class UniqueAssetPath class << self - @@config = Merb::Plugins.config[:asset_helpers] - # Builds the path to the file based on the name # # ==== Parameters @@ -74,9 +73,10 @@ module Merb # # => "https://assets5.my-awesome-domain.com/javascripts/my_fancy_script.js" # def build(filename) - #%{#{(USE_SSL ? 'https' : 'http')}://#{sprintf(@@config[:asset_domain],self.calculate_host_id(file))}.#{@@config[:domain]}/#{filename}} - path = @@config[:use_ssl] ? 'https://' : 'http://' - path << sprintf(@@config[:asset_domain],self.calculate_host_id(filename)) << ".#{@@config[:domain]}" + config = Merb::Plugins.config[:asset_helpers] + #%{#{(USE_SSL ? 'https' : 'http')}://#{sprintf(config[:asset_domain],self.calculate_host_id(file))}.#{config[:domain]}/#{filename}} + path = config[:use_ssl] ? 'https://' : 'http://' + path << sprintf(config[:asset_domain],self.calculate_host_id(filename)) << ".#{config[:domain]}" path << "/" if filename.index('/') != 0 path << filename end @@ -89,15 +89,48 @@ module Merb filename.each_byte {|byte| ascii_total += byte } - (ascii_total % @@config[:max_hosts] + 1) + (ascii_total % Merb::Plugins.config[:asset_helpers][:max_hosts] + 1) end end end # An abstract class for bundling text assets into single files. class AbstractAssetBundler + + class_inheritable_array :cached_bundles + self.cached_bundles ||= [] + class << self + # Mark a bundle as cached. + # + # ==== Parameters + # name<~to_s>:: Name of the bundle + # + def cache_bundle(name) + cached_bundles.push(name.to_s) + end + + # Purge a bundle from the cache. + # + # ==== Parameters + # name<~to_s>:: Name of the bundle + # + def purge_bundle(name) + cached_bundles.delete(name.to_s) + end + + # Test if a bundle has been cached. + # + # ==== Parameters + # name<~to_s>:: Name of the bundle + # + # ==== Returns + # Boolean:: Whether the bundle has been cached or not. + def cached_bundle?(name) + cached_bundles.include?(name.to_s) + end + # ==== Parameters # &block:: A block to add as a post-bundle callback. # @@ -145,10 +178,19 @@ module Merb # ==== Returns # Symbol:: Name of the bundle. def bundle! - # TODO: Move this file check out into an in-memory cache. Also, push it out to the helper level so we don't have to create the helper object. - unless File.exist?(@bundle_filename) + # TODO: push it out to the helper level so we don't have to create the helper object. + unless self.class.cached_bundle?(@bundle_name) + # skip regeneration of new bundled files - preventing multiple merb apps stepping on eachother + # file needs to be older than 60 seconds to be regenerated + if File.exist?(@bundle_filename) && File.mtime(@bundle_filename) >= Time.now - 60 + return @bundle_name # serve the old file for now - to be regenerated later + end bundle_files(@bundle_filename, *@files) - self.class.callbacks.each { |c| c.call(@bundle_filename) } + if File.exist?(@bundle_filename) + self.class.callbacks.each { |c| c.call(@bundle_filename) } + Merb.logger.info("Assets: bundled :#{@bundle_name} into #{File.basename(@bundle_filename)}") + self.class.cache_bundle(@bundle_name) + end end return @bundle_name end @@ -164,7 +206,9 @@ module Merb # *files<String>:: Filenames to be bundled. def bundle_files(filename, *files) File.open(filename, "w") do |f| + f.flock(File::LOCK_EX) files.each { |file| f.puts(File.read(file)) } + f.flock(File::LOCK_UN) end end merb-assets/lib/merb-assets/assets.rb @@ -7,11 +7,52 @@ module Merb # Merb provides views with convenience methods for links images and other # assets. + + # ==== Parameters + # none + # + # ==== Returns + # html<String> + # + # ==== Examples + # We want all possible matches in the FileSys up to the action name + # Given: controller_name = "namespace/controller" + # action_name = "action" + # If all files are present should generate link/script tags for: + # namespace.(css|js) + # namespace/controller.(css|js) + # namespace/controller/action.(css|js) + # + def auto_link + html = "" + prefix = "" + (controller_name / action_name).split("/").each do |path| + path = prefix + path + + css_path = path + ".css" + if File.exists? Merb.root / "public" / "stylesheets" / css_path + html << %{<link rel="stylesheet" type="text/css" href="/stylesheets/#{css_path}" /> } + end + + js_path = path + ".js" + if File.exists? Merb.root / "public" / "javascripts" / js_path + html << %{<script type="text/javascript" language="javascript" src="/javascripts/#{js_path}"></script>} + end + + #Update the prefix for the next iteration + prefix += path / "" + end + + #Return the generated HTML + html + end + + # ==== Parameters # name<~to_s>:: The text of the link. # url<~to_s>:: The URL to link to. Defaults to an empty string. # opts<Hash>:: Additional HTML options for the link. - # + # # ==== Examples # link_to("The Merb home page", "http://www.merbivore.com/") # # => <a href="http://www.merbivore.com/">The Merb home page</a> @@ -20,13 +61,13 @@ module Merb # # => <a href="http://www.ruby-lang.org" class="special" target="blank">The Ruby home page</a> # # link_to p.title, "/blog/show/#{p.id}" - # # => <a href="blog/show/13">The Entry Title</a> + # # => <a href="/blog/show/13">The Entry Title</a> # def link_to(name, url='', opts={}) opts[:href] ||= url %{<a #{ opts.to_xml_attributes }>#{name}</a>} end - + # ==== Parameters # img<~to_s>:: The image path. # opts<Hash>:: Additional options for the image tag (see below). @@ -36,31 +77,31 @@ module Merb # Sets the path prefix for the image. Defaults to "/images/" or whatever # is specified in Merb::Config. This is ignored if img is an absolute # path or full URL. - # + # # All other options set HTML attributes on the tag. # # ==== Examples - # image_tag('foo.gif') + # image_tag('foo.gif') # # => <img src='/images/foo.gif' /> - # - # image_tag('foo.gif', :class => 'bar') + # + # image_tag('foo.gif', :class => 'bar') # # => <img src='/images/foo.gif' class='bar' /> # - # image_tag('foo.gif', :path => '/files/') + # image_tag('foo.gif', :path => '/files/') # # => <img src='/files/foo.gif' /> # # image_tag('http://test.com/foo.gif') # # => <img src="http://test.com/foo.gif"> # # image_tag('charts', :path => '/dynamic/') - # or + # or # image_tag('/dynamic/charts') # # => <img src="/dynamic/charts"> def image_tag(img, opts={}) if img[0].chr == '/' opts[:src] = img else - opts[:path] ||= + opts[:path] ||= if img =~ %r{^https?://} '' else @@ -72,12 +113,12 @@ module Merb end opts[:src] ||= opts.delete(:path) + img end - %{<img #{ opts.to_xml_attributes } />} + %{<img #{ opts.to_xml_attributes } />} end # :section: JavaScript related functions # - + # ==== Parameters # javascript<String>:: Text to escape for use in JavaScript. # @@ -90,21 +131,7 @@ module Merb def escape_js(javascript) (javascript || '').gsub('\\','\0\0').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" } end - - # ==== Parameters - # name<~to_s>:: The text in the link. - # function<~to_s>:: The onClick event in JavaScript. - # - # ==== Examples - # link_to_function('Click me', "alert('hi!')") - # # => <a href="#" onclick="alert('hi!'); return false;">Click me</a> - # - # link_to_function('Add to cart', "item_total += 1; alert('Item added!');") - # # => <a href="#" onclick="item_total += 1; alert('Item added!'); return false;">Add to cart</a> - def link_to_function(name, function) - %{<a href="#" onclick="#{function}; return false;">#{name}</a>} - end - + # ==== Parameters # data<Object>:: # Object to translate into JSON. If the object does not respond to @@ -123,7 +150,7 @@ module Merb data.inspect.to_json end end - + # :section: External JavaScript and Stylesheets # # You can use require_js(:prototype) or require_css(:shinystyles) @@ -144,12 +171,12 @@ module Merb # <%= catch_content :layout %> # </body> # </html> - # + # # # File: app/views/whatever/_part1.herb # # <% require_js 'this' -%> # <% require_css 'that', 'another_one' -%> - # + # # # File: app/views/whatever/_part2.herb # # <% require_js 'this', 'something_else' -%> @@ -174,78 +201,78 @@ module Merb # </html> # # See each method's documentation for more information. - + # :section: Bundling Asset Files - # + # # The key to making a fast web application is to reduce both the amount of # data transfered and the number of client-server interactions. While having # many small, module Javascript or stylesheet files aids in the development # process, your web application will benefit from bundling those assets in # the production environment. - # + # # An asset bundle is a set of asset files which are combined into a single # file. This reduces the number of requests required to render a page, and # can reduce the amount of data transfer required if you're using gzip # encoding. - # + # # Asset bundling is always enabled in production mode, and can be optionally # enabled in all environments by setting the <tt>:bundle_assets</tt> value # in <tt>config/merb.yml</tt> to +true+. - # + # # ==== Examples - # + # # In the development environment, this: - # + # # js_include_tag :prototype, :lowpro, :bundle => true - # + # # will produce two <script> elements. In the production mode, however, the # two files will be concatenated in the order given into a single file, # <tt>all.js</tt>, in the <tt>public/javascripts</tt> directory. - # + # # To specify a different bundle name: - # + # # css_include_tag :typography, :whitespace, :bundle => :base # css_include_tag :header, :footer, :bundle => "content" # css_include_tag :lightbox, :images, :bundle => "lb.css" - # + # # (<tt>base.css</tt>, <tt>content.css</tt>, and <tt>lb.css</tt> will all be # created in the <tt>public/stylesheets</tt> directory.) - # + # # == Callbacks - # + # # To use a Javascript or CSS compressor, like JSMin or YUI Compressor: - # + # # Merb::Assets::JavascriptAssetBundler.add_callback do |filename| # system("/usr/local/bin/yui-compress #{filename}") # end - # + # # Merb::Assets::StylesheetAssetBundler.add_callback do |filename| # system("/usr/local/bin/css-min #{filename}") # end - # + # # These blocks will be run after a bundle is created. - # + # # == Bundling Required Assets - # + # # Combining the +require_css+ and +require_js+ helpers with bundling can be # problematic. You may want to separate out the common assets for your # application -- Javascript frameworks, common CSS, etc. -- and bundle those # in a "base" bundle. Then, for each section of your site, bundle the # required assets into a section-specific bundle. - # + # # <b>N.B.: If you bundle an inconsistent set of assets with the same name, # you will have inconsistent results. Be thorough and test often.</b> - # + # # ==== Example - # + # # In your application layout: - # + # # js_include_tag :prototype, :lowpro, :bundle => :base - # + # # In your controller layout: - # + # # require_js :bundle => :posts - + # The require_js method can be used to require any JavaScript file anywhere # in your templates. Regardless of how many times a single script is # included with require_js, Merb will only include it once in the header. @@ -265,9 +292,17 @@ module Merb # def require_js(*js) @required_js ||= [] - @required_js |= js + @required_js << js end + # All javascript files to include, without duplicates. + # + # ==== Parameters + # options<Hash>:: Default options to pass to js_include_tag. + def required_js(options = {}) + extract_required_files(@required_js, options) + end + # The require_css method can be used to require any CSS file anywhere in # your templates. Regardless of how many times a single stylesheet is # included with require_css, Merb will only include it once in the header. @@ -287,16 +322,28 @@ module Merb # def require_css(*css) @required_css ||= [] - @required_css |= css + @required_css << css end + # All css files to include, without duplicates. + # + # ==== Parameters + # options<Hash>:: Default options to pass to css_include_tag. + def required_css(options = {}) + extract_required_files(@required_css, options) + end + # A method used in the layout of an application to create +<script>+ tags # to include JavaScripts required in in templates and subtemplates using # require_js. - # + # # ==== Parameters # options<Hash>:: Options to pass to js_include_tag. - # + # + # ==== Options + # :bundle<~to_s>:: + # The name of the bundle the scripts should be combined into. + # # ==== Returns # String:: The JavaScript tag. # @@ -314,37 +361,41 @@ module Merb # # <script src="/javascripts/validation.js" type="text/javascript"></script> # def include_required_js(options = {}) - return '' if @required_js.nil? - js_include_tag(*(@required_js + [options])) + required_js(options).map { |req_js| js_include_tag(*req_js) }.join end - + # A method used in the layout of an application to create +<link>+ tags for # CSS stylesheets required in in templates and subtemplates using # require_css. - # + # # ==== Parameters # options<Hash>:: Options to pass to css_include_tag. - # + # # ==== Returns # String:: The CSS tag. - # + # + # ==== Options + # :bundle<~to_s>:: + # The name of the bundle the stylesheets should be combined into. + # :media<~to_s>:: + # The media attribute for the generated link element. Defaults to :all. + # # ==== Examples # # my_action.herb has a call to require_css 'style' # # File: layout/application.html.erb # include_required_css # # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css"/> # - # # my_action.herb has a call to require_js 'style', 'ie-specific' + # # my_action.herb has a call to require_css 'style', 'ie-specific' # # File: layout/application.html.erb # include_required_css # # => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css"/> # # <link href="/stylesheets/ie-specific.css" media="all" rel="Stylesheet" type="text/css"/> # def include_required_css(options = {}) - return '' if @required_css.nil? - css_include_tag(*(@required_css + [options])) + required_css(options).map { |req_js| css_include_tag(*req_js) }.join end - + # ==== Parameters # *scripts:: # The scripts to include. If the last element is a Hash, it will be used @@ -376,7 +427,7 @@ module Merb def js_include_tag(*scripts) options = scripts.last.is_a?(Hash) ? scripts.pop : {} return nil if scripts.empty? - + if (bundle_name = options[:bundle]) && Merb::Assets.bundle? && scripts.size > 1 bundler = Merb::Assets::JavascriptAssetBundler.new(bundle_name, *scripts) bundled_asset = bundler.bundle! @@ -395,7 +446,7 @@ module Merb return tags end - + # ==== Parameters # *stylesheets:: # The stylesheets to include. If the last element is a Hash, it will be @@ -425,7 +476,7 @@ module Merb # css_include_tag :style, :screen # # => <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" charset="utf-8" /> # @@ -434,7 +485,7 @@ module Merb def css_include_tag(*stylesheets) options = stylesheets.last.is_a?(Hash) ? stylesheets.pop : {} return nil if stylesheets.empty? - + if (bundle_name = options[:bundle]) && Merb::Assets.bundle? && stylesheets.size > 1 bundler = Merb::Assets::StylesheetAssetBundler.new(bundle_name, *stylesheets) bundled_asset = bundler.bundle! @@ -456,7 +507,7 @@ module Merb return tags end - + # ==== Parameters # *assets:: # The assets to include. These should be the full paths to any static served file @@ -466,7 +517,7 @@ module Merb # String:: if only a single path is requested # ==== Examples # uniq_path("/javascripts/my.js","/javascripts/my.css") - # #=> ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets2.my-awesome-domain.com/javascripts/my.css"] + # #=> ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets1.my-awesome-domain.com/javascripts/my.css"] # # uniq_path(["/javascripts/my.js","/stylesheets/my.css"]) # #=> ["http://assets2.my-awesome-domain.com/javascripts/my.js", "http://assets1.my-awesome-domain.com/stylesheets/my.css"] @@ -479,14 +530,14 @@ module Merb # # uniq_path('/images/hostsexypicture.jpg') # #=>"http://assets1.my-awesome-domain.com/images/hostsexypicture.jpg" - def uniq_path(*assets) + def uniq_path(*assets) paths = [] assets.collect.flatten.each do |filename| - paths.push(UniqueAssetPath.build(filename)) + paths.push(Merb::Assets::UniqueAssetPath.build(filename)) end paths.length > 1 ? paths : paths.first end - + # ==== Parameters # *assets:: # Creates unique paths for javascript files (prepends "/javascripts" and appends ".js") @@ -499,16 +550,16 @@ module Merb # #=> "http://assets2.my-awesome-domain.com/javascripts/my.js" # # uniq_js_path(["admin/secrets","home/signup"]) - # #=> ["http://assets2.my-awesome-domain.com/javascripts/admin/secrets.js", + # #=> ["http://assets2.my-awesome-domain.com/javascripts/admin/secrets.js", # "http://assets1.my-awesome-domain.com/javascripts/home/signup.js"] def uniq_js_path(*assets) paths = [] assets.collect.flatten.each do |filename| - paths.push(UniqueAssetPath.build(asset_path(:javascript,filename,true))) + paths.push(Merb::Assets::UniqueAssetPath.build(asset_path(:javascript,filename))) end paths.length > 1 ? paths : paths.first end - + # ==== Parameters # *assets:: # Creates unique paths for stylesheet files (prepends "/stylesheets" and appends ".css") @@ -521,16 +572,16 @@ module Merb # #=> "http://assets2.my-awesome-domain.com/stylesheets/my.css" # # uniq_css_path(["admin/secrets","home/signup"]) - # #=> ["http://assets2.my-awesome-domain.com/stylesheets/admin/secrets.css", + # #=> ["http://assets2.my-awesome-domain.com/stylesheets/admin/secrets.css", # "http://assets1.my-awesome-domain.com/stylesheets/home/signup.css"] def uniq_css_path(*assets) paths = [] assets.collect.flatten.each do |filename| - paths.push(UniqueAssetPath.build(asset_path(:stylesheet,filename,true))) + paths.push(Merb::Assets::UniqueAssetPath.build(asset_path(:stylesheet,filename))) end paths.length > 1 ? paths : paths.first end - + # ==== Parameters # *assets:: # As js_include_tag but has unique path @@ -542,9 +593,9 @@ module Merb # uniq_js_tag("my") # #=> <script type="text/javascript" src="http://assets2.my-awesome-domain.com/javascripts/my.js"></script> def uniq_js_tag(*assets) - js_include_tag(uniq_js_path(assets)) + js_include_tag(*uniq_js_path(assets)) end - + # ==== Parameters # *assets:: # As uniq_css_tag but has unique path @@ -556,7 +607,29 @@ module Merb # uniq_css_tag("my") # #=> <link href="http://assets2.my-awesome-domain.com/stylesheets/my.css" type="text/css" /> def uniq_css_tag(*assets) - css_include_tag(uniq_css_path(assets)) + css_include_tag(*uniq_css_path(assets)) end + + private + + # Helper method to filter out duplicate files. + # + # ==== Parameters + # options<Hash>:: Options to pass to include tag methods. + def extract_required_files(files, options = {}) + return [] if files.nil? || files.empty? + seen = [] + files.inject([]) do |extracted, req_js| + include_files, include_options = if req_js.last.is_a?(Hash) + [req_js[0..-2], options.merge(req_js.last)] + else + [req_js, options] + end + seen += (includes = include_files - seen) + extracted << (includes + [include_options]) unless includes.empty? + extracted + end + end + end end merb-assets/lib/merb-assets/assets_mixin.rb @@ -1,2 +1,13 @@ $TESTING=true -$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') \ No newline at end of file +$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') +require "rubygems" +require "merb-core" +require "merb-assets" +# require File.dirname(__FILE__) / "controllers" / "action-args" +require "spec" + +Merb.start :environment => 'test' + +Spec::Runner.configure do |config| + config.include Merb::Test::RequestHelper +end \ No newline at end of file merb-assets/spec/spec_helper.rb @@ -1,17 +1,18 @@ require 'rubygems' require 'rake/gempackagetask' +require 'merb-core/tasks/merb_rake_helper' -PLUGIN = "merb-builder" NAME = "merb-builder" -VERSION = "0.9.2" +GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4" AUTHOR = "Jonathan Younger" EMAIL = "jonathan@daikini.com" -HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-builder/" +HOMEPAGE = "http://merbivore.com/" SUMMARY = "Merb plugin that provides Builder support" spec = Gem::Specification.new do |s| + s.rubyforge_project = 'merb' s.name = NAME - s.version = VERSION + s.version = GEM_VERSION s.platform = Gem::Platform::RUBY s.has_rdoc = true s.extra_rdoc_files = ["README", "LICENSE", 'TODO'] @@ -20,10 +21,10 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-core', '>= 0.9.2') + s.add_dependency('merb-core', '>= 0.9.4') + s.add_dependency('builder', '>= 2.0.0') s.require_path = 'lib' - s.autorequire = PLUGIN - s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*") + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| @@ -31,14 +32,14 @@ Rake::GemPackageTask.new(spec) do |pkg| end task :install => [:package] do - sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources} + sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} end namespace :jruby do desc "Run :package and install the resulting .gem with jruby" task :install => :package do - sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri} + sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - + end merb-builder/Rakefile @@ -9,8 +9,8 @@ module Merb::Template # name<~to_s>:: The name of the template method. # mod<Class, Module>:: # The class or module wherein this method should be defined. - def self.compile_template(path, name, mod) - path = File.expand_path(path) + def self.compile_template(io, name, mod) + path = File.expand_path(io.path) method = mod.is_a?(Module) ? :module_eval : :instance_eval mod.send(method, %{ def #{name} @@ -20,7 +20,7 @@ module Merb::Template c end xml = ::Builder::XmlMarkup.new(config) - self.instance_eval %{#{File.read(path)}} + self.instance_eval %{#{io.read}} xml.target! end }) @@ -28,7 +28,36 @@ module Merb::Template name end - module Mixin; end + module Mixin + def _builder_buffer(the_binding) + @_buffer = eval("xml", the_binding, __FILE__, __LINE__) + end + # ==== Parameters + # *args:: Arguments to pass to the block. + # &block:: The template block to call. + # + # ==== Returns + # String:: The output of the block. + # + # ==== Examples + # Capture being used in a .html.erb page: + # + # @foo = capture do + # xml.instruct! + # xml.foo do + # xml.bar "baz" + # end + # xml.target! + # end + def capture_builder(*args, &block) + block.call(*args) + end + + def concat_builder(string, binding) + _builder_buffer(binding) << string + end + + end Merb::Template.register_extensions(self, %w[builder]) end end merb-builder/lib/merb-builder/template.rb @@ -33,4 +33,24 @@ describe "Builder" do end c.body.should == xml.target! end + + it "should capture_builder properly" do + c = dispatch_to(CaptureBuilder, :index, :format => "xml") + xml = ::Builder::XmlMarkup.new :indent => 4 + xml.instruct! + xml.comment! "I would not say such things if I were you" + xml.node 'Capture' + + c.body.should == xml.target! + end + + it "should concat_builder properly" do + c = dispatch_to(ConcatBuilder, :index, :format => "xml") + xml = ::Builder::XmlMarkup.new :indent => 4 + xml.instruct! + xml.node 'Concat' + + c.body.should == xml.target!.chomp + end + end merb-builder/spec/builder_spec.rb @@ -20,4 +20,13 @@ class PartialIvars < BuilderController end class CaptureBuilder < BuilderController +end + +module Merb::ConcatBuilderHelper + def concatter(&blk) + concat("<node>Concat</node>", blk.binding) + end +end + +class ConcatBuilder < BuilderController end \ No newline at end of file merb-builder/spec/controllers/builder.rb @@ -2,18 +2,19 @@ require 'rubygems' require "rake/rdoctask" require 'rake/gempackagetask' require "spec/rake/spectask" +require 'merb-core/tasks/merb_rake_helper' -PLUGIN = "merb-cache" NAME = "merb-cache" -MERB_CACHE_VERSION = Merb::MORE_VERSION rescue "0.9.2" +GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4" AUTHOR = "Alex Boussinet" EMAIL = "alex.boussinet@gmail.com" HOMEPAGE = "http://www.merbivore.com" SUMMARY = "Merb plugin that provides caching (page, action, fragment, object)" spec = Gem::Specification.new do |s| + s.rubyforge_project = 'merb' s.name = NAME - s.version = MERB_CACHE_VERSION + s.version = GEM_VERSION s.platform = Gem::Platform::RUBY s.has_rdoc = true s.extra_rdoc_files = ["README", "LICENSE", 'TODO'] @@ -22,10 +23,9 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-core', '>= 0.9.2') + s.add_dependency('merb-core', '>= 0.9.4') s.require_path = 'lib' - s.autorequire = PLUGIN - s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*") + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") # rdoc s.has_rdoc = true @@ -64,14 +64,14 @@ Rake::GemPackageTask.new(spec) do |pkg| end task :install => [:package] do - sh %{sudo gem install pkg/#{NAME}-#{MERB_CACHE_VERSION} --no-update-sources} + sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} end namespace :jruby do desc "Run :package and install the resulting .gem with jruby" task :install => :package do - sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri} + sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - + end merb-cache/Rakefile @@ -1,7 +1,7 @@ if defined?(Merb::Plugins) Merb::Plugins.add_rakefiles "merb-cache/merbtasks" unless 1.respond_to? :minutes - class Numeric #:nodoc: + class Numeric def minutes; self * 60; end def from_now(now = Time.now); now + self; end end merb-cache/lib/merb-cache.rb @@ -16,8 +16,8 @@ module Merb::Cache::ControllerClassMethods # ==== Examples # cache_action :mostly_static # cache_action :barely_dynamic, 10 - def cache_action(action, from_now = nil) - cache_actions([action, from_now]) + def cache_action(action, from_now = nil, opts = {}) + cache_actions([action, from_now, opts]) end # Register actions for action caching (before and after filters) @@ -28,11 +28,14 @@ module Merb::Cache::ControllerClassMethods # ==== Example # cache_actions :mostly_static, [:barely_dynamic, 10] def cache_actions(*actions) - if actions.any? && Merb::Cache.cached_actions.empty? - before(:cache_action_before) - after(:cache_action_after) - end - actions.each do |action, from_now| + actions.each do |action, from_now, opts| + from_now, opts = nil, from_now if Hash === from_now + + before("cache_#{action}_before", opts.merge(:only => action)) + after("cache_#{action}_after", opts.merge(:only => action)) + alias_method "cache_#{action}_before", :cache_action_before + alias_method "cache_#{action}_after", :cache_action_after + _actions = Merb::Cache.cached_actions[controller_name] ||= {} _actions[action] = from_now end merb-cache/lib/merb-cache/cache-action.rb @@ -29,11 +29,11 @@ module Merb::Cache::ControllerClassMethods # ==== Example # cache_pages :mostly_static, [:barely_dynamic, 10] def cache_pages(*pages) - if pages.any? && Merb::Cache.cached_pages.empty? + if pages.any? && !Merb::Cache.cached_pages.key?(controller_name) before(:cache_page_before) after(:cache_page_after) end - pages.each do |action, from_now| + pages.each do |action, from_now| _pages = Merb::Cache.cached_pages[controller_name] ||= {} _pages[action] = [from_now, 0] end @@ -44,6 +44,8 @@ end module Merb::Cache::ControllerInstanceMethods # Mixed in Merb::Controller. Provides methods related to page caching + DEFAULT_PAGE_EXTENSION = 'html' + # Checks whether a cache entry exists # # ==== Parameter @@ -54,9 +56,11 @@ module Merb::Cache::ControllerInstanceMethods # # ==== Example # cached_page?(:action => 'show', :params => [params[:page]]) + # cached_page?(:action => 'show', :extension => 'js') def cached_page?(options) key = Merb::Controller._cache.key_for(options, controller_name, true) - File.file?(Merb::Controller._cache.config[:cache_html_directory] / "#{key}.html") + extension = options[:extension] || DEFAULT_PAGE_EXTENSION + File.file?(Merb::Controller._cache.config[:cache_html_directory] / "#{key}.#{extension}") end # Expires the page identified by the key computed after the parameters @@ -64,16 +68,26 @@ module Merb::Cache::ControllerInstanceMethods # ==== Parameter # options<String,Hash>:: The options that will be passed to #expire_key_for # - # ==== Examples + # ==== Examples (See Merb::Cache#expire_key_for for more options) + # # will expire path/to/page/cache/news/show/1.html + # expire_page(:key => url(:news,News.find(1))) + # + # # will expire path/to/page/cache/news/show.html # expire_page(:action => 'show', :controller => 'news') + # + # # will expire path/to/page/cache/news/show* # expire_page(:action => 'show', :match => true) + # + # # will expire path/to/page/cache/news/show.js + # expire_page(:action => 'show', :extension => 'js') def expire_page(options) config_dir = Merb::Controller._cache.config[:cache_html_directory] Merb::Controller._cache.expire_key_for(options, controller_name, true) do |key, match| if match files = Dir.glob(config_dir / "#{key}*") else - files = config_dir / "#{key}.html" + extension = options[:extension] || DEFAULT_PAGE_EXTENSION + files = config_dir / "#{key}.#{extension}" end FileUtils.rm_rf(files) end @@ -106,14 +120,19 @@ module Merb::Cache::ControllerInstanceMethods # If request.path is "/", the name will be "/index.html" # If request.path is "/news/show/1", the name will be "/news/show/1.html" # If request.path is "/news/show/", the name will be "/news/show.html" + # If request.path is "/news/styles.css", the name will be "/news/styles.css" def _cache_page(data = nil) + return if Merb::Controller._cache.config[:disable_page_caching] controller = controller_name action = action_name.to_sym pages = Merb::Controller._cache.cached_pages[controller] return unless pages && pages.key?(action) path = request.path.chomp("/") path = "index" if path.empty? - cache_file = Merb::Controller._cache.config[:cache_html_directory] / "#{path}.html" + no_format = params[:format].nil? || params[:format].empty? + ext = "." + (no_format ? DEFAULT_PAGE_EXTENSION : params[:format]) + ext = nil if File.extname(path) == ext + cache_file = Merb::Controller._cache.config[:cache_html_directory] / "#{path}#{ext}" if data cache_directory = File.dirname(cache_file) FileUtils.mkdir_p(cache_directory) @@ -126,7 +145,7 @@ module Merb::Cache::ControllerInstanceMethods if File.file?(cache_file) _data = cache_read_page(cache_file) _expire_in, _expire_at = pages[action] - if _expire_in.nil? || Time.now < _expire_at + if _expire_in.nil? || Time.now.to_i < _expire_at.to_i Merb.logger.info("cache: hit (#{path})") throw(:halt, _data) end merb-cache/lib/merb-cache/cache-page.rb @@ -6,7 +6,7 @@ class Merb::Cache::DatabaseStore prepare end - class OrmNotFound < Exception #:nodoc: + class OrmNotFound < Exception # def initialize super("No valid ORM found (did you specify use_orm in init.rb?)") end merb-cache/lib/merb-cache/cache-store/database.rb @@ -1,3 +1,4 @@ +require 'fileutils' class Merb::Cache::FileStore # Provides the file cache store for merb-cache @@ -8,7 +9,7 @@ class Merb::Cache::FileStore prepare end - class NotAccessible < Exception #:nodoc: + class NotAccessible < Exception # def initialize(message) super("Cache directories are not readable/writeable (#{message})") end @@ -17,6 +18,7 @@ class Merb::Cache::FileStore # This method is there to ensure minimal requirements are met # (directories are accessible, table exists, connected to server, ...) def prepare + FileUtils.mkdir_p @config[:cache_directory] unless File.readable?(@config[:cache_directory]) && File.writable?(@config[:cache_directory]) raise NotAccessible, @config[:cache_directory] merb-cache/lib/merb-cache/cache-store/file.rb @@ -6,13 +6,13 @@ class Merb::Cache::MemcacheStore prepare end - class NotReady < Exception #:nodoc: + class NotReady < Exception def initialize super("Memcache server is not ready") end end - class NotDefined < Exception #:nodoc: + class NotDefined < Exception def initialize super("Memcache is not defined (require it in init.rb)") end merb-cache/lib/merb-cache/cache-store/memcache.rb @@ -5,7 +5,7 @@ require "merb-cache/cache-fragment" class Merb::Cache attr_reader :config, :store - class StoreNotFound < Exception #:nodoc: + class StoreNotFound < Exception def initialize(cache_store) super("cache_store (#{cache_store}) not found (not implemented?)") end @@ -40,6 +40,7 @@ class Merb::Cache def start @config = DEFAULT_CONFIG.merge(Merb::Plugins.config[:merb_cache] || {}) if @config[:disable] == true || Merb.environment == @config[:disable] + config[:disable_page_caching] = true config[:store] = "dummy" end @config[:cache_html_directory] ||= Merb.dir_for(:public) / "cache" @@ -145,13 +146,13 @@ class Merb::Cache end end -module Merb #:nodoc: - class Controller #:nodoc: +module Merb + class Controller cattr_reader :_cache @@_cache = Merb::Cache.new # extends Merb::Controller with new instance methods include Merb::Cache::ControllerInstanceMethods - class << self #:nodoc: + class << self # extends Merb::Controller with new class methods include Merb::Cache::ControllerClassMethods end merb-cache/lib/merb-cache/merb-cache.rb @@ -8,6 +8,12 @@ class CacheController < Merb::Controller cache_page :action5 cache_page :action6, 0.05 # or cache_pages :action5, [:action6, 0.05] + cache_page :action7 + + cache_action :action8, 0.05, :if => proc {|controller| !controller.params[:id].empty?} + cache_action :action9, 0.05, :unless => proc {|controller| controller.params[:id].empty?} + cache_action :action10, :if => :non_empty_id? + cache_action :action11, :unless => :empty_id? def action1 render @@ -33,6 +39,48 @@ class CacheController < Merb::Controller Time.now.to_s end + def action7 + provides :js, :css, :html, :xml, :jpg + case params[:format] + when "css" + "CSS" + when "js" + "JS" + when "html" + "HTML" + when "xml" + "XML" + when "jpg" + "JPG" + else + raise "BAD FORMAT: #{params[:format].inspect}" + end + end + + def action8 + "test action8" + end + + def action9 + "test action9" + end + + def action10 + "test action10" + end + + def action11 + "test action11" + end + + def empty_id? + params[:id].empty? + end + + def non_empty_id? + !empty_id? + end + def index "test index" end merb-cache/spec/controller.rb @@ -103,4 +103,35 @@ describe "merb-cache-action" do CACHE.cached_action?(:key => "/cache_controller/action4/id1/id2").should be_false end + it "should allow :if conditions with procs" do + c = get("/cache_controller/action8") + CACHE.cached_action?(:key => "/cache_controller/action8").should be_false + + c = get("/cache_controller/action8/cache") + CACHE.cached_action?(:key => "/cache_controller/action8/cache").should be_true + end + + it "should allow :unless conditions with procs" do + c = get("/cache_controller/action9") + CACHE.cached_action?(:key => "/cache_controller/action9").should be_false + + c = get("/cache_controller/action9/cache") + CACHE.cached_action?(:key => "/cache_controller/action9/cache").should be_true + end + + it "should allow :if conditions with symbols" do + c = get("/cache_controller/action10") + CACHE.cached_action?(:key => "/cache_controller/action10").should be_false + + c = get("/cache_controller/action10/cache") + CACHE.cached_action?(:key => "/cache_controller/action10/cache").should be_true + end + + it "should allow :unless conditions with symbols" do + c = get("/cache_controller/action11") + CACHE.cached_action?(:key => "/cache_controller/action11").should be_false + + c = get("/cache_controller/action11/cache") + CACHE.cached_action?(:key => "/cache_controller/action11/cache").should be_true + end end merb-cache/spec/merb-cache-action_spec.rb @@ -109,6 +109,38 @@ describe "merb-cache-page" do CACHE.cached_page?(:key => "/cache_controller/action6/id1/id2").should be_false end + it "should respect original content-type" do + c = get("/cache_controller/action7.css") + c.body.should == "CSS" + c = get("/cache_controller/action7.css") + c.params[:format].should == "css" + c.cached_page?(:action => "action7", :extension => 'css').should be_true + + c = get("/cache_controller/action7.js") + c.body.should == "JS" + c = get("/cache_controller/action7.js") + c.params[:format].should == "js" + c.cached_page?(:action => "action7", :extension => 'js').should be_true + + c = get("/cache_controller/action7.xml") + c.body.should == "XML" + c = get("/cache_controller/action7.xml") + c.params[:format].should == "xml" + c.cached_page?(:action => "action7", :extension => 'xml').should be_true + + c = get("/cache_controller/action7.jpg") + c.body.should == "JPG" + c = get("/cache_controller/action7.jpg") + c.params[:format].should == "jpg" + c.cached_page?(:action => "action7", :extension => 'jpg').should be_true + + c = get("/cache_controller/action7.html") + c.body.should == "HTML" + c = get("/cache_controller/action7.html") + c.params[:format].should == "html" + c.cached_page?(:action => "action7").should be_true + end + it "should expire all pages" do CACHE.expire_all_pages CACHE.cached_page?("action6").should be_false merb-cache/spec/merb-cache-page_spec.rb @@ -1,10 +1,21 @@ ==== merb-gen -merb-gen is a part of the Merb More package. It provides application and plugin generators for Merb. +merb-gen is a part of the Merb More package. It provides application, plugin, and component +generators for Merb. ==== Usage -To generate a new merb app, run merb-gen &lt;path&gt;. For instance, <tt>merb-gen foo</tt> would create -a new merb app inside of the foo directory. +To generate directory structure for a new merb app, run merb-gen app &lt;app-name&gt;. +For instance, <tt>merb-gen app foo</tt> would create a new foo merb app inside of the foo directory. -To generate a new merb plugin, run merb-gen plugin &lt;path&gt;. +Use <tt>--flat</tt> to generate a flattened application (very simple directory structure) +and <tt>--very-flat</tt> to generate a single file application. + +To generate a new merb plugin, run merb-gen plugin &lt;plugin_name&gt;. + +To see what generators are available, run merb-gen generators. + +==== Custom generators + +If you want to create your custom generators to use with Merb, and don't want to create a gem, +you should put them in ~/.rubigen/merb_generators/. \ No newline at end of file merb-gen/README @@ -1,15 +1,16 @@ require 'rubygems' require 'rake/gempackagetask' -GEM = "merb-gen" -VERSION = "0.9.2" -AUTHOR = "Yehuda Katz" -EMAIL = "wycats@gmail.com" +NAME = "merb-gen" +VERSION = "0.9.4" +AUTHOR = "Jonas Nicklas" +EMAIL = "jonas.nicklas@gmail.com" HOMEPAGE = "http://www.merbivore.com" SUMMARY = "Merb More: Merb's Application and Plugin Generators" spec = Gem::Specification.new do |s| - s.name = GEM + s.rubyforge_project = 'merb' + s.name = NAME s.version = VERSION s.platform = Gem::Platform::RUBY s.has_rdoc = true @@ -21,27 +22,28 @@ spec = Gem::Specification.new do |s| s.homepage = HOMEPAGE s.bindir = "bin" s.executables = %w( merb-gen ) - + # Uncomment this to add a dependency - s.add_dependency "merb-core", ">= 0.9.2" - s.add_dependency "rubigen", ">= 1.2.4" - + #s.add_dependency "merb-core", ">= 0.9.4" + #s.add_dependency "templater", ">= 0.1" + s.require_path = 'lib' - s.autorequire = GEM - s.files = %w(LICENSE README Rakefile TODO) + - Dir.glob("{lib,bin,spec,app_generators,merb_default_generators,merb_generators,rspec_generators,test_unit_generators}/**/*") + s.autorequire = NAME + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,bin,spec,templates}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec end +task :install => [:package] do + sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} +end + namespace :jruby do task :install do - sh %{sudo jruby -S gem install pkg/#{GEM}-#{VERSION} --no-update-sources} + sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end end -task :install => [:package] do - sh %{sudo gem install pkg/#{GEM}-#{VERSION} --no-update-sources} -end + merb-gen/Rakefile @@ -1,4 +1,13 @@ -TODO: -Fix LICENSE with your name -Fix Rakefile with your name and contact info -Add your code to lib/<%= name %>.rb \ No newline at end of file +Merb-gen is now ported to templater, instead of rubigen. Some things are left to do, including: + +* Integrate with Merb::Config[:framework], so that stuff gets placed in the correct directories +* Allow some system for plugins to add their own generators. +* Move ORM specific templates/code into respective plugin (this requires a change in templater so that absolute paths can be specified for templates) +* Move test_unit stuff into merb-test-unit +* Move part controller generator into merb-parts +* Automatically infer ORM and testing framework (this should be easy, really) +* Add migration generators +* Add generators for session migrations +* Change ActiveRecord migrations to use new datestamp format + +* Fix remaining stuff in templater (see separate TODO) \ No newline at end of file merb-gen/TODO @@ -1,103 +1,12 @@ #!/usr/bin/env ruby -at_exit { exit } +require 'rubygems' +require 'merb-core' +require 'merb-gen' -command = ARGV.shift if %w(generate destroy update).include?(ARGV[0]) - -%w(rubygems merb-core).each do |file| - require file -end +application = false # TODO: figure out a way to infer this # start merb Merb.start :environment => 'development', :log_level => 'error' -# remove dependency -module Kernel - undef dependency if defined?(Kernel.dependency) -end - -%w(rubigen rubigen/scripts/generate rubigen/scripts/destroy - rubigen/scripts/update fileutils find merb-gen).each do |file| - require file -end - -app_help = <<-EOF - Application Generators: - To generate an application use one of the following - merb-gen app app_name (for a standard application) - merb-gen app app_name --flat (for a flattened application) - merb-gen app app_name --very-flat (for a single file application) - merb-gen frozen-merb (script to run from frozen gems/framework) - merb-gen plugin plugin_name (creates a plugin gem skeleton) - - Other Generators: - merb-gen generators - with no args will display all availble generators for the current configuration. -EOF - -# merb-gen || merb-gen help || merb-gen help app || merb-gen app -if ARGV.empty? || (ARGV[0] == "help" && ARGV.length == 1) || - (ARGV[0] == "help" && ARGV[1] == "app") || (ARGV[0] == "app" && ARGV.length == 1) - puts app_help - -# merb-gen generators -elsif ARGV[0] == "generators" - # List all the Available Generators - RubiGen::Base.use_component_sources! Merb.generator_scope - RubiGen::Scripts::Generate.new.run([]) - -# merb-gen help foo -elsif ARGV[0] && ARGV[0] == "help" - begin - RubiGen::Base.use_component_sources! Merb.generator_scope - RubiGen::Base.lookup(ARGV[1]) - Merb::ComponentGenerator.run ARGV[1], ARGV[2..-1], ARGV[1], command || "generate" - rescue RubiGen::GeneratorError - # List all the Available Generators - RubiGen::Base.use_component_sources! Merb.generator_scope - RubiGen::Scripts::Generate.new.run([]) - rescue => e - puts e.message - end - -# merb-gen app myapp -elsif ARGV[0] && ARGV[0] == "app" && ARGV[1] && ARGV[1] !~ /^-/ - app_type = case ARGV[2] - when "--flat" - "merb_flat" - when "--very-flat" - "merb_very_flat" - else - "merb" - end - Merb::ApplicationGenerator.run ARGV[1], ARGV[3..-1], app_type, command || "generate" - -# merb-gen plugin foo -elsif ARGV[0] && ARGV[0] == "plugin" - Merb::ApplicationGenerator.run ARGV[1], ARGV[2..-1], "merb_plugin", command || "generate" - -# merb-gen frozen-merb -elsif ARGV[0] && ARGV[0] == "frozen-merb" - Merb::ComponentGenerator.run "frozen-merb", ["frozen-merb"], "freezer", command || "generate" - -# merb-gen controller foo -# merb-gen resource foo --test -elsif ARGV[1] && ARGV[1] !~ /^-/ - Merb::ComponentGenerator.run ARGV[1], ARGV[1..-1], ARGV.first, command || "generate" - -# catch all merb-gen -??? and display help instead of creating application in -??? -elsif ARGV[0] && ARGV[0] =~ /^-/ - puts app_help - -else - begin - # May be a generator that takes no arguments. - RubiGen::Base.use_component_sources! Merb.generator_scope - RubiGen::Base.lookup(ARGV[0]) - Merb::ComponentGenerator.run ARGV[0], ARGV[1..-1], ARGV.first, command || "generate" - rescue RubiGen::GeneratorError - puts app_help - rescue => e - puts e.message - end -end +Merb::Generators.run_cli(Dir.pwd, 'merb-gen', Merb::VERSION, ARGV) \ No newline at end of file merb-gen/bin/merb-gen @@ -1,38 +1,16 @@ -require 'rubigen' -module Merb - require File.join(File.dirname(__FILE__), "merb-gen", "base") - - class ApplicationGenerator - def self.run(path, argv, generator, command) - if command == "destroy" - puts "destroying app" - FileUtils.rm_rf(File.expand_path(path)) - puts "done" - exit - end - - source = RubiGen::PathSource.new(:application, - File.join(File.dirname(__FILE__), "..", "app_generators")) - RubiGen::Base.reset_sources - RubiGen::Base.append_sources source - puts RubiGen::Scripts.const_get(command.capitalize).inspect - RubiGen::Scripts.const_get(command.capitalize).new.run([File.expand_path(path), *argv], :generator => generator, :backtrace => true) - end - end - - class ComponentGenerator - def self.run(name, argv, generator, command) - app_root = Dir.pwd - - # Merb.start :environment => 'development' - - Gem.clear_paths - Gem.path.unshift(app_root / "gems") - - require "rubigen/scripts/#{command}" - - RubiGen::Base.use_component_sources! Merb.generator_scope - RubiGen::Scripts.const_get(command.capitalize).new.run(argv, :generator => generator, :destination => app_root) - end - end -end \ No newline at end of file +require 'rubygems' +require 'templater' +require 'sha1' + +path = File.join(File.dirname(__FILE__), "merb-gen") + +require path / "generator" +require path / "merb" +require path / "merb_flat" +require path / "merb_very_flat" +require path / "controller" +require path / "part_controller" +require path / "migration" +require path / "model" +require path / "resource_controller" +require path / "resource" \ No newline at end of file merb-gen/lib/merb-gen.rb @@ -1,17 +1,18 @@ require 'rubygems' require 'rake/gempackagetask' +require 'merb-core/tasks/merb_rake_helper' -PLUGIN = "merb-haml" NAME = "merb-haml" -VERSION = "0.9.2" +GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4" AUTHOR = "Yehuda Katz" EMAIL = "ykatz@engineyard.com" -HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-haml/" +HOMEPAGE = "http://merbivore.com/" SUMMARY = "Merb plugin that provides HAML support" spec = Gem::Specification.new do |s| + s.rubyforge_project = 'merb' s.name = NAME - s.version = VERSION + s.version = GEM_VERSION s.platform = Gem::Platform::RUBY s.has_rdoc = true s.extra_rdoc_files = ["README", "LICENSE", 'TODO'] @@ -20,10 +21,10 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-core', '>= 0.9.2') + s.add_dependency('merb-core', '>= 0.9.4') + s.add_dependency('haml', '>= 1.8.2') s.require_path = 'lib' - s.autorequire = PLUGIN - s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*") + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| @@ -31,14 +32,14 @@ Rake::GemPackageTask.new(spec) do |pkg| end task :install => [:package] do - sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources} + sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} end namespace :jruby do desc "Run :package and install the resulting .gem with jruby" task :install => :package do - sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri} + sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - + end merb-haml/Rakefile @@ -9,13 +9,13 @@ module Merb::Template # name<~to_s>:: The name of the template method. # mod<Class, Module>:: # The class or module wherein this method should be defined. - def self.compile_template(path, name, mod) - path = File.expand_path(path) - config = (Merb::Config[:haml] || {}).inject({}) do |c, (k, v)| + def self.compile_template(io, name, mod) + path = File.expand_path(io.path) + config = (Merb::Plugins.config[:haml] || {}).inject({}) do |c, (k, v)| c[k.to_sym] = v c end.merge :filename => path - template = ::Haml::Engine.new(File.read(path), config) + template = ::Haml::Engine.new(io.read, config) template.def_method(mod, name) name end merb-haml/lib/merb-haml/template.rb @@ -11,7 +11,7 @@ describe "HAML" do c.body.should == ::Haml::Engine.new("#foo\n %p Partial").render end - it "should use the haml configuration in Merb::Config" do + it "should use the haml configuration in Merb::Plugins.config" do c = dispatch_to(HamlConfig, :index) c.body.should == ::Haml::Engine.new("#foo\n %foo", :autoclose => ["foo"]).render end merb-haml/spec/haml_spec.rb @@ -1,18 +1,19 @@ require 'rubygems' require 'rake/gempackagetask' require "spec/rake/spectask" +require 'merb-core/tasks/merb_rake_helper' -PLUGIN = "merb-mailer" NAME = "merb-mailer" -VERSION = "0.9.2" +GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4" AUTHOR = "Yehuda Katz" EMAIL = "wycats@gmail.com" -HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-mailer/" +HOMEPAGE = "http://merbivore.com/" SUMMARY = "Merb plugin that provides mailer functionality to Merb" spec = Gem::Specification.new do |s| + s.rubyforge_project = 'merb' s.name = NAME - s.version = VERSION + s.version = GEM_VERSION s.platform = Gem::Platform::RUBY s.has_rdoc = true s.extra_rdoc_files = ["README", "LICENSE", 'TODO'] @@ -21,11 +22,10 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-core', '>= 0.9.2') + s.add_dependency('merb-core', '>= 0.9.4') s.add_dependency("mailfactory", ">= 1.2.3") s.require_path = 'lib' - s.autorequire = PLUGIN - s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*") + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| @@ -33,16 +33,16 @@ Rake::GemPackageTask.new(spec) do |pkg| end task :install => [:package] do - sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources} + sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} end namespace :jruby do desc "Run :package and install the resulting .gem with jruby" task :install => :package do - sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri} + sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - + end desc "Run all specs" merb-mailer/Rakefile @@ -1,3 +1,5 @@ require "merb-mailer/mailer" require "merb-mailer/mail_controller" -require "merb-mailer/merb_controller" +require "merb-mailer/mailer_mixin" + +Merb::Controller.send(:include, Merb::MailerMixin) merb-mailer/lib/merb-mailer.rb @@ -71,6 +71,13 @@ module Merb attr_accessor :params, :mailer, :mail attr_reader :session, :base_controller + cattr_accessor :_subclasses + self._subclasses = Set.new + + # ==== Returns + # Array[Class]:: Classes that inherit from Merb::MailController. + def self.subclasses_list() _subclasses end + # ==== Parameters # action<~to_s>:: The name of the action that will be rendered. # type<~to_s>:: @@ -84,6 +91,23 @@ module Merb def _template_location(action, type = nil, controller = controller_name) "#{controller}/#{action}.#{type}" end + + # The location to look for a template and mime-type. This is overridden + # from AbstractController, which defines a version of this that does not + # involve mime-types. + # + # ==== Parameters + # template<String>:: + # The absolute path to a template - without mime and template extension. + # The mime-type extension is optional - it will be appended from the + # current content type if it hasn't been added already. + # type<~to_s>:: + # The mime-type of the template that will be rendered. Defaults to nil. + # + # @public + def _absolute_template_location(template, type) + template.match(/\.#{type.to_s.escape_regexp}$/) ? template : "#{template}.#{type}" + end # ==== Parameters # params<Hash>:: Configuration parameters for the MailController. @@ -102,7 +126,7 @@ module Merb # The Merb::MailController inheriting from the base class. def self.inherited(klass) super - klass.class_eval %{self._template_root = Merb.dir_for(:mailer) / "views"} + klass._template_root = Merb.dir_for(:mailer) / "views" unless self._template_root end # Override filters halted to return nothing. @@ -222,6 +246,13 @@ module Merb @mail end + # Mimic the behavior of absolute_url in AbstractController + # but use @base_controller.request + def absolute_url(name, rparams={}) + req = @base_controller.request + uri = req.protocol + req.host + url(name, rparams) + end + # Attaches a file or multiple files to an email. You call this from a # method in your MailController (including a before filter). # @@ -325,4 +356,4 @@ module Merb end -end \ No newline at end of file +end merb-mailer/lib/merb-mailer/mail_controller.rb @@ -34,7 +34,7 @@ describe "a merb mailer" do delivery = TestMailer.deliveries.last delivery.to.should include("test@test.com") delivery.from.should include("foo@bar.com") - delivery.subject.should include("Test Subject") + delivery.subject.should include("=?utf-8?Q?Test_Subject=?=") delivery.body.should include("Test") end merb-mailer/spec/mailer_spec.rb @@ -1,18 +1,19 @@ require 'rubygems' require 'rake/gempackagetask' require "spec/rake/spectask" +require 'merb-core/tasks/merb_rake_helper' -PLUGIN = "merb-parts" NAME = "merb-parts" -VERSION = "0.9.2" +GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4" AUTHOR = "Hassox" EMAIL = "" -HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-parts/" +HOMEPAGE = "http://merbivore.com/" SUMMARY = "Merb More: Merb plugin that provides Part Controllers." spec = Gem::Specification.new do |s| + s.rubyforge_project = 'merb' s.name = NAME - s.version = VERSION + s.version = GEM_VERSION s.platform = Gem::Platform::RUBY s.has_rdoc = true s.extra_rdoc_files = ["README", "LICENSE", 'TODO'] @@ -21,27 +22,27 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-core', '>= 0.9.2') + s.add_dependency('merb-core', '>= 0.9.4') s.require_path = 'lib' - s.autorequire = PLUGIN - s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*") + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec end + task :install => [:package] do - sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources} + sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} end namespace :jruby do desc "Run :package and install the resulting .gem with jruby" task :install => :package do - sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri} + sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - + end desc "Run all specs" merb-parts/Rakefile @@ -1,44 +1,4 @@ -require File.join(File.dirname(__FILE__), 'merb-parts','part_controller') +require File.join(File.dirname(__FILE__), "merb-parts", "part_controller") +require File.join(File.dirname(__FILE__), "merb-parts", "mixins", "parts_mixin") -module Merb - class Controller - # Dispatches a PartController. - # ==== Parameters - # opts<Hash>:: A Hash of Options. (see below) - # - # ==== Options - # An option hash has two parts. - # 1. keys that are Merb::PartControllers with values that are action names (as symbols) - # 2. key value pairs that will become available in the PartController as params merged - # with the web controllers params - # - # ==== Example - # Calling a part controller - # {{{ - # part TodoPart => :list - # }}} - # - # Calling a part with additional options - # {{{ - # part TodoPart => :list, :limit => 20, :user => current_user - # }}} - # - # ==== Returns - # Returns the result of the PartControllers action, which is a string. - def part(opts = {}) - # Extract any params out that may have been specified - klasses, opts = opts.partition do |k,v| - k.respond_to?(:ancestors) && k.ancestors.include?(Merb::PartController) - end - - opts = Hash[*(opts.flatten)] - - res = klasses.inject([]) do |memo,(klass,action)| - memo << klass.new(self, opts)._dispatch(action) - end - res.size == 1 ? res[0] : res - end - - - end -end \ No newline at end of file +Merb::Controller.send(:include, Merb::PartsMixin) \ No newline at end of file merb-parts/lib/merb-parts.rb @@ -1,5 +1,5 @@ # Includes files into the class to allow it to minimally delegates to a web controller -module Merb #:nodoc: +module Merb module Mixins module WebController merb-parts/lib/merb-parts/mixins/web_controller.rb @@ -1,21 +1,21 @@ require File.join(File.dirname(__FILE__), "mixins", "web_controller") module Merb - + # A Merb::PartController is a light weight way to share logic and templates - # amongst controllers. - # Merb::PartControllers work just like Merb::controller. + # amongst controllers. + # Merb::PartControllers work just like Merb::controller. # There is a filter stack, layouts (if needed) all the render functions, - # and url generation. + # and url generation. # - # Cookies, params, and even the request object are shared with the web controller + # Cookies, params, and even the request object are shared with the web controller class PartController < AbstractController include Merb::Mixins::WebController - + attr_reader :params cattr_accessor :_subclasses self._subclasses = Set.new - + # ==== Returns # Array[Class]:: Classes that inherit from Merb::PartController. def self.subclasses_list() _subclasses end @@ -23,26 +23,43 @@ module Merb # ==== Parameters # action<~to_s>:: The name of the action that will be rendered. # type<~to_s>:: - # The mime-type of the template that will be rendered. Defaults to nil. + # The mime-type of the template that will be rendered. Defaults to html. # controller<~to_s>:: # The name of the controller that will be rendered. Defaults to # controller_name. # # ==== Returns # String:: The template location, i.e. ":controller/:action.:type". - def _template_location(action, type = nil, controller = controller_name) + def _template_location(action, type = :html, controller = controller_name) "#{controller}/#{action}.#{type}" end + + # The location to look for a template and mime-type. This is overridden + # from AbstractController, which defines a version of this that does not + # involve mime-types. + # + # ==== Parameters + # template<String>:: + # The absolute path to a template - without mime and template extension. + # The mime-type extension is optional - it will be appended from the + # current content type if it hasn't been added already. + # type<~to_s>:: + # The mime-type of the template that will be rendered. Defaults to nil. + # + # @public + def _absolute_template_location(template, type) + template.match(/\.#{type.to_s.escape_regexp}$/) ? template : "#{template}.#{type}" + end # Sets the template root to the default parts view directory. # # ==== Parameters # klass<Class>:: - # The Merb::PartController inheriting from the base class. + # The Merb::PartController inheriting from the base class. def self.inherited(klass) _subclasses << klass.to_s super - klass.class_eval %{self._template_root = Merb.dir_for(:part) / "views"} + klass._template_root = Merb.dir_for(:part) / "views" unless self._template_root end # ==== Parameters @@ -50,7 +67,7 @@ module Merb # opts<Hash>:: Additional options for this part. def initialize(web_controller, opts = {}) @web_controller = web_controller - @params = @web_controller.params + @params = @web_controller.params.dup @params.merge!(opts) unless opts.empty? super @content_type = @web_controller.content_type @@ -65,11 +82,13 @@ module Merb self.action_name = action super(action) @body - end - + end + # Send any methods that are missing back up to the web controller + # Patched to set partial locals on the web controller def method_missing(sym, *args, &blk) + @web_controller.instance_variable_set(:@_merb_partial_locals, @_merb_partial_locals) @web_controller.send(sym, *args, &blk) - end + end end -end \ No newline at end of file +end merb-parts/lib/merb-parts/part_controller.rb @@ -26,4 +26,8 @@ class Main < Merb::Controller render end + def parth_with_absolute_template + part(TodoPart => :parth_with_absolute_template) + end + end \ No newline at end of file merb-parts/spec/fixtures/controllers/main.rb @@ -23,4 +23,8 @@ class TodoPart < Merb::PartController render end + def parth_with_absolute_template + render :template => File.expand_path(self._template_root) / 'todo_part' / 'formatted_output' + end + end \ No newline at end of file merb-parts/spec/fixtures/parts/todo_part.rb @@ -29,7 +29,7 @@ describe "A Merb PartController" do it "should render the html format by default to the controller that set it" do controller = dispatch_to(Main, :index4) - controller.body.should match(/part_html_format/m) + controller.body.should match(/part_html_format/m) end it "should render the xml format according to the controller" do @@ -52,6 +52,10 @@ describe "A Merb PartController" do controller.body.should match( /Do this/) end + it "should render a template from an absolute path" do + controller = dispatch_to(Main, :parth_with_absolute_template) + controller.body.should match(/part_html_format/m) + end end @@ -68,4 +72,13 @@ describe "A Merb Part Controller with urls" do the_url.should == "/main/bar" end +end + +describe "A Merb Part Controller inheriting from another Part Controller" do + + it "should inherit the _template_root" do + TodoPart._template_root.should == File.expand_path(File.dirname(__FILE__) / 'fixtures' / 'parts' / 'views') + TodoPart._template_root.should == DonePart._template_root + end + end \ No newline at end of file merb-parts/spec/merb-parts_spec.rb merb-gen/app_generators/merb/USAGE merb-gen/app_generators/merb/merb_generator.rb merb-gen/app_generators/merb/templates/Rakefile merb-gen/app_generators/merb/templates/app/controllers/application.rb merb-gen/app_generators/merb/templates/app/controllers/exceptions.rb merb-gen/app_generators/merb/templates/app/helpers/global_helpers.rb merb-gen/app_generators/merb/templates/app/views/exceptions/internal_server_error.html.erb merb-gen/app_generators/merb/templates/app/views/exceptions/not_acceptable.html.erb merb-gen/app_generators/merb/templates/app/views/exceptions/not_found.html.erb merb-gen/app_generators/merb/templates/app/views/layout/application.html.erb merb-gen/app_generators/merb/templates/autotest/discover.rb merb-gen/app_generators/merb/templates/autotest/merb.rb merb-gen/app_generators/merb/templates/autotest/merb_rspec.rb merb-gen/app_generators/merb/templates/config/environments/development.rb merb-gen/app_generators/merb/templates/config/environments/production.rb merb-gen/app_generators/merb/templates/config/environments/rake.rb merb-gen/app_generators/merb/templates/config/environments/test.rb merb-gen/app_generators/merb/templates/config/init.rb merb-gen/app_generators/merb/templates/config/rack.rb merb-gen/app_generators/merb/templates/config/router.rb merb-gen/app_generators/merb/templates/public/.DS_Store merb-gen/app_generators/merb/templates/public/.htaccess merb-gen/app_generators/merb/templates/public/images/.DS_Store merb-gen/app_generators/merb/templates/public/images/merb.jpg merb-gen/app_generators/merb/templates/public/merb.fcgi merb-gen/app_generators/merb/templates/public/stylesheets/master.css merb-gen/app_generators/merb/templates/spec/spec.opts merb-gen/app_generators/merb/templates/spec/spec_helper.rb merb-gen/app_generators/merb/templates/test/test_helper.rb merb-gen/app_generators/merb_flat/merb_flat_generator.rb merb-gen/app_generators/merb_flat/templates/README.txt merb-gen/app_generators/merb_flat/templates/application.rb merb-gen/app_generators/merb_flat/templates/config/framework.rb merb-gen/app_generators/merb_flat/templates/config/init.rb merb-gen/app_generators/merb_flat/templates/views/foo.html.erb merb-gen/app_generators/merb_plugin/merb_plugin_generator.rb merb-gen/app_generators/merb_plugin/templates/LICENSE merb-gen/app_generators/merb_plugin/templates/README merb-gen/app_generators/merb_plugin/templates/Rakefile merb-gen/app_generators/merb_plugin/templates/TODO merb-gen/app_generators/merb_plugin/templates/lib/%base_name%.rb merb-gen/app_generators/merb_plugin/templates/lib/%base_name%/merbtasks.rb merb-gen/app_generators/merb_plugin/templates/spec/%base_name%_spec.rb merb-gen/app_generators/merb_plugin/templates/spec/spec_helper.rb merb-gen/app_generators/merb_plugin/templates/test/%base_name%_test.rb merb-gen/app_generators/merb_plugin/templates/test/test_helper.rb merb-gen/app_generators/merb_very_flat/merb_very_flat_generator.rb merb-gen/app_generators/merb_very_flat/templates/%app_file_name%.rb merb-gen/app_generators/merb_very_flat/templates/README.txt merb-gen/lib/merb-gen/base.rb merb-gen/lib/merb-gen/helpers.rb merb-gen/merb_default_generators/model/USAGE merb-gen/merb_default_generators/model/model_generator.rb merb-gen/merb_default_generators/model/templates/app/models/%model_file_name%.rb merb-gen/merb_default_generators/resource_controller/USAGE merb-gen/merb_default_generators/resource_controller/resource_controller_generator.rb merb-gen/merb_default_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb merb-gen/merb_default_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb merb-gen/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/delete.html.erb merb-gen/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb merb-gen/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb merb-gen/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb merb-gen/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb merb-gen/merb_generators/controller/USAGE merb-gen/merb_generators/controller/controller_generator.rb merb-gen/merb_generators/controller/templates/app/controllers/%controller_file_name%.rb merb-gen/merb_generators/controller/templates/app/helpers/%controller_file_name%_helper.rb merb-gen/merb_generators/controller/templates/app/views/%controller_file_name%/index.html.erb merb-gen/merb_generators/freezer/USAGE merb-gen/merb_generators/freezer/freezer_generator.rb merb-gen/merb_generators/freezer/templates/script/frozen-merb merb-gen/merb_generators/part_controller/USAGE merb-gen/merb_generators/part_controller/part_controller_generator.rb merb-gen/merb_generators/part_controller/templates/app/helpers/%controller_file_name%_part_helper.rb merb-gen/merb_generators/part_controller/templates/app/parts/%controller_file_name%_part.rb merb-gen/merb_generators/part_controller/templates/app/parts/views/%controller_file_name%_part/index.html.erb merb-gen/merb_generators/resource/USAGE merb-gen/merb_generators/resource/resource_generator.rb merb-gen/rspec_generators/merb_controller_test/merb_controller_test_generator.rb merb-gen/rspec_generators/merb_controller_test/templates/spec/controllers/%controller_full_file_path%_spec.rb merb-gen/rspec_generators/merb_controller_test/templates/spec/helpers/%controller_full_file_path%_helper_spec.rb merb-gen/rspec_generators/merb_model_test/merb_model_test_generator.rb merb-gen/rspec_generators/merb_model_test/templates/spec/models/%model_file_name%_spec.rb merb-gen/rspec_generators/merb_resource_controller_test/merb_resource_controller_test_generator.rb merb-gen/rspec_generators/merb_resource_controller_test/templates/spec/controllers/%controller_full_file_path%_spec.rb merb-gen/rspec_generators/merb_resource_controller_test/templates/spec/helpers/%controller_full_file_path%_helpers.rb merb-gen/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/delete.html.erb_spec.rb merb-gen/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/edit.html.erb_spec.rb merb-gen/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/index.html.erb_spec.rb merb-gen/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/new.html.erb_spec.rb merb-gen/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/show.html.erb_spec.rb merb-gen/test_unit_generators/merb_controller_test/merb_controller_test_generator.rb merb-gen/test_unit_generators/merb_controller_test/templates/test/functional/%controller_full_file_path%_test.rb merb-gen/test_unit_generators/merb_model_test/merb_model_test_generator.rb merb-gen/test_unit_generators/merb_model_test/templates/test/unit/%model_file_name%_test.rb merb-gen/test_unit_generators/merb_resource_controller_test/merb_resource_controller_test_generator.rb merb-mailer/lib/merb-mailer/merb_controller.rb merb-mailer/log/merb.4000.pid merb-mailer/log/merb_test.log merb-mailer/spec/mailers/.svn/all-wcprops merb-mailer/spec/mailers/.svn/entries merb-mailer/spec/mailers/.svn/format merb-mailer/spec/mailers/views/.svn/all-wcprops merb-mailer/spec/mailers/views/.svn/entries merb-mailer/spec/mailers/views/.svn/format merb-mailer/spec/mailers/views/layout/.svn/all-wcprops merb-mailer/spec/mailers/views/layout/.svn/entries merb-mailer/spec/mailers/views/layout/.svn/format merb-mailer/spec/mailers/views/layout/.svn/text-base/application.html.erb.svn-base merb-mailer/spec/mailers/views/layout/.svn/text-base/application.text.erb.svn-base merb-mailer/spec/mailers/views/test_mail_controller/.svn/all-wcprops merb-mailer/spec/mailers/views/test_mail_controller/.svn/entries merb-mailer/spec/mailers/views/test_mail_controller/.svn/format merb-mailer/spec/mailers/views/test_mail_controller/.svn/text-base/eighth.html.erb.svn-base merb-mailer/spec/mailers/views/test_mail_controller/.svn/text-base/eighth.text.erb.svn-base merb-mailer/spec/mailers/views/test_mail_controller/.svn/text-base/first.html.erb.svn-base merb-mailer/spec/mailers/views/test_mail_controller/.svn/text-base/first.text.erb.svn-base merb-mailer/spec/mailers/views/test_mail_controller/.svn/text-base/ninth.html.erb.svn-base merb-mailer/spec/mailers/views/test_mail_controller/.svn/text-base/ninth.text.erb.svn-base merb-mailer/spec/mailers/views/test_mail_controller/.svn/text-base/second.text.erb.svn-base merb-mailer/spec/mailers/views/test_mail_controller/.svn/text-base/third.html.erb.svn-base 6c4f1a0f2c67f80405065d2a01b66db5ccd58a6a ce8ba76ed02eb5382cd6d3bf386c6344d3fd7afd Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb/commit/c2a80cee938de2a879bf5ad81dabd3727f3ff7d2 c2a80cee938de2a879bf5ad81dabd3727f3ff7d2 2008-06-27T04:32:32-07:00 2008-06-27T04:32:32-07:00 Merge branch 'new_merb_gen' into testing Conflicts: .gitignore merb-cache/lib/merb-cache/cache-action.rb merb-freezer/README merb-freezer/Rakefile merb-freezer/bin/frozen-merb merb-freezer/lib/merb-freezer.rb merb-freezer/lib/merb-freezer/merbtasks.rb merb-freezer/spec/merb-freezer_spec.rb merb-freezer/spec/spec_helper.rb 7cdd7d32af4f16d97369c1365d5eb9ad59fe3cb0 Jonas Nicklas jonas.nicklas@gmail.com