merb 0.3.4 → 0.3.7

data/lib/merb/template/xml_builder.rb

@@ -1,17 +1,29 @@
+begin
+  require 'builder'
+rescue LoadError
+  puts "you must install the builder gem to use .rxml templates"
+end
+
 module Merb
   
-  module Template
-    
+  module Template # :nodoc:
+    # A module to allow you to use Builder["http://builder.rubyforge.org/"] templates in your Merb applications.
+    # Your Builder templates must end in .rxml, .xerb, or .builder for Merb to use them.
     module XMLBuilder
     
-      ::Merb::Controller.register_engine self, %w[ rxml xerb builder]
+      ::Merb::AbstractController.register_engine self, %w[ rxml xerb builder]
     
       class << self
 
-        def exempt_from_layout?
+        def exempt_from_layout? # :nodoc:
           true    
         end
-        
+
+        # Main method to run the Builder template.
+        # 
+        # In Builder's case, it sets the content type and encoding, 
+        # executes the Builder template by feeding it to <tt>Builder::XmlMarkup.new</tt>, 
+        # then calls <tt>target!</tt> on the<tt>Builder::XmlMarkup</tt> instance to get its XML output.   
         def transform(options = {})
           opts, file, view_context = options.values_at(:opts, :file, :view_context)
           xml_body = IO.read(file) 

data/lib/merb/test/merb_fake_request.rb

@@ -0,0 +1,63 @@
+module Merb
+  module Test
+    # FakeRequest sets up a default enviroment which can be overridden either
+    # by passing and env into initialize or using request['HTTP_VAR'] = 'foo' 
+    class FakeRequest < Request
+      attr_reader :req
+      alias :body :req
+      alias :params :env
+      alias :to_hash :env
+    
+      def initialize(env = {}, method = 'GET', req = StringIO.new)
+        env[:http_cookie] = env.delete(:cookies) if env[:cookies]
+        env.environmentize_keys!
+        super(DEFAULT_ENV.dup.merge(env), method, req)
+        self.post_body = ''
+      end
+
+      def self.with(path, options = {})
+        options.environmentize_keys!
+        new({'REQUEST_URI' => path,
+             'PATH_INFO' => path.sub(/\?.*$/,'')}.merge(options))
+      end
+  
+      def post_body=(post)
+        @req = StringIO.new(post)
+      end  
+    
+      def [](key)
+        @env[key]
+      end
+  
+      def []=(key, value)
+        @env[key] = value
+      end
+
+    
+      private    
+      DEFAULT_ENV = {
+        'SERVER_NAME' => 'localhost',
+        'PATH_INFO' => '/',
+        'HTTP_ACCEPT_ENCODING' => 'gzip,deflate',
+        'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.8.0.1) Gecko/20060214 Camino/1.0',
+        'SCRIPT_NAME' => '/',
+        'SERVER_PROTOCOL' => 'HTTP/1.1',
+        'HTTP_CACHE_CONTROL' => 'max-age=0',
+        'HTTP_ACCEPT_LANGUAGE' => 'en,ja;q=0.9,fr;q=0.9,de;q=0.8,es;q=0.7,it;q=0.7,nl;q=0.6,sv;q=0.5,nb;q=0.5,da;q=0.4,fi;q=0.3,pt;q=0.3,zh-Hans;q=0.2,zh-Hant;q=0.1,ko;q=0.1',
+        'HTTP_HOST' => 'localhost',
+        'REMOTE_ADDR' => '127.0.0.1',
+        'SERVER_SOFTWARE' => 'Mongrel 1.1',
+        'HTTP_KEEP_ALIVE' => '300',
+        'HTTP_REFERER' => 'http://localhost/',
+        'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+        'HTTP_VERSION' => 'HTTP/1.1',
+        'REQUEST_URI' => '/',
+        'SERVER_PORT' => '80',
+        'GATEWAY_INTERFACE' => 'CGI/1.2',
+        'HTTP_ACCEPT' => 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
+        'HTTP_CONNECTION' => 'keep-alive',
+        'REQUEST_METHOD' => 'GET'      
+      }
+    end
+  end
+end

data/lib/merb/test/merb_multipart.rb

@@ -0,0 +1,58 @@
+module Merb
+  module Test
+    module Multipart
+      require 'rubygems'
+      require 'mime/types'
+
+      class Param
+        attr_accessor :key, :value
+        def initialize(key, value)
+          @key   = key
+          @value = value
+        end
+
+        def to_multipart
+          return %(Content-Disposition: form-data; name="#{key}"\r\n\r\n#{value}\r\n)
+        end
+      end
+
+      class FileParam
+        attr_accessor :key, :filename, :content
+        def initialize(key, filename, content)
+          @key      = key
+          @filename = filename
+          @content  = content
+        end
+
+        def to_multipart
+          return %(Content-Disposition: form-data; name="#{key}"; filename="#{filename}"\r\n) + "Content-Type: #{MIME::Types.type_for(@filename)}\r\n\r\n" + content + "\r\n"
+        end
+      end
+      
+      class Post
+        BOUNDARY = '----------0xKhTmLbOuNdArY'
+        CONTENT_TYPE = "multipart/form-data, boundary=" + BOUNDARY
+
+        def initialize(params = {})
+          @multipart_params = []
+          push_params(params)
+        end
+        
+        def push_params(params)
+          params.each do |key, value|
+            if value.respond_to?(:read)
+              @multipart_params << FileParam.new(key, value.path, value.read)
+            else
+              @multipart_params << Param.new(key, value)
+            end
+          end
+        end
+
+        def to_multipart
+          query = @multipart_params.collect { |param| "--" + BOUNDARY + "\r\n" + param.to_multipart }.join("") + "--" + BOUNDARY + "--"
+          return query, CONTENT_TYPE
+        end
+      end  
+    end    
+  end
+end

data/lib/tasks/db.rake

@@ -4,6 +4,8 @@ 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+'/dist/conf/merb_init.rb'
 end
 

data/lib/tasks/merb.rake

@@ -1,13 +1,19 @@
+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__)+'/../dist/framework/merb/merb_server')\nMerb::Server.run\n"
+  File.open(script_filepath, 'wb') {|f|
+    f.write tmpl 
+    f.chmod(0744)
+  }
+end
+
 namespace :merb do
   desc "freeze the merb framework into dist/merb for portability"
   task :freeze do
     FileUtils.rm_rf MERB_ROOT / 'dist/framework'
     FileUtils.cp_r MERB_FRAMEWORK_ROOT, (MERB_ROOT / 'dist/framework')
-    tmpl = "#!/usr/local/bin/ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../dist/framework/merb/merb_server')\nMerb::Server.run\n"
-    File.open(MERB_ROOT / 'script/merb', 'wb') {|f|
-      f.write tmpl 
-      f.chmod(0744)
-    }
+    install_merb_script
     
     puts "  Freezing Merb Framework into dist/framework"
     puts "  Use script/merb to start instead of plain merb"
@@ -24,9 +30,15 @@ namespace :merb do
   
   desc "freeze the merb framework from svn"
   task :freeze_from_svn do
-    puts "Freezing Merb Framework from svn"
-    FileUtils.rm_rf MERB_ROOT / 'dist/framework'
-    system "svn co http://svn.devjavu.com/merb/trunk/lib #{MERB_ROOT / 'dist/framework'}"
+    install_path = MERB_ROOT / 'dist/framework'
+    puts "  Removing old framework" if File.exist? install_path
+    FileUtils.rm_rf install_path
+
+    puts "  Freezing Merb Framework from svn"
+    system "svn co http://svn.devjavu.com/merb/trunk/lib #{install_path}"
+    install_merb_script
+    
+    puts "  Use script/merb to start instead of plain merb"
   end
   
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
-date: 2007-05-31 00:00:00 -07:00
+  version: 0.3.7
+date: 2007-08-04 00:00:00 -07:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -40,9 +40,11 @@ files:
 - lib/merb/caching/fragment_cache.rb
 - lib/merb/caching/store
 - lib/merb/caching/store/file_cache.rb
