rubylet 0.1.0-java → 1.0.0-java

data/VERSION

@@ -1 +1 @@
-0.1.0
+1.0.0

data/lib/rubylet.rb

@@ -1,2 +1,3 @@
 require 'rubylet/servlet'
 require 'rubylet/environment'
+require 'rubylet/session/container_store'

data/lib/rubylet/environment.rb

@@ -107,11 +107,11 @@ class Rubylet::Environment < Hash
     self['rack.multiprocess'] = false
     self['rack.run_once']     = false
 
-    if servlet.param('useSessions')
+    if servlet.param('rubylet.useSessions')
       self['rack.session']      = Rubylet::Session.new(req)
     end
 
-    if servlet.param('userLogger')
+    if servlet.param('rubylet.useLogger')
       self['rack.logger']       = Rubylet::Logger.new(context)
     end
       
@@ -130,6 +130,7 @@ class Rubylet::Environment < Hash
     self['SERVER_PROTOCOL']   = req.getProtocol
     self['SERVER_SOFTWARE']   = context.getServerInfo
 
+    self['java.servlet_request'] = req
     self['java.context_path'] = req.getContextPath
     self['java.path_info']    = req.getPathInfo
     self['java.servlet_path'] = req.getServletPath

data/lib/rubylet/servlet.rb

@@ -13,11 +13,11 @@ module Rubylet
       @servlet_config = servletConfig
       @context = servletConfig.getServletContext
       
-      rackup_file = param('rackupFile') || 'config.ru'
+      rackup_file = param('rubylet.rackupFile') || 'config.ru'
       @app, _opts = Rack::Builder.parse_file(rackup_file)
 
       if defined?(Rails) && defined?(Rails::Application) && (@app < Rails::Application)
-        servlet_path = @servlet_config.getInitParameter('servletPath')
+        servlet_path = @servlet_config.getInitParameter('rubylet.servletPath')
         relative_root = if servlet_path 
                           File.join(@context.context_path, servlet_path)
                         else

data/lib/rubylet/session.rb

@@ -1,33 +1,63 @@
-class Rubylet::Session
+# A Rack compatible session object that forwards to an underlying
+# +javax.servlet.http.HttpSession+.
+module Rubylet
+  class Session
+    # @param [javax.servlet.http.HttpServletRequest] req
+    # @param [Hash] options
+    # @option options [Integer] :expire_after The max inactive interval, in seconds
+    def initialize(req, options={})
+      @javaSession = req.getSession
 
-  def initialize(req)
-    @javaSession = req.getSession
-  end
-  
-  def store(key, value)
-    @javaSession.setAttribute(key, value)
-  end
-  
-  alias_method :[]=, :store
-  
-  def fetch(key, default = nil)
-    @javaSession.getAttribute(key) || default
-  end
-  
-  alias_method :[], :fetch
-  
-  def delete(key)
-    @javaSession.removeAttribute(key)
-  end
-  
-  def clear
-    @javaSession.getAttributeNames.each {|key| delete(key) }
-  end
+      if @javaSession.isNew
+        if exp = options[:expire_after]
+          req.setMaxInactiveInterval exp.to_i
+        end
+      end
+    end
+    
+    def store(key, value)
+      @javaSession.setAttribute(key, value)
+    end
+    alias_method :[]=, :store
+    
+    def fetch(key, default = nil)
+      @javaSession.getAttribute(key) || default
+    end
+    alias_method :[], :fetch
+    
+    def delete(key)
+      @javaSession.removeAttribute(key)
+    end
+    
+    def clear
+      @javaSession.getAttributeNames.each {|key| delete(key) }
+    end
+
+    # This method is not required by the Rack SPEC for session
+    # objects, but Rails calls it anyway in +actionpack (3.2.9)
+    # lib/action_dispatch/middleware/flash.rb:258:in `call'+
+    def has_key?(key)
+      !(fetch(key).nil?)
+    end
+    alias_method :include?, :has_key?
+    alias_method :key?, :has_key?
+    alias_method :member?, :has_key?
+
+    # Used by Rails but not required by Rack.
+    def destroy
+      @javaSession.invalidate
+    end
+
+    def to_hash
+      hash = {}
+      @javaSession.getAttributeNames.each do
+        |key| hash[key] = @javaSession.getAttribute(key)
+      end
+      hash
+    end
 
-  def to_hash
-    hash = {}
-    @javaSession.getAttributeNames.each {|key| hash[key] = @javaSession.getAttribute(key) }
-    hash
+    def inspect
+      to_hash.inspect
+    end
   end
-  
 end

data/lib/rubylet/session/container_store.rb

@@ -0,0 +1,27 @@
+require 'rubylet/session'
+
+# Rack middleware to make the servlet container's sessions available to ruby.
+module Rubylet
+  class Session
+    class ContainerStore
+      def initialize(app, options={})
+        @app = app
+        @options = options
+      end
+
+      def call(env)
+        context(env)
+      end
+
+      # For Rack::Util::Context
+      def context(env, app=@app)
+        if req = env['java.servlet_request']
+          env['rack.session'] = Session.new(req, @options)
+        else
+          env['rack.errors'].puts 'java.servlet_request not found; cannot make session'
+        end
+        app.call(env)
+      end
+    end
+  end
+end

metadata

@@ -2,15 +2,69 @@
 name: rubylet
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.0
+  version: 1.0.0
 platform: java
 authors:
 - CG Labs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: mini_aether
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: minitest-matchers
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,18 +129,19 @@ files:
 - VERSION
 - MIT-LICENSE
 - lib/rubylet.rb
-- lib/rubylet/mem_file_io.rb
 - lib/rubylet/environment.rb
-- lib/rubylet/rewindable_io.rb
-- lib/rubylet/input.rb
-- lib/rubylet/tee_io.rb
 - lib/rubylet/errors.rb
-- lib/rubylet/session.rb
+- lib/rubylet/input.rb
 - lib/rubylet/logger.rb
+- lib/rubylet/mem_file_io.rb
+- lib/rubylet/rewindable_io.rb
 - lib/rubylet/servlet.rb
+- lib/rubylet/session.rb
+- lib/rubylet/tee_io.rb
+- lib/rubylet/session/container_store.rb
 - spec/spec_helper.rb
-- spec/rubylet/rewindable_io_spec.rb
 - spec/rubylet/mem_file_io_spec.rb
+- spec/rubylet/rewindable_io_spec.rb
 - spec/rubylet/tee_io_spec.rb
 homepage:
 licenses: []
@@ -98,21 +153,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
       segments:
       - 0
       hash: 2
+      version: !binary |-
+        MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
       segments:
       - 0
       hash: 2
+      version: !binary |-
+        MA==
   none: false
 requirements: []
 rubyforge_project: