RubyApp 0.0.91 → 0.2.0

data/lib/ruby_app/response.rb

@@ -0,0 +1,58 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'facets/string/interpolate'
+require 'rack'
+
+module RubyApp
+  require 'ruby_app/mixins'
+
+  class Response < ::Rack::Response
+    extend RubyApp::Mixins::DelegateMixin
+
+    def rendered?(template)
+      return @rendered.key?(template)
+    end
+
+    def rendered(template)
+      @rendered[template] = true
+    end
+
+    def content_for(element, name, value = nil, &block)
+      @content[element] ||= {}
+      @content[element][name] = block_given? ? block : String.interpolate { value }
+    end
+
+    def get_content(element, name)
+      @content[element] ||= {}
+      return @content[element][name]
+    end
+
+    def clear_content(element)
+      @content[element] = {}
+    end
+
+    def self.get
+      return Thread.current[:_response]
+    end
+
+    def self.create!
+      Thread.current[:_response] = RubyApp::Response.new
+    end
+
+    def self.destroy!
+      Thread.current[:_response] = nil
+    end
+
+    private
+
+      def initialize
+        super
+        self['Cache-Control'] = 'no-cache'
+        @rendered = {}
+        @content = {}
+      end
+
+  end
+
+end

data/lib/ruby_app/session.rb

@@ -1,16 +1,11 @@
+require 'securerandom'
+
 module RubyApp
-  require 'ruby_app/application'
-  require 'ruby_app/log'
-  require 'ruby_app/mixins/configuration_mixin'
-  require 'ruby_app/mixins/delegate_mixin'
-  require 'ruby_app/mixins/hash_mixin'
-  require 'ruby_app/mixins/translate_mixin'
-  require 'ruby_app/request'
+  require 'ruby_app/mixins'
 
   class Session
+    extend RubyApp::Mixins::ConfigurationMixin
     extend RubyApp::Mixins::DelegateMixin
-    include RubyApp::Mixins::HashMixin
-    include RubyApp::Mixins::ConfigurationMixin
     extend RubyApp::Mixins::TranslateMixin
 
     class Identity
@@ -23,29 +18,20 @@ module RubyApp
 
     end
 
-    attr_reader :session_id, :pages, :data
+    attr_reader :session_id, :expires, :pages, :data
     attr_accessor :identity
 
-    def initialize(session_id, page = nil, data = {})
-      @session_id = session_id
+    def initialize(page = nil)
+      @session_id = RubyApp::Session.generate_session_id(self)
+      @expires = Time.now + RubyApp::Session.configuration.expires
       @pages = []
       @dialogs = []
-      @data = data
+      @data = {}
       @identity = nil
 
       require 'ruby_app/elements/pages/default_page'
       @pages.push(page || RubyApp::Elements::Pages::DefaultPage.new)
 
-      RubyApp::Log.memory("#{self.class}##{__method__}")
-
-    end
-
-    def [](key)
-      @data[key]
-    end
-
-    def []=(key, value)
-      @data[key] = value
     end
 
     def show_dialog(event, dialog, &block)
@@ -69,28 +55,109 @@ module RubyApp
 
     end
 
-    def quit
-      RubyApp::Request.env['rack.session.options'][:drop] = true if RubyApp::Request.env['rack.session.options']
+    def reset!
+      @expires = Time.now + RubyApp::Session.configuration.expires
+    end
+
+    def expired?
+      return @expires <= Time.now
+    end
+
+    def quit!
+      RubyApp::Session.lock_sessions do
+        RubyApp::Session.sessions.delete(self.session_id)
+      end
+    end
+
+    def self.sessions
+      return @@_sessions ||= {}
+    end
+
+    def self.lock_sessions
+      ( @@_lock ||= Mutex.new ).synchronize do
+        yield
+      end
+    end
+
+    def self.get_session(session_id)
+      session = RubyApp::Session.sessions[session_id]
+      if session
+        unless session.expired?
+          session.reset!
+          return session
+        else
+          session.quit!
+          return nil
+        end
+      else
+        return nil
+      end
+    end
+
+    def self.generate_session_id(session)
+      session_id = SecureRandom.hex
+      RubyApp::Session.lock_sessions do
+        while RubyApp::Session.get_session(session_id)
+          session_id = SecureRandom.hex
+        end
+        RubyApp::Session.sessions.store(session_id, session)
+        return session_id
+      end
     end
 
     def self.get
       Thread.current[:_session]
     end
 
-    def self.create!
-      RubyApp::Request.session[:_initialize] = true
-      Thread.current[:_session] = RubyApp::Request.session[:_session] ||= RubyApp::Application.options.session_class.new(RubyApp::Request.env['rack.session.options'] ? RubyApp::Request.env['rack.session.options'][:id] : nil)
-      if block_given?
-        begin
-          yield
-        ensure
-          self.destroy!
+    def self.load!(session_id = nil)
+      Thread.current[:_session] = RubyApp::Session.get_session(session_id) || Kernel.eval(RubyApp::Session.configuration._class).new
+    end
+
+    def self.unload!
+      Thread.current[:_session] = nil
+    end
+
+    def self.start_thread!
+      unless @@_thread ||= nil
+        @@_thread = Thread.new do
+          begin
+            while true
+              #RubyApp::Log.duration(RubyApp::Log.prefix(self, __method__)) do
+                RubyApp::Session.sessions.values.each do |session|
+                  if session.expired?
+                    #RubyApp::Log.memory(RubyApp::Log.prefix(self, __method__)) do
+                      RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} session.quit! #{session.session_id.inspect}")
+                      session.quit!
+                    #end
+                  end
+                end
+              #end
+              sleep(RubyApp::Session.configuration.interval)
+            end
+          rescue Exception => exception
+            RubyApp::Log.exception(exception)
+          end
+        end
+
+        at_exit do
+          begin
+            RubyApp::Session.stop_thread!
+          rescue Exception => exception
+            RubyApp::Log.exception(exception)
+          end
         end
+
+        RubyApp::Log.debug(RubyApp::Log.prefix(self, __method__))
+
       end
     end
 
-    def self.destroy!
-      Thread.current[:_session] = nil
+    def self.stop_thread!
+      if @@_thread ||= nil
+        RubyApp::Log.debug(RubyApp::Log.prefix(self, __method__))
+        @@_thread.exit
+        @@_thread = nil
+      end
     end
 
   end

data/lib/ruby_app/templates/application/Rakefile

@@ -5,7 +5,7 @@ require 'rake'
 
 $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[lib]))
 
-require '_APPLICATION_DOWNCODE_/application'
+require '_APPLICATION_DOWNCODE_'
 
 namespace :_APPLICATION_DOWNCODE_ do
 

data/lib/ruby_app/templates/application/configuration.ru

@@ -0,0 +1,41 @@
+#\ --warn --port 8008 --pid ./rack.pid
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[lib]))
+
+require 'rubygems'
+require 'bundler/setup'
+
+require 'rack'
+
+require 'ruby_app'
+require 'ruby_app/rack'
+
+require '_APPLICATION_DOWNCODE_'
+
+use Rack::ShowExceptions
+use Rack::Reloader
+
+#use RubyApp::Rack::Duration
+#use RubyApp::Rack::Memory
+
+use RubyApp::Rack::Application, :configuration_paths  => [ File.join(RubyApp::ROOT, %w[configuration.yml]),
+                                                           File.join(_APPLICATION_UPCODE_::ROOT, %w[configuration.yml])]
+
+map '/ruby_app/resources' do
+  run Rack::File.new(File.join(RubyApp::ROOT, %w[resources]))
+end
+
+map '/_APPLICATION_DOWNCODE_/resources' do
+  run Rack::File.new(File.join(_APPLICATION_UPCODE_::ROOT, %w[resources]))
+end
+
+map '/favicon.ico' do
+  run Rack::File.new(File.join(RubyApp::ROOT, %w[resources favicon.ico]))
+end
+
+map '/' do
+  use RubyApp::Rack::Request
+  use RubyApp::Rack::Response
+  use RubyApp::Rack::Language
+  use RubyApp::Rack::Session
+  run RubyApp::Rack::Route.new
+end

data/lib/ruby_app/templates/application/configuration.yml

@@ -0,0 +1,16 @@
+default:
+  ruby_app:
+    application:
+      _class: "_APPLICATION_UPCODE_::Application"
+    language:
+      default: "en"
+      paths:
+        - "#{RubyApp::ROOT}/translations"
+        - "#{_APPLICATION_UPCODE_::ROOT}/translations"
+    log:
+      path: "#{_APPLICATION_UPCODE_::ROOT}/process/log/application.log"
+    session:
+      _class: "_APPLICATION_UPCODE_::Session"
+      expires: 900
+      interval: 15
+  _APPLICATION_DOWNCODE_:

data/lib/ruby_app/templates/application/console.rb

@@ -1,16 +1,21 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'ruby_app'
+
 $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[lib]))
 
-require '_APPLICATION_DOWNCODE_/application'
-require '_APPLICATION_DOWNCODE_/session'
-require '_APPLICATION_DOWNCODE_/version'
+require '_APPLICATION_DOWNCODE_'
 
 puts "Running #{__FILE__.inspect}"
 
-options = { :application_class => _APPLICATION_UPCODE_::Application,
-            :session_class => _APPLICATION_UPCODE_::Session,
-            :log_path => File.join(_APPLICATION_UPCODE_::ROOT, %w[log application.log]),
-            :configuration_paths => File.join(_APPLICATION_UPCODE_::ROOT, %w[config.yml]),
-            :default_language => :en,
-            :translations_paths => File.join(_APPLICATION_UPCODE_::ROOT, %w[translations]) }
+RubyApp::Configuration.load!([ File.join(RubyApp::ROOT, %w[configuration.yml]),
+                               File.join(_APPLICATION_UPCODE_::ROOT, %w[configuration.yml])])
+RubyApp::Log.open!
+RubyApp::Application.create!
 
-_APPLICATION_UPCODE_::Application.create! options
+at_exit do
+  RubyApp::Application.destroy!
+  RubyApp::Log.close!
+  RubyApp::Configuration.unload!
+end

data/lib/ruby_app/templates/application/lib/_APPLICATION_DOWNCODE_.rb

@@ -0,0 +1,3 @@
+require '_APPLICATION_DOWNCODE_/application'
+require '_APPLICATION_DOWNCODE_/session'
+require '_APPLICATION_DOWNCODE_/version'

data/lib/ruby_app/templates/application/lib/_APPLICATION_DOWNCODE_/application.rb

@@ -1,14 +1,14 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'ruby_app/application'
+require 'ruby_app'
 
 module _APPLICATION_UPCODE_
 
   class Application < RubyApp::Application
 
-    def initialize(options)
-      super(options)
+    def initialize
+      super
     end
 
   end

data/lib/ruby_app/templates/application/lib/_APPLICATION_DOWNCODE_/elements/pages/default_page.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'ruby_app/elements/page'
+require 'ruby_app/elements'
 
 module _APPLICATION_UPCODE_
 

data/lib/ruby_app/templates/application/lib/_APPLICATION_DOWNCODE_/session.rb

@@ -1,15 +1,15 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'ruby_app/session'
+require 'ruby_app'
 
 module _APPLICATION_UPCODE_
 
   class Session < RubyApp::Session
 
-    def initialize(session_id, page = nil, data = {})
+    def initialize
       require '_APPLICATION_DOWNCODE_/elements/pages/default_page'
-      super(session_id, page || _APPLICATION_UPCODE_::Elements::Pages::DefaultPage.new, data)
+      super(_APPLICATION_UPCODE_::Elements::Pages::DefaultPage.new)
     end
 
   end

data/lib/ruby_app/templates/application/spec/application_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'application' do
+  include_context 'application'
+
+  describe 'positive' do
+
+    specify { RubyApp::Configuration.get.should_not be_nil }
+    specify { RubyApp::Log.get.should_not be_nil }
+    specify { RubyApp::Application.get.should_not be_nil }
+
+  end
+
+  describe 'negative' do
+  end
+
+end

data/lib/ruby_app/templates/application/spec/request_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'request' do
+  include_context 'request'
+
+  describe 'positive' do
+
+    specify { RubyApp::Request.get.should_not be_nil }
+    specify { RubyApp::Response.get.should_not be_nil }
+    specify { RubyApp::Language.get.should_not be_nil }
+    specify { RubyApp::Session.get.should_not be_nil }
+
+  end
+
+  describe 'negative' do
+  end
+
+end

data/lib/ruby_app/templates/application/spec/support/shared.rb

@@ -1,18 +1,43 @@
-require File.join(File.dirname(__FILE__), %w[.. .. application])
-require File.join(File.dirname(__FILE__), %w[.. .. session])
+require 'rubygems'
+require 'bundler/setup'
 
-shared_context '_APPLICATION_UPCODE_::Application' do
+require 'ruby_app'
+
+require '_APPLICATION_DOWNCODE_'
+
+shared_context 'application' do
 
   before(:all) do
-    options = {:application_class => _APPLICATION_UPCODE_::Application,
-               :session_class => _APPLICATION_UPCODE_::Session,
-               :log_path => File.join(File.dirname(__FILE__), %w[.. .. log application.log]),
-               :configuration_paths => File.join(File.dirname(__FILE__), %w[.. .. config.yml])}
-    _APPLICATION_UPCODE_::Application.create(options)
+    RubyApp::Configuration.load!([ File.join(RubyApp::ROOT, %w[configuration.yml]),
+                                   File.join(_APPLICATION_UPCODE_::ROOT, %w[configuration.yml])])
+    RubyApp::Log.open!
+    RubyApp::Application.create!
   end
 
   after(:all) do
-    Pike::Application.destroy
+    RubyApp::Application.destroy!
+    RubyApp::Log.close!
+    RubyApp::Configuration.unload!
+  end
+
+end
+
+shared_context 'request' do
+  include_context 'application'
+
+  before(:each) do
+    RubyApp::Request.create!
+    RubyApp::Response.create!
+    RubyApp::Language.load!
+    RubyApp::Session.load!
+  end
+
+  after(:each) do
+    RubyApp::Session.unload!
+    RubyApp::Language.unload!
+    RubyApp::Response.destroy!
+    RubyApp::Request.destroy!
   end
 
 end
+