merb 0.3.4 → 0.3.7

data/Rakefile

@@ -15,11 +15,11 @@ include FileUtils
 
 
 NAME = "merb"
-VERS = "0.3.4"
+VERS = "0.3.7"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 
 setup_clean [ "pkg", "lib/*.bundle", "*.gem", 
-            "doc", ".config", "examples/sample_app/dist/public/files/**/*", 'examples/sample_app/log/*']
+            "doc", ".config", "examples/sample_app/dist/public/files/**/*", 'examples/sample_app/log/*', 'coverage']
 
 
 desc "Packages up Merb."
@@ -60,8 +60,6 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('erubis')
   s.add_dependency('json')
   s.add_dependency('mime-types')
-  s.add_dependency('xml-simple')
-  s.add_dependency('archive-tar-minitar') 
   s.required_ruby_version = '>= 1.8.4'
 
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{bin,test,lib,examples}/**/*") 
@@ -91,20 +89,6 @@ task :doc_rforge do
   sh %{scp -r -p doc/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
 end
 
-
-desc "Pack skeleton app as a tar.gz file"
-task :skeleton do
-  require 'archive/tar/minitar'
-  include Archive::Tar
-  Find.find(File.join(__DIR__,'examples/skeleton')) do |f| 
-    FileUtils.rm_rf(f) if /\.svn$/ =~ f 
-  end
-  File.open(File.join(__DIR__,'examples/skeleton.tar'), 'wb') do |tar| 
-    Dir.chdir 'examples/skeleton'
-    Minitar.pack('.', tar, true) 
-  end
-end  
-
 desc 'Run unit tests'
 Rake::TestTask.new('test_unit') do |t|
   t.libs << 'test'
@@ -135,13 +119,20 @@ desc "Run all specs"
 Spec::Rake::SpecTask.new('specs') do |t|
   t.spec_opts = ["--format", "specdoc"]
   t.libs = ['lib', 'server/lib' ]
-  t.spec_files = FileList['specs/**/*_spec.rb']
+  t.spec_files = Dir['specs/**/*_spec.rb'].sort
+end
+
+desc "Run all specs output html"
+Spec::Rake::SpecTask.new('specs_html') do |t|
+  t.spec_opts = ["--format", "html"]
+  t.libs = ['lib', 'server/lib' ]
+  t.spec_files = Dir['specs/**/*_spec.rb'].sort
 end
 
 desc "RCov"
 Spec::Rake::SpecTask.new('rcov') do |t|
   t.spec_opts = ["--format", "specdoc"]
-  t.spec_files = FileList['specs/**/*_spec.rb']
+  t.spec_files = Dir['specs/**/*_spec.rb'].sort
   t.libs = ['lib', 'server/lib' ]
   t.rcov = true
 end
@@ -166,4 +157,4 @@ end
 desc "Add new files to subversion"
 task :svn_add do
    system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
-end
+end

data/bin/merb

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 
 require 'rubygems'
 require 'merb/merb_server'

data/examples/skeleton/Rakefile

@@ -1,10 +1,13 @@
 require 'rake'
 require 'rake/rdoctask'
 require 'rake/testtask'
-require 'code_statistics' 
 require 'fileutils'
 require 'rubygems'
-require 'merb'
+if File.directory?( File.join(File.dirname(__FILE__), "dist/framework"))
+  require File.join(File.dirname(__FILE__), "dist/framework/merb")
+else  
+  require 'merb'
+end
 require MERB_FRAMEWORK_ROOT+'/merb_tasks'
 MERB_ROOT = File.dirname(__FILE__)
 include FileUtils
@@ -55,23 +58,6 @@ task :aok do
   sh %{rake spec}
 end
 
-##############################################################################
-# Statistics
-##############################################################################
-
-STATS_DIRECTORIES = [
-  %w(Code               lib/),
-  %w(Unit\ tests        test/unit),
-  %w(Functional\ tests  test/functional)
-].collect { |name, dir| [ name, "./#{dir}" ] }.select { |name, dir| File.directory?(dir) }
-
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
-  #require 'extra/stats'
-  verbose = true
-  CodeStatistics.new(*STATS_DIRECTORIES).to_s
-end
-
 ##############################################################################
 # SVN
 ##############################################################################
@@ -79,4 +65,4 @@ end
 desc "Add new files to subversion"
 task :svn_add do
    system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
-end
+end

data/examples/skeleton/dist/app/mailers/layout/application.erb

@@ -0,0 +1 @@
+<%= catch_content :layout %>

data/examples/skeleton/dist/conf/database.yml

@@ -0,0 +1,23 @@
+development:
+  adapter: mysql
+  database: sample_development
+  username: teh_user
+  password: secrets
+  host: localhost
+  socket: /tmp/mysql.sock
+
+test:
+  adapter: mysql
+  database: sample_test
+  username: teh_user
+  password: secrets
+  host: localhost
+  socket: /tmp/mysql.sock
+
+production:
+  adapter: mysql
+  database: sample_production
+  username: teh_user
+  password: secrets
+  host: /tmp/mysql.sock
+  

data/examples/skeleton/dist/conf/environments/development.rb

@@ -0,0 +1 @@
+puts "Loaded DEVELOPMENT Environment..."

data/examples/skeleton/dist/conf/environments/production.rb

@@ -0,0 +1 @@
+puts "Loaded PRODUCTION Environment..."

data/examples/skeleton/dist/conf/environments/test.rb

@@ -0,0 +1 @@
+puts "Loaded TEST Environment..."

data/examples/skeleton/dist/conf/merb.yml

@@ -1,53 +1,57 @@
 ---
-# hostname or IP to bind to. 
+# Hostname or IP address to bind to. 
 :host: 127.0.0.1
 
-# port merb runs on or starting port for merb cluster.
+# Port merb runs on or starting port for merb cluster.
 :port: "4000"
 
-# in development mode your controler classes get reloaded every request
-# and templates are parsed each time and not cached
-# in production mode templates are cached, as well as all your classes
+# In development mode your controller classes get reloaded on every request,
+# and templates are parsed each time and not cached. In production mode
+# templates are cached, as well as all your classes
 :environment: development
 
-# uncomment for memory sessions. This only works when
-# you are running 1 merb at a time. ANd sessions do not persist 
-# between restarts.
+# Uncomment for memory sessions. This only works when you are running 1 merb
+# at a time. And sessions do not persist between restarts.
 # :memory_session: true
 
-# This turns on the ActiveRecord sessions with rails parasite
-# mode if active_support gem is installed. Skeleton app comes with a
-# migration to create the sessions table. Or you can point merb to 
-# the same sessions table that your rails app uses to share sessions 
-# between merb and rails.
+# Turn on memcached sessions.
+# Requires these lines in merb_init.rb (and a running memcached server):
+#   require 'memcache_util'
+#   CACHE = MemCache.new('127.0.0.1:11211', { :namespace => 'my_app' })
+# :mem_cache_session: true
+
+# This turns on the ActiveRecord sessions with rails parasite mode if
+# active_support gem is installed. Skeleton app comes with a migration to
+# create the sessions table. Or you can point merb to  the same sessions
+# table that your rails app uses to share sessions between merb and rails.
 :sql_session: true
+:log_level: debug
 
-# uncomment to use the merb upload progress
+# Uncomment to use the merb upload progress
 #:config: dist/conf/upload.conf
 
-# uncomment to cache templates in dev mode.
-# templates are cached automatically in production mode.
+# Uncomment to cache templates in dev mode. Templates are cached
+# automatically in production mode.
 #:cache_templates: true
 
-# uncomment and set this is you want to run a drb
-# server for upload progress or other drb services.
+# Uncomment and set this if you want to run a drb server for upload progress
+# or other drb services.
 #:drb_server_port: 32323
 
-# If you want to protect some or all of your app with 
-# HTTP basic auth then uncomment the folowing and fill
-# in your credentials you want it to use. Then you need
-# to set a before filter in a controller:
-# before :basic_authentication
+# If you want to protect some or all of your app with  HTTP basic auth then
+# uncomment the following and fill in your credentials you want it to use.
+# You will then need to set a 'before' filter in a controller.  For example:
+#   before :basic_authentication
 #:basic_auth: 
 #  :username: ezra
 #  :password: test
 #  :domain: localhost
 
-# uncomment this if you want merb to daemonize when you start it
-# you can also just use merb -d for the same effect. Don't uncomment
-# this if you use the cluster option
+# Uncomment this if you want merb to daemonize when you start it. You can also
+# just use merb -d for the same effect. Don't uncomment this if you use the
+# cluster option.
 #:daemonize: true
 
-# uncomment this to set the number of members in your merb cluster
-# don't set this and :daemonize: at the same time.
+# Uncomment this to set the number of members in your merb cluster. Don't set
+# this and :daemonize: at the same time.
 #:cluster: 3

data/examples/skeleton/dist/conf/merb_init.rb

@@ -2,20 +2,23 @@ puts "merb init called"
 require 'active_record'
 ActiveRecord::Base.verification_timeout = 14400
 ActiveRecord::Base.logger = MERB_LOGGER
-Dir[DIST_ROOT+"/app/helpers/*.rb"].each { |m| require m } 
+
 require DIST_ROOT+"/app/controllers/application.rb"
-Dir[DIST_ROOT+"/app/controllers/*.rb"].each { |m| require m } 
-Dir[DIST_ROOT+"/app/models/*.rb"].each { |m| require m } 
-Dir[DIST_ROOT+"/lib/**/*.rb"].each { |m| require m } 
-Dir[DIST_ROOT+"/plugins/*/init.rb"].each { |m| require m } 
+Dir[DIST_ROOT+"/app/controllers/*.rb"].each{ |m| require m } 
+Dir[DIST_ROOT+"/app/helpers/*.rb"].each    { |m| require m } 
+Dir[DIST_ROOT+"/app/models/*.rb"].each     { |m| require m } 
+Dir[DIST_ROOT+"/app/mailers/*.rb"].each    { |m| require m }
+Dir[DIST_ROOT+"/lib/*/lib/*.rb"].each      { |m| require m }
+Dir[DIST_ROOT+"/lib/*/bin/*.rb"].each      { |m| require m }
+Dir[DIST_ROOT+"/plugins/*/init.rb"].each   { |m| require m }
+
+#Get Database Config
+puts "Connecting to database..."
+conn_options = YAML::load(Erubis::Eruby.new(IO.read("#{DIST_ROOT}/conf/database.yml")).result)
+ActiveRecord::Base.establish_connection conn_options["#{MERB_ENV}"] 
 
-# set your db info here
-ActiveRecord::Base.establish_connection(
-  :adapter => 'mysql',
-  :username => 'root',
-  :password => 'xxxxx',
-  :database => 'merb'
-)
+#Get Environment File
+require "#{DIST_ROOT}/conf/environments/#{MERB_ENV}"
 
 # add your own ruby code here for app specific stuff. This file gets loaded
-# after the framework is loaded.
+# after the framework is loaded.

data/examples/skeleton/dist/conf/router.rb

@@ -1,13 +1,13 @@
 # Merb::RouteMatcher is the request routing mapper for the merb framework.
-# You can define placeholder parts of the url with the :smbol notation.
-# so r.add '/foo/:bar/baz/:id', :class => 'Bar', :method => 'foo'
-# will match against a request to /foo/123/baz/456. It will then
-# use the class Bar as your merb controller and call the foo method on it. 
-# the foo method will recieve a hash with {:bar => '123', :id => '456'}
-# as the content. So the :placeholders sections of your routes become
-# a hash of arguments to your controller methods.
-# The default route is installed 
-
+# You can define placeholder parts of the url with the :symbol notation. For
+# example:
+#
+#   r.add '/admin/:email/users/:id', :controller => 'admin_users', :action => 'foo'
+#
+# will match against a request to /admin/me@gmail.com/users/456. It will then
+# use the class AdminUsers as your merb controller and call the 'foo' method
+# on it. The 'foo' method will be able to access the :email and :id values via
+# the 'params' hash, e.g. 'params[:email]' will return 'me@gmail.com'.
 
 puts "Compiling routes.."
 Merb::Router.prepare do |r|

data/examples/skeleton/dist/schema/migrations/001_add_sessions_table.rb

@@ -1,8 +1,8 @@
 class AddSessionsTable < ActiveRecord::Migration
   def self.up
     create_table :sessions, :force => true do |t|
-        t.column :session_id,      :string,  :limit => 32
-        t.column :created_at,  :datetime
+        t.column :session_id, :string,  :limit => 32
+        t.column :created_at, :datetime
         t.column :data,       :text
     end
      add_index "sessions", ["session_id"], :name => "session_id_index"

data/lib/merb.rb

@@ -15,7 +15,7 @@ require 'json'
 
 
 module Merb
-  VERSION='0.3.4' unless defined?VERSION
+  VERSION='0.3.7' unless defined?VERSION
   class Server
     class << self
       def config
@@ -50,7 +50,7 @@ MERB_FRAMEWORK_ROOT = __DIR__
 
 MERB_ROOT = Merb::Server.merb_root || Dir.pwd
 DIST_ROOT = Merb::Server.dist_root || Dir.pwd+'/dist'
-MERB_ENV  = Merb::Server.config[:environment]
+MERB_ENV  = Merb::Server.config[:environment].nil? ? 'development' : Merb::Server.config[:environment]
 MERB_VIEW_ROOT = MERB_ROOT / "dist/app/views"
 
 logpath = $TESTING ? "/tmp/merb_test.log" : "#{MERB_ROOT}/log/merb.#{Merb::Server.port}.log"
@@ -72,16 +72,6 @@ MERB_LOGGER.level = case (Merb::Server.log_level.downcase rescue '')
                     else                        
                       Logger::INFO
                     end  
-
-module Mongrel::Const
-  HTTP_COOKIE         = 'HTTP_COOKIE'.freeze
-  QUERY_STRING        = 'QUERY_STRING'.freeze
-  APPLICATION_JSON    = 'application/json'.freeze 
-  TEXT_JSON           = 'text/x-json'.freeze
-  APPLICATION_XML     = 'application/xml'.freeze 
-  TEXT_XML            = 'text/xml'.freeze  
-  UPCASE_CONTENT_TYPE = 'CONTENT_TYPE'.freeze
-end  
          
 lib = File.join(__DIR__, 'merb')
 Dir.entries(lib).sort.select{|f| f !~ /merb\/session\// }.each {|fn| require File.join(lib, fn) if fn =~ /\.rb$/}
@@ -89,9 +79,10 @@ Dir.entries(lib).sort.select{|f| f !~ /merb\/session\// }.each {|fn| require Fil
 require File.join(__DIR__, 'merb/vendor/paginator/paginator')
 
 class Merb::Controller
+  lib = File.join(__DIR__, 'merb')
   if Merb::Server.memory_session 
-    require "merb/session/merb_memory_session"
-    Merb::MemorySession.setup
+    require lib + "/session/merb_memory_session"
+    Merb::MemorySessionContainer.setup
     include ::Merb::SessionMixin
     puts "memory session mixed in"
   end
@@ -104,14 +95,28 @@ class Merb::Controller
     rescue  LoadError
       puts "Rails session compatibilty disabled. If you need this then install the actionpack gem"
     end    
-    require "merb/session/merb_ar_session"
+    require lib + "/session/merb_ar_session"
+    include ::Merb::SessionMixin
+  end
+
+  if Merb::Server.mem_cache_session
+    require lib + "/session/merb_mem_cache_session"
     include ::Merb::SessionMixin
-    Thread.new{ loop{ sleep(60*60); ActiveRecord::Base.verify_active_connections! } }.priority = -10
+    puts "MemCache session mixed in"
   end
   
   if Merb::Server.basic_auth
-    require "merb/mixins/basic_authentication_mixin"
+    require lib + "/mixins/basic_authentication_mixin"
     include ::Merb::Authentication
     puts "Basic Authentication mixed in"
   end
-end
+end
+
+if defined? ActiveRecord
+  Thread.new{ loop{ sleep(60*60); ActiveRecord::Base.verify_active_connections! } }.priority = -10
+end
+
+if $TESTING
+  test_files = File.join(lib, 'test', '*.rb')
+  Dir[test_files].each { |file| require file }
+end  

data/lib/merb/caching/fragment_cache.rb

@@ -20,17 +20,13 @@ module Merb
         end
         
         def determine_cache_store
-          case ::Merb::Server.cache_store
-          when "file", :file
+          if ::Merb::Server.cache_store.to_s == "file"
             require 'merb/caching/store/file_cache'
             ::Merb::Caching::Store::FileCache.new
-          when "memory", :memory
-            require 'merb/caching/store/memory_cache'
-            ::Merb::Caching::Store::MemoryCache.new
           else
             require 'merb/caching/store/memory_cache'            
-            ::Merb::Caching::Store::MemoryCache.new
-          end    
+            ::Merb::Caching::Store::MemoryCache.new            
+          end
         end  
       end
     end

data/lib/merb/caching/store/memcache.rb

@@ -0,0 +1,20 @@
+module Merb
+  module Caching
+    module MemcachedStore
+    
+
+    def get(name)
+      ::Cache.get("fragment:#{name}")
+    end
+    
+    def put(name, content = nil)
+      ::Cache.put("fragment:#{name}", content)
+      content
+    end
+    
+    def expire_fragment(name)
+      ::Cache.delete(name)
+    end     
+    end
+  end
+end      

data/lib/merb/core_ext/merb_class.rb

@@ -1,12 +1,52 @@
-# Retain for backward compatibility.  Methods are now included in Class.
-module ClassInheritableAttributes # :nodoc:
-end
-
 # Allows attributes to be shared within an inheritance hierarchy, but where each descendant gets a copy of
 # their parents' attributes, instead of just a pointer to the same. This means that the child can add elements
 # to, for example, an array without those additions being shared with either their parent, siblings, or
 # children, which is unlike the regular class-level attributes that are shared across the entire hierarchy.
 class Class # :nodoc:
+  def cattr_reader(*syms)
+    syms.flatten.each do |sym|
+      next if sym.is_a?(Hash)
+      class_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
+
+        def #{sym}
+          @@#{sym}
+        end
+      EOS
+    end
+  end
+
+  def cattr_writer(*syms)
+    options = syms.last.is_a?(Hash) ? syms.pop : {}
+    syms.flatten.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
+
+        #{"
+        def #{sym}=(obj)
+          @@#{sym} = obj
+        end
+        " unless options[:instance_writer] == false }
+      EOS
+    end
+  end
+
+  def cattr_accessor(*syms)
+    cattr_reader(*syms)
+    cattr_writer(*syms)
+  end
   def class_inheritable_reader(*syms)
     syms.each do |sym|
       next if sym.is_a?(Hash)