merb 0.4.2 → 0.5.0

data/lib/merb/test/rspec_matchers/controller_matchers.rb

@@ -0,0 +1,117 @@
+module Merb
+  module Test
+    module ControllerMatchers
+      
+      class BeRedirect
+        def matches?(target)
+          @target = target
+          target == 302
+        end
+        def failure_message
+          "expected to redirect"
+        end
+        def negative_failure_message
+          "expected not to redirect"
+        end
+      end
+
+      class Redirect
+        def matches?(target)
+          @target = target
+          BeRedirect.new.matches?(target.status)
+        end
+        def failure_message
+          "expected #{@target.inspect} to redirect"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to redirect"
+        end
+      end
+
+      class RedirectTo
+        def initialize(expected)
+          @expected = expected
+        end
+
+        def matches?(target)
+          @target = target.headers['Location']
+          @redirected = BeRedirect.new.matches?(target.status)
+          @target == @expected
+        end
+
+        def failure_message
+          msg = "expected a redirect to <#{@expected}>, but "
+          if @redirected
+            msg << "found one to <#{@target}>" 
+          else
+            msg << "there was no redirect"
+          end
+        end
+
+        def negative_failure_message
+          "expected not to redirect to <#{@expected}>, but did anyway"
+        end
+      end
+
+      class BeSuccess
+  
+        def matches?(target)
+          @target = target.status
+          (200..299).include?(@target)
+        end
+  
+        def failure_message
+          "expected #{@target} to be successful but was #{@target.status}"
+        end
+  
+        def negative_failure_message
+          "expected #{@target} not to be successful but it was"
+        end
+      end
+      
+      class BeMissing
+        def matches?(target)
+          @target = target
+          (400..499).include?(@target.status)
+        end
+        
+        def failurs_message
+          "expected #{@target} to be missing but was #{@target.status}"
+        end
+        
+        def negative_failure_message
+          "expected #{@target} not to be missing but it was"
+        end
+      end
+          
+
+      def be_redirect
+        BeRedirect.new
+      end
+
+      def redirect
+        Redirect.new
+      end
+
+      def redirect_to(expected)
+        RedirectTo.new(expected)
+      end
+
+      def be_success
+        BeSuccess.new
+      end
+
+      def be_successful
+        BeSuccess.new
+      end
+
+      def respond_successfully
+        BeSuccess.new
+      end
+      
+      def be_missing
+        BeMissing.new
+      end
+    end
+  end
+end

data/lib/merb/test/rspec_matchers/markup_matchers.rb

@@ -0,0 +1,98 @@
+module Merb
+  module Test
+    module MarkupMatchers
+      class HaveSelector
+        def initialize(expected)
+          @expected = expected
+        end
+    
+        def matches?(stringlike)
+          @document = case stringlike
+          when Hpricot::Elem
+            stringlike
+          when StringIO
+            Hpricot.parse(stringlike.string)
+          else
+            Hpricot.parse(stringlike)
+          end
+          !@document.search(@expected).empty?
+        end
+    
+        def failure_message
+          "expected following text to match selector #{@expected}:\n#{@document}"
+        end
+
+        def negative_failure_message
+          "expected following text to not match selector #{@expected}:\n#{@document}"
+        end
+      end
+  
+      class MatchTag
+        def initialize(name, attrs)
+          @name, @attrs = name, attrs
+          @content = @attrs.delete(:content)
+        end
+
+        def matches?(target)
+          @errors = []
+          unless target.include?("<#{@name}")
+            @errors << "Expected a <#{@name}>, but was #{target}"
+          end
+          @attrs.each do |attr, val|
+            unless target.include?("#{attr}=\"#{val}\"")
+              @errors << "Expected #{attr}=\"#{val}\", but was #{target}"
+            end
+          end
+          if @content
+            unless target.include?(">#{@content}<")
+              @errors << "Expected #{target} to include #{@content}"
+            end
+          end
+          @errors.size == 0
+        end
+    
+        def failure_message
+          @errors[0]
+        end
+    
+        def negative_failure_message
+          "Expected not to match against <#{@name} #{@attrs.map{ |a,v| "#{a}=\"#{v}\"" }.join(" ")}> tag, but it matched"
+        end
+      end
+  
+      class NotMatchTag
+        def initialize(attrs)
+          @attrs = attrs
+        end
+    
+        def matches?(target)
+          @errors = []
+          @attrs.each do |attr, val|
+            if target.include?("#{attr}=\"#{val}\"")
+              @errors << "Should not include #{attr}=\"#{val}\", but was #{target}"
+            end
+          end
+          @errors.size == 0
+        end
+    
+        def failure_message
+          @errors[0]
+        end
+      end
+  
+      def match_tag(name, attrs={})
+        MatchTag.new(name, attrs)
+      end
+      def not_match_tag(attrs)
+        NotMatchTag.new(attrs)
+      end
+  
+      def have_selector(expected)
+        HaveSelector.new(expected)
+      end
+      alias_method :match_selector, :have_selector
+      
+      
+    end
+  end
+end

data/lib/merb/upload_handler.rb

@@ -56,7 +56,8 @@ class MerbUploadHandler < Mongrel::HttpHandler
   def request_aborted(params)
     return unless upload_id = valid_upload?(params)
     Mongrel::Uploads.finish(upload_id)
-    puts "request aborted!"
+    Merb.logger.info "#{self.class.name} - request aborted for " <<
+      "id: #{upload_id.inspect}, params: #{params.inspect}"
   end
 
   private

data/lib/merb/version.rb

@@ -1,5 +1,38 @@
 module Merb
-  VERSION='0.4.2' unless defined?(::Merb::VERSION)
+  VERSION = '0.5.0' unless defined?(::Merb::VERSION)
+  
+  class << self
+    def svn_revision
+      rev = if File.directory?('.git')
+        `git log -1`[/git-svn-id.+@(\d+)/, 1]
+      elsif File.directory?('.svn')
+        `svn info`[/Revision: (\d+)/, 1]
+      end
+      rev = rev.to_i if rev
+    end
+    
+    def svn_revision_filename
+      'SVN_REVISION'
+    end
+    
+    def svn_revision_from_file
+      begin
+        File.open svn_revision_file_path, 'w' do |f|
+          f.print svn_revision
+        end
+      # catch permissions error when packaged as gem
+      rescue Errno::EACCES
+      end
+      
+      unless (rev = File.read(svn_revision_file_path).strip).empty?
+        rev.to_i
+      end
+    end
+    
+    def svn_revision_file_path
+      File.expand_path File.join(File.dirname(__FILE__), '..', '..', svn_revision_filename)
+    end
+  end
   
   # Merb::RELEASE meanings:
   # 'svn'   : unreleased
@@ -7,5 +40,7 @@ module Merb
   #  nil    : released
   # You should never check in to trunk with this changed.  It should
   # stay 'svn'.  Change it to nil in release tags.
-  RELEASE='svn' unless defined?(::Merb::RELEASE)
-end
+  unless defined?(::Merb::RELEASE)
+    RELEASE = "svn#{" r#{svn_revision_from_file}" if svn_revision_from_file}"
+  end
+end

data/lib/merb/view_context.rb

@@ -33,7 +33,6 @@ module Merb
   # the context object passed to Erubis when evaluating the templates.
   class ViewContext
     include Merb::ViewContextMixin
-    include Merb::FormControls
     include Merb::WebControllerMixin
     
     def initialize(controller)
@@ -45,7 +44,7 @@ module Merb
       begin
         self.class.class_eval(" include Merb::GlobalHelper; include Merb::#{@web_controller.class.name}Helper") 
       rescue NameError
-        MERB_LOGGER.debug("Missing Helper: Merb::#{@web_controller.class.name}Helper")
+        Merb.logger. debug("Missing Helper: Merb::#{@web_controller.class.name}Helper")
       end  
     end
     

data/lib/tasks/merb.rake

@@ -1,5 +1,5 @@
 def install_merb_script
-  script_filepath = MERB_ROOT / 'script/merb'
+  script_filepath = Merb.root / 'script/merb'
   FileUtils.rm script_filepath if File.exist? script_filepath
   tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n"
   File.open(script_filepath, 'wb') {|f|
@@ -11,8 +11,8 @@ end
 namespace :merb do
   desc "freeze the merb framework into merb for portability"
   task :freeze do
-    FileUtils.rm_rf MERB_ROOT / 'framework'
-    FileUtils.cp_r MERB_FRAMEWORK_ROOT, (MERB_ROOT / 'framework')
+    FileUtils.rm_rf Merb.root / 'framework'
+    FileUtils.cp_r Merb::framework_root, (Merb.root / 'framework')
     install_merb_script
     
     puts "  Freezing Merb Framework into framework"
@@ -20,17 +20,17 @@ namespace :merb do
   end
   desc "unfreeze this app from the framework and use system gem."
   task :unfreeze do
-    FileUtils.rm_rf MERB_ROOT / 'framework'
-    FileUtils.rm MERB_ROOT / 'script/merb'
+    FileUtils.rm_rf Merb.root / 'framework'
+    FileUtils.rm Merb.root / 'script/merb'
     
     puts "  Removed: "
-    puts "   - #{MERB_ROOT / 'framework'} (recursive) "
-    puts "   - #{MERB_ROOT / 'script/merb'}"
+    puts "   - #{Merb.root / 'framework'} (recursive) "
+    puts "   - #{Merb.root / 'script/merb'}"
   end
   
   desc "freeze the merb framework from svn, use REVISION=# to freeze a specific revision"
   task :freeze_from_svn do
-    install_path = MERB_ROOT / 'framework'
+    install_path = Merb.root / 'framework'
     revision = ENV['REVISION'] || 'HEAD'
     puts "  Removing old framework" if File.exist? install_path
     FileUtils.rm_rf install_path
@@ -48,7 +48,7 @@ desc "Setup the Merb Environment by requiring merb and loading your merb_init.rb
 task :merb_env do 
   require 'rubygems' 
   require 'merb' 
-  Merb::Server.config[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
-  MERB_ENV  = Merb::Server.config[:environment].nil? ? 'development' : Merb::Server.config[:environment] 
-  load MERB_ROOT+'/config/merb_init.rb' 
+  Merb::Config[:environment] = ENV['Merb.environment'] if ENV['Merb.environment'] 
+  Merb.environment  = Merb::Config[:environment].nil? ? 'development' : Merb::Config[:environment] 
+  load Merb.root+'/config/merb_init.rb' 
 end

data/merb_generators/part_controller/USAGE

@@ -0,0 +1,5 @@
+Description:
+  Generates a PartController
+  
+Usage:
+  script/generate part_controller name

data/merb_generators/part_controller/part_controller_generator.rb

@@ -0,0 +1,27 @@
+require 'merb/generators/merb_generator_helpers'
+
+class PartControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
+
+  def initialize(*args)
+    runtime_options = args.last.is_a?(Hash) ? args.pop : {}
+    name, *actions = args.flatten
+    name += "_part"
+    
+    runtime_options[:actions]           = actions.empty? ? %w[index] : actions
+    runtime_options[:base_dest_folder]  = "app/parts"
+    super( [name], runtime_options  )
+  end
+
+  def self.superclass
+    RubiGen::Base
+  end
+    
+  protected
+    def banner
+      <<-EOS
+Creates a Merb part_controller
+
+USAGE: #{$0} #{spec.name} name"
+EOS
+    end
+end

data/merb_generators/part_controller/templates/controller.rb

@@ -0,0 +1,8 @@
+class <%= class_name %>Part < Merb::PartController
+<% actions.each do |action| -%>
+  
+  def <%= action %>
+    render
+  end
+<% end -%>
+end

data/merb_generators/part_controller/templates/helper.rb

@@ -0,0 +1,5 @@
+module Merb
+module <%= class_name %>PartHelper
+  
+  end
+end

data/merb_generators/part_controller/templates/index.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %>Part controller, index action</h1>
+
+<p>Edit this file in <tt>app/parts/views/<%= file_name %>/index.html.erb</tt></p>

data/rspec_generators/merb_controller_test/merb_controller_test_generator.rb

@@ -27,7 +27,7 @@ class MerbControllerTestGenerator < RubiGen::Base
       # Setup the view stubs for each view
       @template_actions.each do |the_action|  
         template_name = "#{the_action}.html.#{@engine}"
-        if File.exists?(File.join(MERB_ROOT, "app", "views", file_name, template_name))
+        if File.exists?(File.join(Merb.root, "app", "views", file_name, template_name))
           m.template "#{the_action}_spec.rb", "spec/views/#{file_name}/#{the_action}_html_spec.rb"
         end
       end

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.join(File.dirname(__FILE__), '..')
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :rspec]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.join(File.dirname(__FILE__), '..')
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :rspec]
+RubiGen::Scripts::Generate.new.run(ARGV)

data/spec/fixtures/controllers/dispatch_spec_controllers.rb

@@ -32,6 +32,14 @@ class Bar < Merb::Controller
     "#{a} #{b} #{c}"
   end
   
+  def bat(a, b = false)
+    "#{a} #{b}"
+  end
+  
+  def bam(a, b = nil)
+    "#{a} #{b.inspect}"
+  end
+  
 end
 
 class Baz < Merb::Controller
@@ -224,4 +232,4 @@ class Profile < Merb::Controller
 end
 
 # If this throws an error, it's because parameterized args are somehow borked
-Merb::Server.load_application
+Merb::BootLoader.load_application