RubyGems - merb - Versions diffs - 0.0.7 → 0.0.8 - Mend

merb 0.0.7 → 0.0.8

Files changed (62) hide show

data/README +66 -31
data/Rakefile +3 -1
data/bin/merb +47 -13
data/examples/app_skeleton/Rakefile +4 -3
data/examples/app_skeleton/dist/app/helpers/global_helper.rb +6 -0
data/examples/app_skeleton/dist/conf/merb.yml +11 -0
data/examples/app_skeleton/dist/conf/mup.conf +5 -0
data/examples/app_skeleton/dist/conf/router.rb +1 -3
data/examples/app_skeleton/scripts/merb_stop +10 -2
data/examples/sample_app/Rakefile +3 -3
data/examples/sample_app/dist/app/controllers/files.rb +3 -3
data/examples/sample_app/dist/app/controllers/posts.rb +25 -23
data/examples/sample_app/dist/app/controllers/test.rb +7 -3
data/examples/sample_app/dist/app/helpers/global_helper.rb +7 -0
data/examples/sample_app/dist/app/helpers/posts_helper.rb +4 -0
data/examples/sample_app/dist/app/views/layout/application.herb +5 -4
data/examples/sample_app/dist/app/views/layout/foo.herb +1 -1
data/examples/sample_app/dist/app/views/posts/new.herb +9 -2
data/examples/sample_app/dist/app/views/shared/_test.herb +1 -0
data/examples/sample_app/dist/conf/merb.yml +7 -7
data/examples/sample_app/dist/conf/merb_init.rb +8 -1
data/examples/sample_app/dist/conf/mup.conf +5 -11
data/examples/sample_app/dist/conf/router.rb +1 -1
data/examples/sample_app/dist/public/test.html +5 -0
data/examples/sample_app/dist/schema/migrations/002_add_sessions_table.rb +1 -1
data/examples/sample_app/dist/schema/schema.rb +1 -1
data/examples/sample_app/log/merb.4000.pid +1 -0
data/lib/merb.rb +35 -17
data/lib/merb/core_ext.rb +2 -0
data/lib/merb/{merb_class_extensions.rb → core_ext/merb_class.rb} +42 -0
data/lib/merb/core_ext/merb_enumerable.rb +7 -0
data/lib/merb/{merb_utils.rb → core_ext/merb_hash.rb} +1 -78
data/lib/merb/core_ext/merb_kernel.rb +16 -0
data/lib/merb/core_ext/merb_module.rb +10 -0
data/lib/merb/core_ext/merb_numeric.rb +20 -0
data/lib/merb/core_ext/merb_object.rb +6 -0
data/lib/merb/core_ext/merb_string.rb +40 -0
data/lib/merb/core_ext/merb_symbol.rb +12 -0
data/lib/merb/merb_constants.rb +18 -0
data/lib/merb/merb_controller.rb +150 -76
data/lib/merb/{session/merb_drb_server.rb → merb_drb_server.rb} +13 -46
data/lib/merb/merb_exceptions.rb +4 -0
data/lib/merb/merb_handler.rb +29 -17
data/lib/merb/merb_request.rb +95 -0
data/lib/merb/merb_upload_handler.rb +46 -0
data/lib/merb/merb_upload_progress.rb +48 -0
data/lib/merb/merb_view_context.rb +46 -0
data/lib/merb/merb_yaml_store.rb +31 -0
data/lib/merb/mixins/basic_authentication_mixin.rb +2 -2
data/lib/merb/mixins/controller_mixin.rb +24 -75
data/lib/merb/mixins/erubis_capture_mixin.rb +84 -0
data/lib/merb/mixins/javascript_mixin.rb +103 -19
data/lib/merb/mixins/merb_status_codes.rb +59 -0
data/lib/merb/mixins/render_mixin.rb +114 -40
data/lib/merb/mixins/responder_mixin.rb +2 -1
data/lib/merb/session/merb_ar_session.rb +120 -0
data/lib/merb/session/merb_drb_session.rb +0 -6
data/lib/merb/vendor/paginator/paginator.rb +102 -99
metadata +44 -8
data/examples/sample_app/script/startdrb +0 -8
data/lib/merb/session/merb_session.rb +0 -64
data/lib/mutex_hotfix.rb +0 -34

data/examples/sample_app/dist/app/controllers/test.rb CHANGED

@@ -1,8 +1,7 @@
 class Test < Merb::Controller
-  before :authenticate
-  before lambda{|c| puts 'lambda filter called'}
+  #before :authenticate
+  #before lambda{|c| puts 'lambda filter called'}
   def bfilter
     puts "Filter Called!"
@@ -24,6 +23,11 @@ class Test < Merb::Controller
     render_js
   end
+  def rails
+    puts session.inspect
+    session[:foo]
+  end
   def foo
     @args = params
     render

data/examples/sample_app/dist/app/helpers/global_helper.rb ADDED

@@ -0,0 +1,7 @@
+module Merb
+  module GlobalHelper
+  end
+end

data/examples/sample_app/dist/app/helpers/posts_helper.rb ADDED

@@ -0,0 +1,4 @@
+module Merb
+  module PostsHelper
+  end
+end

data/examples/sample_app/dist/app/views/layout/application.herb CHANGED

@@ -4,8 +4,8 @@
 <head>
 	<title>Merb: Mongrel + Erb</title>
 	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-	<%= require_css :merb %>
-	<%= require_js :prototype, :effects %>
+	<%= css_include_tag :merb %>
+	<%= js_include_tag :prototype, :effects %>
 </head>
 <body>
@@ -33,10 +33,11 @@
       <ul>
       	<li><img src="/images/louiecon.gif" /></li>
       </ul>
+ <%= catch_content :sidebar %>
    </div>
-<%= @layout_content %>
+<%= catch_content :layout %>
 		 <div class="maintext3">
 		   <div class="splitleft">
 		     <p>This is a split left box  in the split left class.</p>

data/examples/sample_app/dist/app/views/layout/foo.herb CHANGED

@@ -1,6 +1,6 @@
 <html>
 <title>Foo.rhtml</title>
 <body>
-	<%= @layout_content %>
+	<%= @_layout_content %>
 </body>
 </html>

data/examples/sample_app/dist/app/views/posts/new.herb CHANGED

@@ -1,6 +1,4 @@
 <h2>Make a post doofus.</h2>
 <form action="/posts/create" method="post">
@@ -28,3 +26,12 @@
     <input name="commit" type="submit" value="Submit" />
   </p>
 </form>
+<pre>
+<%= "session: #{session.to_yaml}" %>
+</pre>
+<% throw_content :sidebar do %>
+  <h3>This is the sidebar thrown to the layout.</h3>
+<% end %>

data/examples/sample_app/dist/app/views/shared/_test.herb ADDED

	@@ -0,0 +1 @@
1	+ <h1>Nested Partial works!</h1>

data/examples/sample_app/dist/conf/merb.yml CHANGED

@@ -1,11 +1,11 @@
 ---
-:host: 0.0.0.0
+:host: 127.0.0.1
 :port: "4000"
-:allow_reloading: true
-:basic_auth:
-  :username: ezra
-  :password: test
-  :domain: localhost
+:allow_reloading: false
+#:sql_session: true
+#:basic_auth:
+#  :username: ezra
+#  :password: test
+#  :domain: localhost
 #:daemonize: true
 #:cluster: 3
-#:session: true

data/examples/sample_app/dist/conf/merb_init.rb CHANGED

@@ -14,4 +14,11 @@ ActiveRecord::Base.establish_connection(
 )
 ActiveRecord::Base.verification_timeout = 14400
-Dir[DIST_ROOT+"/app/models/*.rb"].each { |m| require m }
+Dir[DIST_ROOT+"/app/**/*.rb"].each { |m| require m }
+Dir[DIST_ROOT+"/plugins/*/init.rb"].each { |m| require m }
+module Merb
+  class ViewContext
+    include Merb::GlobalHelper
+  end
+end

data/examples/sample_app/dist/conf/mup.conf CHANGED

@@ -1,11 +1,5 @@
-uri "/",
-  :handler => plugin("/handlers/upload", :path_info => '/files/upload'),
-                     :in_front => true,
-                     :frequency => 1
-#uri "/",
-#  :handler => plugin("/handlers/upload",
-#    :path_info => '/files/upload',
-#    :frequency => 1,
-#    :drb => 'druby://0.0.0.0:2999'),
-#  :in_front => true
+# upload progress conf
+---
+#:drb: true
+:path_info: /files/upload
+:frequency: 2

data/examples/sample_app/dist/conf/router.rb CHANGED

@@ -15,5 +15,5 @@ Merb::RouteMatcher.prepare do |r|
   r.add '/bar/:bar_id/baz/:id', :controller => 'Test', :action => 'foo'
   r.add '/:controller/:action/:id'
   r.add '/bar/:*rest', :controller => 'Test', :action => 'glob'
-  r.add '', :controller => 'posts', :action =>'index'
+  r.add '', :controller => 'posts', :action =>'list'
 end

data/examples/sample_app/dist/public/test.html ADDED

@@ -0,0 +1,5 @@
+<html>
+<body>
+	<h1>Static cached page!</h1>
+</body>
+</html>

data/examples/sample_app/dist/schema/migrations/002_add_sessions_table.rb CHANGED

@@ -2,7 +2,7 @@ class AddSessionsTable < ActiveRecord::Migration
   def self.up
     create_table :sessions, :force => true do |t|
         t.column :id,          :integer, :null => false
-        t.column :sess_id,      :string,  :limit => 32
+        t.column :session_id,      :string,  :limit => 32
         t.column :created_at,  :datetime
         t.column :data,       :text
     end

data/examples/sample_app/dist/schema/schema.rb CHANGED

@@ -20,7 +20,7 @@ ActiveRecord::Schema.define(:version => 2) do
   end
   create_table "sessions", :force => true do |t|
-    t.column "sess_id", :string, :limit => 32
+    t.column "session_id", :string, :limit => 32
     t.column "created_at", :datetime
     t.column "data", :text
   end

data/examples/sample_app/log/merb.4000.pid ADDED

	@@ -0,0 +1 @@
1	+ 2006

data/lib/merb.rb CHANGED

@@ -3,9 +3,11 @@ require 'mongrel'
 require 'fileutils'
 require 'erubis'
 require 'logger'
+require 'mime/types'
 module Merb
-  VERSION='0.0.7' unless defined?VERSION
+  VERSION='0.0.8' unless defined?VERSION
   class Server
     def self.config
       @@merb_opts ||= {}
@@ -17,25 +19,10 @@ class MerbControllerError < RuntimeError; end
 MERB_FRAMEWORK_ROOT = File.dirname(__FILE__)
-begin
-  require 'thread'
-  require 'fastthread'
-  puts 'Using FastThread'
-rescue LoadError
-  require 'mutex_hotfix'
-end
-begin
-  require 'fjson'
-  puts "using fjson"
-rescue LoadError
-  require 'json'
-end
 MERB_ROOT = Merb::Server.config[:merb_root] || Dir.pwd
 DIST_ROOT = Merb::Server.config[:dist_root] || Dir.pwd+'/dist'
-MERB_LOGGER = Logger.new("#{MERB_ROOT}/log/merb.log")
+MERB_LOGGER = Logger.new("#{MERB_ROOT}/log/merb.#{Merb::Server.config[:port]}.log")
 # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
 MERB_LOGGER.level = case (Merb::Server.config[:log_level].downcase rescue '')
                     when 'debug'
@@ -54,5 +41,36 @@ MERB_LOGGER.level = case (Merb::Server.config[:log_level].downcase rescue '')
                       Logger::INFO
                     end
+corelib = File.join(File.dirname(__FILE__), 'merb/core_ext')
+Dir.entries(corelib).sort.each {|fn| require File.join(corelib, fn) if fn =~ /\.rb$/}
 lib = File.join(File.dirname(__FILE__), 'merb')
 Dir.entries(lib).sort.each {|fn| require File.join(lib, fn) if fn =~ /\.rb$/}
+class Merb::Controller
+  if Merb::Server.config[:session]
+    require "drb"
+    DRb.start_service('druby://localhost:0')
+    Merb.const_set :DRbSession, DRbObject.new(nil, "druby://#{Merb::Server.config[:host]}:#{Merb::Server.config[:session]}")
+    require "merb/session/merb_drb_session"
+    include ::Merb::SessionMixin
+    puts "drb session mixed in"
+  end
+  if Merb::Server.config[:sql_session]
+    puts "ActiveRecord session mixed in"
+    begin
+      require 'action_controller/flash'
+      puts "Rails session compatibilty on."
+    rescue  LoadError
+      puts "Rails session compatibilty disabled. If you need this then install the actionpack gem"
+    end
+    require "merb/session/merb_ar_session"
+    include ::Merb::SessionMixin
+  end
+  if Merb::Server.config[:basic_auth]
+    require "merb/mixins/basic_authentication_mixin"
+    include ::Merb::Authentication
+    puts "Basic Authentication mixed in"
+  end
+end

data/lib/merb/core_ext.rb ADDED

	@@ -0,0 +1,2 @@
1	+ require File.dirname(__FILE__)+'/core_ext/merb_kernel'
2	+ aquire File.dirname(__FILE__)+'/core_ext/*'

data/lib/merb/{merb_class_extensions.rb → core_ext/merb_class.rb} RENAMED

@@ -1,4 +1,46 @@
 class Class # :nodoc:
+  def cattr_reader(*syms)
+    syms.flatten.each do |sym|
+      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)
+    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
+      EOS
+    end
+  end
+  def cattr_accessor(*syms)
+    cattr_reader(*syms)
+    cattr_writer(*syms)
+  end
   def meta_reader(*syms)
     syms.each do |sym|
       class_eval <<-EOS

data/lib/merb/core_ext/merb_enumerable.rb ADDED