+- lib/merb/caching/store/memcache.rb
 - lib/merb/caching/store/memory_cache.rb
 - lib/merb/caching.rb
 - lib/merb/core_ext
+- lib/merb/core_ext/merb_array.rb
 - lib/merb/core_ext/merb_class.rb
 - lib/merb/core_ext/merb_enumerable.rb
 - lib/merb/core_ext/merb_hash.rb
@@ -58,13 +60,17 @@ files:
 - lib/merb/generators
 - lib/merb/generators/merb_app
 - lib/merb/generators/merb_app/merb_app.rb
+- lib/merb/merb_abstract_controller.rb
 - lib/merb/merb_constants.rb
 - lib/merb/merb_controller.rb
 - lib/merb/merb_dispatcher.rb
 - lib/merb/merb_drb_server.rb
 - lib/merb/merb_exceptions.rb
 - lib/merb/merb_handler.rb
+- lib/merb/merb_mail_controller.rb
 - lib/merb/merb_mailer.rb
+- lib/merb/merb_part_controller.rb
+- lib/merb/merb_plugins.rb
 - lib/merb/merb_request.rb
 - lib/merb/merb_router.rb
 - lib/merb/merb_server.rb
@@ -82,13 +88,18 @@ files:
 - lib/merb/mixins/view_context_mixin.rb
 - lib/merb/session
 - lib/merb/session/merb_ar_session.rb
+- lib/merb/session/merb_mem_cache_session.rb
 - lib/merb/session/merb_memory_session.rb
+- lib/merb/session.rb
 - lib/merb/template
 - lib/merb/template/erubis.rb
 - lib/merb/template/haml.rb
 - lib/merb/template/markaby.rb
 - lib/merb/template/xml_builder.rb
 - lib/merb/template.rb
+- lib/merb/test
+- lib/merb/test/merb_fake_request.rb
+- lib/merb/test/merb_multipart.rb
 - lib/merb/vendor
 - lib/merb/vendor/paginator
 - lib/merb/vendor/paginator/paginator.rb
@@ -106,16 +117,25 @@ files:
 - examples/skeleton/dist/app/controllers/application.rb
 - examples/skeleton/dist/app/helpers
 - examples/skeleton/dist/app/helpers/global_helper.rb
+- examples/skeleton/dist/app/mailers
+- examples/skeleton/dist/app/mailers/helpers
+- examples/skeleton/dist/app/mailers/layout
+- examples/skeleton/dist/app/mailers/layout/application.erb
+- examples/skeleton/dist/app/mailers/views
 - examples/skeleton/dist/app/models
 - examples/skeleton/dist/app/views
 - examples/skeleton/dist/app/views/layout
 - examples/skeleton/dist/app/views/layout/application.herb
 - examples/skeleton/dist/conf
+- examples/skeleton/dist/conf/database.yml
+- examples/skeleton/dist/conf/environments
+- examples/skeleton/dist/conf/environments/development.rb
+- examples/skeleton/dist/conf/environments/production.rb
+- examples/skeleton/dist/conf/environments/test.rb
 - examples/skeleton/dist/conf/merb.yml
 - examples/skeleton/dist/conf/merb_init.rb
 - examples/skeleton/dist/conf/router.rb
 - examples/skeleton/dist/conf/upload.conf
-- examples/skeleton/dist/lib
 - examples/skeleton/dist/plugins
 - examples/skeleton/dist/public
 - examples/skeleton/dist/public/images
@@ -124,15 +144,12 @@ files:
 - examples/skeleton/dist/schema
 - examples/skeleton/dist/schema/migrations
 - examples/skeleton/dist/schema/migrations/001_add_sessions_table.rb
-- examples/skeleton/log
+- examples/skeleton/plugins
 - examples/skeleton/Rakefile
 - examples/skeleton/script
 - examples/skeleton/script/new_migration
 - examples/skeleton/script/stop_merb
 - examples/skeleton/test
-- examples/skeleton/test/specs
-- examples/skeleton/test/unit
-- examples/skeleton.tar
 test_files: []
 
 rdoc_options: []
@@ -184,21 +201,3 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: xml-simple
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: