merb 0.0.7 → 0.0.8

data/lib/merb/mixins/responder_mixin.rb

@@ -24,7 +24,8 @@ module Merb
         :yaml => %w[application/yaml text/yaml],
         :text => %w[text/plain],
         :html => %w[text/html */* application/html],
-        :xml  => %w[application/xml]
+        :xml  => %w[application/xml],
+        :js   => %w[application/json text/x-json]
       }
 
       def method_missing(method, *args)

data/lib/merb/session/merb_ar_session.rb

@@ -0,0 +1,120 @@
+require 'active_record'
+
+module Merb
+  
+  module SessionMixin
+
+    def setup_session
+      MERB_LOGGER.info("Setting up session")
+      @session = Merb::Session.persist(cookies)
+      @fingerprint_before = Marshal.dump(@session).hash
+    end
+
+    def finalize_session
+      MERB_LOGGER.info("Finalize session")
+      unless Marshal.dump(@session).hash == @fingerprint_before
+        @session.save
+      end
+      @headers['Set-Cookie'] = @cookies.map { |k,v| "#{k}=#{escape(v)}; path=/" if v != @cookies[k] } - [nil]
+    end 
+
+  end
+
+  class Session < ::ActiveRecord::Base
+    # Customizable data column name.  Defaults to 'data'.
+    cattr_accessor :data_column_name
+    self.data_column_name = 'data'
+  
+    before_save :marshal_data!
+    before_save :raise_on_session_data_overflow!
+  
+    RAND_CHARS = [*'A'..'Z'] + [*'0'..'9'] + [*'a'..'z']
+  
+    class << self
+      # Generates a new session ID and creates a row for the new session in the database.
+      def generate(cookies)
+        rand_max = RAND_CHARS.size
+        sid = (0...32).inject("") { |ret,_| ret << RAND_CHARS[rand(rand_max)] }
+        sess = create(:session_id => sid, :data => {})
+        cookies[:session_id] = sess.session_id
+        sess
+      end
+
+      # Gets the existing session based on the <tt>session_id</tt> available in cookies.
+      # If none is found, generates a new session.
+      def persist(cookies)
+        if cookies[:session_id]
+          session = find_by_session_id(cookies[:session_id])
+        end
+        unless session
+          session = generate(cookies)
+        end
+        session
+      end
+      
+      # Don't try to reload ARStore::Session in dev mode.
+      def reloadable? #:nodoc:
+        false
+      end
+  
+      def data_column_size_limit
+        @data_column_size_limit ||= columns_hash[@@data_column_name].limit
+      end
+
+      def marshal(data)   Base64.encode64(Marshal.dump(data)) if data end
+      def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
+  
+      def create_table!
+        connection.execute <<-end_sql
+          CREATE TABLE #{table_name} (
+            id INTEGER PRIMARY KEY,
+            #{connection.quote_column_name('session_id')} TEXT UNIQUE,
+            #{connection.quote_column_name(@@data_column_name)} TEXT(255)
+          )
+        end_sql
+      end
+  
+      def drop_table!
+        connection.execute "DROP TABLE #{table_name}"
+      end
+    end
+    
+    def [](key)
+      data[key]
+    end
+    
+    def []=(key, val)
+      data[key] = val  
+    end
+      
+    # Lazy-unmarshal session state.
+    def data
+      @data ||= self.class.unmarshal(read_attribute(@@data_column_name)) || {}
+    end
+  
+    # Has the session been loaded yet?
+    def loaded?
+      !! @data
+    end
+  
+    private
+      attr_writer :data
+  
+      def marshal_data!
+        return false if !loaded?
+        write_attribute(@@data_column_name, self.class.marshal(self.data))
+      end
+  
+      # Ensures that the data about to be stored in the database is not
+      # larger than the data storage column. Raises
+      # ActionController::SessionOverflowError.
+      def raise_on_session_data_overflow!
+        return false if !loaded?
+        limit = self.class.data_column_size_limit
+        if loaded? and limit and read_attribute(@@data_column_name).size > limit
+          raise MerbController::SessionOverflowError
+        end
+      end
+  end
+
+end

data/lib/merb/session/merb_drb_session.rb

@@ -16,12 +16,6 @@ module Merb
       @headers['Set-Cookie'] = @cookies.map { |k,v| "#{k}=#{escape(v)}; path=/" if v != @k[k] } - [nil]
     end 
 
-    # accessor for @session. Please use session and 
-    # never @session directly.    
-    def session
-      @session  
-    end
-
   end
   
   class Session

data/lib/merb/vendor/paginator/paginator.rb

@@ -1,121 +1,124 @@
 require 'forwardable'
 
-class Paginator
-  
-  VERSION = '1.0.6'
-
-  class ArgumentError < ::ArgumentError; end
-  class MissingCountError < ArgumentError; end
-  class MissingSelectError < ArgumentError; end  
-  
-  attr_reader :per_page  
-  
-  # Instantiate a new Paginator object
-  #
-  # Provide:
-  # * A total count of the number of objects to paginate
-  # * The number of objects in each page
-  # * A block that returns the array of items
-  #   * The block is passed the item offset 
-  #     (and the number of items to show per page, for
-  #     convenience, if the arity is 2)
-  def initialize(count, per_page, &select)
-    @count, @per_page = count, per_page
-    unless select
-      raise MissingSelectError, "Must provide block to select data for each page"
-    end
-    @select = select
-  end
-  
-  # Total number of pages
-  def number_of_pages
-    (@count / @per_page) + (@count % @per_page > 0 ? 1 : 0)
-  end
-  
-  # First page object
-  def first
-    page 1
-  end
-  
-  # Last page object
-  def last
-    page number_of_pages
-  end
-  
-  # Iterate through pages
-  def each
-    each_with_index do |item, index|
-      yield item
-    end
-  end
-  
-  # Iterate through pages with indices
-  def each_with_index
-    1.upto(number_of_pages) do |number|
-      yield(page(number), number - 1)
-    end
-  end
-  
-  # Retrieve page object by number
-  def page(number)
-    number = (n = number.to_i) > 0 ? n : 1
-    Page.new(self, number, lambda { 
-      offset = (number - 1) * @per_page
-      args = [offset]
-      args << @per_page if @select.arity == 2
-      @select.call(*args)
-    })
-  end
+module Merb
+  class Paginator
+    
+    VERSION = '1.0.6'
   
-  # Page object
-  #
-  # Retrieves items for a page and provides metadata about the position
-  # of the page in the paginator
-  class Page
+    class ArgumentError < ::ArgumentError; end
+    class MissingCountError < ArgumentError; end
+    class MissingSelectError < ArgumentError; end  
     
-    extend Forwardable
-    def_delegator :@pager, :first, :first
-    def_delegator :@pager, :last, :last
-    def_delegator :items, :each
-    def_delegator :items, :each_with_index    
-        
-    attr_reader :number, :pager
+    attr_reader :per_page  
     
-    def initialize(pager, number, select) #:nodoc:
-      @pager, @number = pager, number
+    # Instantiate a new Paginator object
+    #
+    # Provide:
+    # * A total count of the number of objects to paginate
+    # * The number of objects in each page
+    # * A block that returns the array of items
+    #   * The block is passed the item offset 
+    #     (and the number of items to show per page, for
+    #     convenience, if the arity is 2)
+    def initialize(count, per_page, &select)
+      @count, @per_page = count, per_page
+      unless select
+        raise MissingSelectError, "Must provide block to select data for each page"
+      end
       @select = select
     end
     
-    # Retrieve the items for this page
-    # * Caches
-    def items
-      @items ||= @select.call
+    # Total number of pages
+    def number_of_pages
+      (@count / @per_page) + (@count % @per_page > 0 ? 1 : 0)
+    end
+    
+    # First page object
+    def first
+      page 1
     end
     
-    # Checks to see if there's a page before this one
-    def prev?
-      @number > 1
+    # Last page object
+    def last
+      page number_of_pages
     end
     
-    # Get previous page (if possible)
-    def prev
-      @pager.page(@number - 1) if prev?
+    # Iterate through pages
+    def each
+      each_with_index do |item, index|
+        yield item
+      end
     end
     
-    # Checks to see if there's a page after this one
-    def next?
-      @number < @pager.number_of_pages
+    # Iterate through pages with indices
+    def each_with_index
+      1.upto(number_of_pages) do |number|
+        yield(page(number), number - 1)
+      end
     end
     
-    # Get next page (if possible)
-    def next
-      @pager.page(@number + 1) if next?
+    # Retrieve page object by number
+    def page(number)
+      number = (n = number.to_i) > 0 ? n : 1
+      Page.new(self, number, lambda { 
+        offset = (number - 1) * @per_page
+        args = [offset]
+        args << @per_page if @select.arity == 2
+        @select.call(*args)
+      })
     end
     
-    def ==(other) #:nodoc:
-      @pager == other.pager && self.number == other.number
+    # Page object
+    #
+    # Retrieves items for a page and provides metadata about the position
+    # of the page in the paginator
+    class Page
+      
+      extend Forwardable
+      def_delegator :@pager, :first, :first
+      def_delegator :@pager, :last, :last
+      def_delegator :items, :each
+      def_delegator :items, :each_with_index    
+          
+      attr_reader :number, :pager
+      
+      def initialize(pager, number, select) #:nodoc:
+        @pager, @number = pager, number
+        @select = select
+      end
+      
+      # Retrieve the items for this page
+      # * Caches
+      def items
+        @items ||= @select.call
+      end
+      
+      # Checks to see if there's a page before this one
+      def prev?
+        @number > 1
+      end
+      
+      # Get previous page (if possible)
+      def prev
+        @pager.page(@number - 1) if prev?
+      end
+      
+      # Checks to see if there's a page after this one
+      def next?
+        @number < @pager.number_of_pages
+      end
+      
+      # Get next page (if possible)
+      def next
+        @pager.page(@number + 1) if next?
+      end
+      
+      def ==(other) #:nodoc:
+        @pager == other.pager && self.number == other.number
+      end
+      
     end
     
   end
   
-end
+end  

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
-date: 2006-11-29 00:00:00 -08:00
+  version: 0.0.8
+date: 2006-12-17 00:00:00 -08:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -40,24 +40,41 @@ files:
 - lib/merb
 - lib/merb.rb
 - lib/merb_tasks.rb
-- lib/mutex_hotfix.rb
 - lib/tasks
-- lib/merb/merb_class_extensions.rb
+- lib/merb/core_ext
+- lib/merb/core_ext.rb
+- lib/merb/merb_constants.rb
 - lib/merb/merb_controller.rb
+- lib/merb/merb_drb_server.rb
+- lib/merb/merb_exceptions.rb
 - lib/merb/merb_handler.rb
+- lib/merb/merb_request.rb
 - lib/merb/merb_router.rb
-- lib/merb/merb_utils.rb
+- lib/merb/merb_upload_handler.rb
+- lib/merb/merb_upload_progress.rb
+- lib/merb/merb_view_context.rb
+- lib/merb/merb_yaml_store.rb
 - lib/merb/mixins
 - lib/merb/session
 - lib/merb/vendor
+- lib/merb/core_ext/merb_class.rb
+- lib/merb/core_ext/merb_enumerable.rb
+- lib/merb/core_ext/merb_hash.rb
+- lib/merb/core_ext/merb_kernel.rb
+- lib/merb/core_ext/merb_module.rb
+- lib/merb/core_ext/merb_numeric.rb
+- lib/merb/core_ext/merb_object.rb
+- lib/merb/core_ext/merb_string.rb
+- lib/merb/core_ext/merb_symbol.rb
 - lib/merb/mixins/basic_authentication_mixin.rb
 - lib/merb/mixins/controller_mixin.rb
+- lib/merb/mixins/erubis_capture_mixin.rb
 - lib/merb/mixins/javascript_mixin.rb
+- lib/merb/mixins/merb_status_codes.rb
 - lib/merb/mixins/render_mixin.rb
 - lib/merb/mixins/responder_mixin.rb
-- lib/merb/session/merb_drb_server.rb
+- lib/merb/session/merb_ar_session.rb
 - lib/merb/session/merb_drb_session.rb
-- lib/merb/session/merb_session.rb
 - lib/merb/vendor/paginator
 - lib/merb/vendor/paginator/paginator.rb
 - lib/merb/vendor/paginator/README.txt
@@ -77,10 +94,14 @@ files:
 - examples/app_skeleton/dist/public
 - examples/app_skeleton/dist/schema
 - examples/app_skeleton/dist/app/controllers
+- examples/app_skeleton/dist/app/helpers
 - examples/app_skeleton/dist/app/models
 - examples/app_skeleton/dist/app/views
+- examples/app_skeleton/dist/app/helpers/global_helper.rb
 - examples/app_skeleton/dist/app/views/layout
+- examples/app_skeleton/dist/conf/merb.yml
 - examples/app_skeleton/dist/conf/merb_init.rb
+- examples/app_skeleton/dist/conf/mup.conf
 - examples/app_skeleton/dist/conf/router.rb
 - examples/app_skeleton/dist/public/files
 - examples/app_skeleton/dist/public/images
@@ -107,16 +128,20 @@ files:
 - examples/sample_app/dist/public
 - examples/sample_app/dist/schema
 - examples/sample_app/dist/app/controllers
+- examples/sample_app/dist/app/helpers
 - examples/sample_app/dist/app/models
 - examples/sample_app/dist/app/views
 - examples/sample_app/dist/app/controllers/files.rb
 - examples/sample_app/dist/app/controllers/posts.rb
 - examples/sample_app/dist/app/controllers/test.rb
+- examples/sample_app/dist/app/helpers/global_helper.rb
+- examples/sample_app/dist/app/helpers/posts_helper.rb
 - examples/sample_app/dist/app/models/comment.rb
 - examples/sample_app/dist/app/models/post.rb
 - examples/sample_app/dist/app/views/files
 - examples/sample_app/dist/app/views/layout
 - examples/sample_app/dist/app/views/posts
+- examples/sample_app/dist/app/views/shared
 - examples/sample_app/dist/app/views/test
 - examples/sample_app/dist/app/views/files/progress.jerb
 - examples/sample_app/dist/app/views/files/start.herb
@@ -129,6 +154,7 @@ files:
 - examples/sample_app/dist/app/views/posts/new.herb
 - examples/sample_app/dist/app/views/posts/show.herb
 - examples/sample_app/dist/app/views/posts/xml_test.xerb
+- examples/sample_app/dist/app/views/shared/_test.herb
 - examples/sample_app/dist/app/views/test/foo.herb
 - examples/sample_app/dist/app/views/test/hello.herb
 - examples/sample_app/dist/app/views/test/json.jerb
@@ -140,6 +166,7 @@ files:
 - examples/sample_app/dist/public/images
 - examples/sample_app/dist/public/javascripts
 - examples/sample_app/dist/public/stylesheets
+- examples/sample_app/dist/public/test.html
 - examples/sample_app/dist/public/images/bg.jpg
 - examples/sample_app/dist/public/images/book.gif
 - examples/sample_app/dist/public/images/booksmall.gif
@@ -160,9 +187,9 @@ files:
 - examples/sample_app/dist/schema/schema.rb
 - examples/sample_app/dist/schema/migrations/001_add_comments_to_posts.rb
 - examples/sample_app/dist/schema/migrations/002_add_sessions_table.rb
+- examples/sample_app/log/merb.4000.pid
 - examples/sample_app/script/merb_stop
 - examples/sample_app/script/new_migration
-- examples/sample_app/script/startdrb
 - examples/sample_app/test/fixtures
 - examples/sample_app/test/spec
 - examples/sample_app/test/test_helper.rb
@@ -220,3 +247,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: