merb 0.5.2 → 0.5.3

data/lib/merb/mixins/controller.rb

@@ -140,7 +140,7 @@ module Merb
     # If you need to set a cookie, then use the +cookies+ hash.
     #
     def set_cookie(name, value, expires)
-      (headers['Set-Cookie'] ||='') << (Merb::Const::SET_COOKIE % [
+      (headers['Set-Cookie'] ||=[]) << (Merb::Const::SET_COOKIE % [
         name.to_s, 
         escape(value.to_s), 
         # Cookie expiration time must be GMT. See RFC 2109

data/lib/merb/mixins/render.rb

@@ -117,9 +117,22 @@ module Merb
     #     end
     #   end
     #   
-    #  This will first check to see if a index.xml.* template extists, if not
-    #  it will call @people.to_xml (as defined in the add_mime_type method) on the passed
-    #  in object if such a method exists for the current content_type  
+    # This will first check to see if a index.xml.* template extists, if not
+    # it will call @people.to_xml (as defined in the add_mime_type method) on the passed
+    # in object if such a method exists for the current content_type  
+    #
+    # Conversely, there may be situations where you prefer to be more literal
+    # such as when you desire to render a Hash, for those occasions, the
+    # the following syntax exists:
+    #   
+    #   class People < Application
+    #     provides :xml
+    #
+    #     def index
+    #       @people = User.all
+    #       render :obj => @people
+    #     end
+    #   end
     # 
     # When using multiple calls to render in one action, the context of the render is cached for performance reasons
     # That is, all instance variables are loaded into the view_context object only on the first call and then this is re-used.
@@ -139,7 +152,7 @@ module Merb
       choose_template_format(Merb.available_mime_types, opts)
       
       # Handles the case where render is called with an object
-      if obj = args.first
+      if obj = args.first || opts[:obj]
         # Check for a template
         unless find_template({:action => action}.merge(opts))
           fmt = content_type

data/lib/merb/server.rb

@@ -32,14 +32,22 @@ module Merb
         ::Merb::Config.parse_args
                 
         if Merb::Config[:cluster]
-          delete_pidfiles
           Merb::Config[:port].to_i.upto(Merb::Config[:port].to_i+Merb::Config[:cluster].to_i-1) do |port|
-            puts "Starting merb server on port: #{port}"
-            start(port)
+            unless alive?(port)
+              delete_pidfiles(port)
+              puts "Starting merb server on port: #{port}"
+              start(port)
+            else
+              raise "Merb is already running on port: #{port}"
+            end
           end   
         elsif Merb::Config[:daemonize]
-          delete_pidfiles(Merb::Config[:port])
-          start(Merb::Config[:port])
+          unless alive?(Merb::Config[:port])  
+            delete_pidfiles(Merb::Config[:port])
+            start(Merb::Config[:port])
+          else
+            raise "Merb is already running on port: #{port}"
+          end
         else
           trap('TERM') { exit }
           mongrel_start(Merb::Config[:port])
@@ -49,7 +57,16 @@ module Merb
       
       def store_pid(pid,port)
         File.open("#{Merb::Config[:merb_root]}/log/merb.#{port}.pid", 'w'){|f| f.write("#{Process.pid}\n")}
-      end  
+      end
+      
+      def alive?(port)
+        f = Merb::Config[:merb_root] + "/log/merb.#{port}.pid"
+        pid = IO.read(f).chomp.to_i
+        Process.kill(0, pid)
+        true
+      rescue
+        false
+      end
       
       def kill(ports, sig=9)
         begin

data/lib/merb/test/helper.rb

@@ -40,9 +40,10 @@ module Merb
       def request(verb, path, opts = {}, &block)
         response = StringIO.new
         
-        request = opts.delete(:fake_request) || Merb::Test::FakeRequest.with(path, opts.merge(:request_method => (verb.to_s.upcase rescue 'GET')))
         yield_to_controller = opts.delete(:yields)
         
+        request = opts.delete(:fake_request) || Merb::Test::FakeRequest.with(path_with_options(path, opts), :request_method => (verb.to_s.upcase rescue 'GET'))
+
         if yield_to_controller == :controller
           request_yielding_controller(request, response, &block)
         else
@@ -215,7 +216,10 @@ module Merb
         @controller = klass.build(request, response, status)
         
         @controller.send(:setup_session)
-        @controller.stub!(:setup_session).and_return(true)
+         # This will be a mock framework agnostic way of ensuring setup_session is not done again
+        class << @controller
+          def setup_session; true; end
+        end
         
         yield @controller if block_given?
 

data/lib/merb/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  VERSION = '0.5.2' unless defined?(::Merb::VERSION)
+  VERSION = '0.5.3' unless defined?(::Merb::VERSION)
   
   class << self
     def svn_revision
@@ -22,6 +22,8 @@ module Merb
         end
       # catch permissions error when packaged as gem
       rescue Errno::EACCES
+      # ... or packaged as gem, mounted on a Read-Only filesystem
+      rescue Errno::EROFS
       end
       
       unless (rev = File.read(svn_revision_file_path).strip).empty?
@@ -40,7 +42,8 @@ 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.
-  unless defined?(::Merb::RELEASE)
-    RELEASE = nil #"svn#{" r#{svn_revision_from_file}" if svn_revision_from_file}"
-  end
+  RELEASE=nil
+  # unless defined?(::Merb::RELEASE)
+  #   RELEASE = "svn#{" r#{svn_revision_from_file}" if svn_revision_from_file}"
+  # end
 end

data/lib/tasks/merb.rake

@@ -1,7 +1,7 @@
 def install_merb_script
   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__)+'/../config/merb/boot')\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n"
+  tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../config/boot')\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n"
   File.open(script_filepath, 'wb') {|f|
     f.write tmpl 
     f.chmod(0744)

data/spec/fixtures/controllers/render_spec_controllers.rb

@@ -62,6 +62,16 @@ class RenderObjectController < Merb::Controller
     
 end
 
+class RenderHashObjectController < Merb::Controller
+  
+  def render_object
+    provides :xml,:json
+    @foo = {:foo => 'bar', :baz => 'quuz'}
+    render :obj => @foo
+  end
+    
+end
+
 class RenderObjectWithArgumentsController < Merb::Controller
   
   provides :xml, :foo => 'bar'

data/spec/merb/controller_filters_spec.rb

@@ -158,7 +158,7 @@ describe "Dispatch and before/after filters" do
   
   it "should be able to see instance variables" do
     call_filter_action "one"
-    @c.cookies.should be_is_a(Hash) 
+    @c.cookies.should be_is_a(Merb::Cookies) 
     @c.session.data.should == {}
     @c.response.read.should == ""
     @c.instance_variable_get("@filter1").should eql( 'called')

data/spec/merb/cookie_store_spec.rb

@@ -24,7 +24,7 @@ describe Merb::SessionMixin do
   it "should set the cookie if the cookie is changed" do
     c = new_controller( 'change', TestCookieSessionController)
     c.dispatch(:change)
-    c.headers['Set-Cookie'].should =~ %r{_session_id=} # this could be better
+    c.headers['Set-Cookie'].each {|c| c.should =~ %r{_session_id=} }# this could be better
   end
 end
 

data/spec/merb/cookies_spec.rb

@@ -0,0 +1,96 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module CookiesSpecModule
+  def cookie_time(time)
+    time.gmtime.strftime(Merb::Const::COOKIE_EXPIRATION_FORMAT)
+  end
+end
+
+describe Merb::Cookies do
+  include CookiesSpecModule
+
+  before do
+    @_cookies = Mash.new
+    @_headers = {}
+    @cookies = Merb::Cookies.new(@_cookies, @_headers)
+  end
+
+  it "should respond to []" do
+    @cookies.should respond_to(:[])
+  end
+
+  it "should respond to []=" do
+    @cookies.should respond_to(:[]=)
+  end
+
+  it "should respond to delete" do
+    @cookies.should respond_to(:delete)
+  end
+
+  it "should accept simple cookies that expire at end of session" do
+    @cookies[:foo] = 'bar'
+
+    @_headers['Set-Cookie'].should == ['foo=bar; path=/;']
+
+    @cookies[:foo].should == 'bar'
+    @cookies['foo'].should == 'bar'
+  end
+
+  it "should accept cookies with expiry dates" do
+    expires = Time.now + 2.weeks
+    @cookies[:dozen] = {
+      :value => 'twelve',
+      :expires => expires
+    }
+
+    @_headers['Set-Cookie'].should ==
+      ["dozen=twelve; expires=%s; path=/;" % cookie_time(expires)]
+
+    @cookies[:dozen].should == 'twelve'
+    @cookies['dozen'].should == 'twelve'
+  end
+
+  it "should accept multiple cookies" do
+    expires = Time.now + 2.weeks
+    @cookies[:foo] = 'bar'
+    @cookies[:dozen] = {
+      :value => 'twelve',
+      :expires => expires
+    }
+
+    @_headers['Set-Cookie'].should == [
+      'foo=bar; path=/;',
+      "dozen=twelve; expires=%s; path=/;" % cookie_time(expires)
+    ]
+
+    @cookies[:dozen].should == 'twelve'
+    @cookies['dozen'].should == 'twelve'
+    @cookies[:foo].should == 'bar'
+    @cookies['foo'].should == 'bar'
+  end
+
+  it "should give access to currently saved cookies" do
+    @_cookies[:original] = 'accessible'
+    @cookies[:original].should == 'accessible'
+
+    @cookies[:foo] = 'bar'
+    @cookies[:foo].should == 'bar'
+    @cookies[:original].should == 'accessible'
+  end
+
+  it "should overwrite old cookies with new cookies" do
+    @_cookies[:foo] = 'bar'
+    @cookies[:foo].should == 'bar'
+
+    @cookies[:foo] = 'new'
+    @cookies[:foo].should == 'new'
+  end
+
+  it "should allow deleting of cookies" do
+    @_cookies[:foo] = 'bar'
+    @cookies[:foo].should == 'bar'
+
+    @cookies.delete(:foo)
+    @cookies[:foo].should == nil
+  end
+end

data/spec/merb/render_spec.rb

@@ -412,6 +412,23 @@ describe "Merb rendering with an object calls to_json or to_xml on the object (u
   
 end
 
+describe "Merb rendering with a hash object calls to_json or to_xml on the object" do
+  
+  it "render :obj => @foo should call @foo.to_json when json is requested" do
+    c = new_spec_controller(:format => 'json', :controller => 'RenderHashObjectController')
+    c.dispatch(:render_object)
+    JSON.load(c.body).should == {'baz' => "quuz", "foo" => "bar"}
+  end
+  
+  it "render @foo should call @foo.to_xml when xml is requested" do
+    c = new_spec_controller(:format => 'xml', :controller => 'RenderHashObjectController')
+    c.dispatch(:render_object)
+    c.body.should match(/<\?xml version="1.0" encoding="UTF-8"\?>\n<hash>/m)
+    c.body.should match(/(<baz>quuz<\/baz>\n\s+<foo>bar<\/foo>\n<\/hash>)|(<foo>bar<\/foo>\n\s+<baz>quuz<\/baz>\n<\/hash>)/m)
+  end
+    
+end
+
 describe "Merb rendering with an object and using a block/lambda for provides" do
   
   it "render @foo should use the default block when xml is requested" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-14 00:00:00 -06:00
+date: 2008-01-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -212,6 +212,7 @@ files:
 - spec/merb/controller_filters_spec.rb
 - spec/merb/controller_spec.rb
 - spec/merb/cookie_store_spec.rb
+- spec/merb/cookies_spec.rb
 - spec/merb/core_ext
 - spec/merb/core_ext/class_spec.rb
 - spec/merb/core_ext/enumerable_spec.rb
@@ -251,7 +252,9 @@ files:
 - lib/merb
 - lib/merb/abstract_controller.rb
 - lib/merb/assets.rb
+- lib/merb/assets.rb.orig
 - lib/merb/boot_loader.rb
+- lib/merb/boot_loader.rb.orig
 - lib/merb/caching
 - lib/merb/caching/action_cache.rb
 - lib/merb/caching/fragment_cache.rb
@@ -262,6 +265,7 @@ files:
 - lib/merb/config.rb
 - lib/merb/constants.rb
 - lib/merb/controller.rb
+- lib/merb/cookies.rb
 - lib/merb/core_ext
 - lib/merb/core_ext/array.rb
 - lib/merb/core_ext/class.rb
@@ -480,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - install the json gem to get faster json parsing
 rubyforge_project: 
-rubygems_version: 0.9.5
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.