@@ -0,0 +1,7 @@
+module Enumerable
+  def injecting(s)
+    inject(s) do |k, i|
+      yield(k, i); k
+    end
+  end
+end

data/lib/merb/{merb_utils.rb → core_ext/merb_hash.rb} RENAMED

@@ -1,79 +1,3 @@
-class String
-  # reloads controller classes on each request if
-  # :allow_reloading is set to true in the config
-  # file or command line options.
-  def import
-    if Merb::Server.config[:allow_reloading]
-      Object.send(:remove_const, self.camel_case.intern) rescue nil
-      load(self.snake_case  + '.rb')
-    else
-      require(self.snake_case)
-    end
-  end
-  # "FooBar".snake_case #=> "foo_bar"
-  def snake_case
-    return self unless self =~ %r/[A-Z]/
-    self.reverse.scan(%r/[A-Z]+|[^A-Z]*[A-Z]+?/).reverse.map{|word| word.reverse.downcase}.join '_'
-  end
-  # "foo_bar".camel_case #=> "FooBar"
-  def camel_case
-    return self if self =~ %r/[A-Z]/ and self !~ %r/_/
-    words = self.strip.split %r/\s*_+\s*/
-    words.map!{|w| w.downcase.sub(%r/^./){|c| c.upcase}}
-    words.join
-  end
-  # Concatenates a path
-  def /(o)
-    File.join(self, o.to_s)
-  end
-end
-module Enumerable
-  def injecting(s)
-    inject(s) do |k, i|
-      yield(k, i); k
-    end
-  end
-end
-class Numeric
-  def to_currency( pre_symbol='$', thousands=',', decimal='.',
-post_symbol=nil )
-    "#{pre_symbol}#{
-      ( "%.2f" % self ).gsub(
-        /(\d)(?=(?:\d{3})+(?:$|\.))/,
-        "\\1#{thousands}"
-      )
-    }#{post_symbol}"
-  end
-end
-class Symbol
-  # faster Symbol#to_s to speed up routing.
-  def to_s
-    @str_rep ||= id2name.freeze
-  end
-  # ["foo", "bar"].map &:reverse #=> ['oof', 'rab']
-  def to_proc
-     Proc.new{|*args| args.shift.__send__(self, *args)}
-   end
-end
-class Object
-  def returning(value)
-    yield(value)
-    value
-  end
-end
 class Hash
   def with_indifferent_access
     MerbHash.new(self)
@@ -150,5 +74,4 @@ class MerbHash < Hash
     def convert_value(value)
       value.is_a?(Hash) ? value.with_indifferent_access : value
     end
-end
+end

data/lib/merb/core_ext/merb_kernel.rb ADDED

@@ -0,0 +1,16 @@
+module Kernel
+  # Example:
+  #   aquire 'foo/bar/*'
+  # requires all files inside foo/bar - recursive
+  # can take multiple parameters
+  def aquire(*files)
+    files.each do |file|
+      require file if %w(rb so).any?{|f| File.file?("#{file}.#{f}")}
+      $:.each do |path|
+        Dir[File.join(path, file, '*.rb')].each do |file|
+          require file
+        end
+      end
+    end
+  end
+end

data/lib/merb/core_ext/merb_module.rb ADDED

@@ -0,0 +1,10 @@
+class Module
+  def alias_method_chain(target, feature)
+    # Strip out punctuation on predicates or bang methods since
+    # e.g. target?_without_feature is not a valid method name.
+    aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+    yield(aliased_target, punctuation) if block_given?
+    alias_method "#{aliased_target}_without_#{feature}#{punctuation}", target
+    alias_method target, "#{aliased_target}_with_#{feature}#{punctuation}"
+  end
+end

data/lib/merb/core_ext/merb_numeric.rb ADDED

@@ -0,0 +1,20 @@
+class Numeric
+  def to_currency(pre_symbol='$', thousands=',', decimal='.', post_symbol=nil) #:nodoc:
+    "#{pre_symbol}#{("%.2f" % self ).gsub(/(\d)(?=(?:\d{3})+(?:$|\.))/,"\\1#{thousands}")}#{post_symbol}"
+  end
+  def microseconds() Float(self  * (10 ** -6)) end
+  def milliseconds() Float(self  * (10 ** -3)) end
+  def seconds() self end
+  def minutes() 60 * seconds end
+  def hours() 60 * minutes end
+  def days() 24 * hours end
+  def weeks() 7 * days end
+  def months() 30 * days end
+  def years() 365 * days end
+  def decades() 10 * years end
+  %w{ microseconds milliseconds seconds minutes hours days weeks months years decades
+  }.each{ |m| mm = m.chop; alias_method mm, m }
+end