RubyApp 0.0.91 → 0.2.0

data/lib/ruby_app/elements/pages/test_pages/link_test_page.rb

@@ -5,11 +5,8 @@ module RubyApp
     module Pages
 
       module TestPages
-        require 'ruby_app/elements/link'
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/pages/blank_page'
-        require 'ruby_app/elements/pages/test_pages/linked_test_page'
-        require 'ruby_app/session'
+        require 'ruby_app'
+        require 'ruby_app/elements'
 
         class LinkTestPage < RubyApp::Elements::Pages::BlankPage
 
@@ -22,6 +19,7 @@ module RubyApp
 
             @link = RubyApp::Elements::Link.new
             @link.clicked do |element, event|
+              require 'ruby_app/elements/pages/test_pages/linked_test_page'
               RubyApp::Session.pages.push(RubyApp::Elements::Pages::TestPages::LinkedTestPage.new)
               event.refresh
             end

data/lib/ruby_app/elements/pages/test_pages/linked_test_page.rb

@@ -5,8 +5,7 @@ module RubyApp
     module Pages
 
       module TestPages
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/pages/blank_page'
+        require 'ruby_app/elements'
 
         class LinkedTestPage < RubyApp::Elements::Pages::BlankPage
 

data/lib/ruby_app/elements/pages/test_pages/list_test_page.rb

@@ -5,12 +5,8 @@ module RubyApp
     module Pages
 
       module TestPages
-        require 'ruby_app/elements/dialogs/message_dialog'
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/pages/blank_page'
-        require 'ruby_app/elements/list'
-        require 'ruby_app/elements/lists/select'
-        require 'ruby_app/session'
+        require 'ruby_app'
+        require 'ruby_app/elements'
 
         class ListTestPage < RubyApp::Elements::Pages::BlankPage
 
@@ -29,7 +25,7 @@ module RubyApp
                              'Item 05' ]
             @list.clicked do |element, event|
               RubyApp::Session.show_dialog(event, RubyApp::Elements::Dialogs::MessageDialog.new(self.translate.message_dialog.message.title,
-                                                                                         self.translate.message_dialog.message.message(event.item)))
+                                                                                                self.translate.message_dialog.message.message(event.item)))
             end
 
             @select = RubyApp::Elements::Lists::Select.new
@@ -40,7 +36,7 @@ module RubyApp
                                'Item 15' ]
             @select.clicked do |element, event|
               RubyApp::Session.show_dialog(event, RubyApp::Elements::Dialogs::MessageDialog.new(self.translate.message_dialog.message.title,
-                                                                                         self.translate.message_dialog.message.message(@select.selected_item)))
+                                                                                                self.translate.message_dialog.message.message(@select.selected_item)))
             end
 
           end

data/lib/ruby_app/elements/pages/test_pages/markdown_test_page.rb

@@ -5,10 +5,8 @@ module RubyApp
     module Pages
 
       module TestPages
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/pages/blank_page'
-        require 'ruby_app/elements/pages/test_pages/linked_test_page'
-        require 'ruby_app/session'
+        require 'ruby_app'
+        require 'ruby_app/elements'
 
         class MarkdownTestPage < RubyApp::Elements::Pages::BlankPage
 
@@ -20,6 +18,7 @@ module RubyApp
             @markdown = RubyApp::Elements::Markdown.new
             @markdown.clicked do |element, event|
               if event.name == "go"
+                require 'ruby_app/elements/pages/test_pages/linked_test_page'
                 RubyApp::Session.pages.push(RubyApp::Elements::Pages::TestPages::LinkedTestPage.new)
                 event.refresh
               end

data/lib/ruby_app/elements/pages/test_pages/test_page.rb

@@ -5,13 +5,8 @@ module RubyApp
     module Pages
 
       module TestPages
-        require 'ruby_app/elements/dialogs/exception_dialog'
-        require 'ruby_app/elements/dialogs/message_dialog'
-        require 'ruby_app/elements/input'
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/pages/blank_page'
-        require 'ruby_app/request'
-        require 'ruby_app/session'
+        require 'ruby_app'
+        require 'ruby_app/elements'
 
         class TestPage < RubyApp::Elements::Pages::BlankPage
 
@@ -35,7 +30,7 @@ module RubyApp
             @input.changed do |element, event|
               event.set_cookie('_cookie', @input.value)
               RubyApp::Session.show_dialog(event, RubyApp::Elements::Dialogs::MessageDialog.new(self.translate.message_dialog.message.title,
-                                                                                         self.translate.message_dialog.message.message(@input.value)))
+                                                                                                self.translate.message_dialog.message.message(@input.value)))
             end
 
           end

data/lib/ruby_app/exceptions.rb

@@ -0,0 +1,2 @@
+require 'ruby_app/exceptions/base/base_exception'
+require 'ruby_app/exceptions/session_invalid_exception'

data/lib/ruby_app/exceptions/base/base_exception.rb

@@ -3,7 +3,7 @@ module RubyApp
   module Exceptions
 
     module Base
-      require 'ruby_app/mixins/translate_mixin'
+      require 'ruby_app/mixins'
 
       class BaseException < Exception
         extend RubyApp::Mixins::TranslateMixin

data/lib/ruby_app/language.rb

@@ -1,29 +1,23 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'facets/string/interpolate'
 require 'r18n-core'
 
 module RubyApp
-  require 'ruby_app/application'
-  require 'ruby_app/mixins/delegate_mixin'
-  require 'ruby_app/request'
+  require 'ruby_app/mixins'
 
   class Language < R18n::I18n
+    extend RubyApp::Mixins::ConfigurationMixin
     extend RubyApp::Mixins::DelegateMixin
 
     def self.get
-      R18n.get
+      return R18n.get
     end
 
-    def self.load!
-      R18n.thread_set(RubyApp::Language.new(RubyApp::Request.language, RubyApp::Application.options.translations_paths))
-      if block_given?
-        begin
-          yield
-        ensure
-          self.unload!
-        end
-      end
+    def self.load!(language = nil)
+      paths = RubyApp::Language.configuration.paths.collect { |path| String.interpolate { path } }
+      R18n.thread_set(RubyApp::Language.new(language || RubyApp::Language.configuration.default, paths))
     end
 
     def self.unload!
@@ -32,8 +26,8 @@ module RubyApp
 
     private
 
-      def initialize(language, translations_paths)
-        super(language, translations_paths)
+      def initialize(language, paths)
+        super(language, paths)
       end
 
   end

data/lib/ruby_app/log.rb

@@ -1,20 +1,35 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'facets/string/interpolate'
 require 'fileutils'
 require 'logger'
 
 module RubyApp
-  require 'ruby_app/mixins/delegate_mixin'
+  require 'ruby_app/mixins'
 
   class Log < ::Logger
+    extend RubyApp::Mixins::ConfigurationMixin
     extend RubyApp::Mixins::DelegateMixin
 
     def duration(message)
       start = Time.now
-      result = yield if block_given?
-      self.debug("#{message} duration=#{Time.now - start}s")
-      return result
+      begin
+        return yield if block_given?
+      ensure
+        self.debug("#{message} #{Time.now - start}s")
+      end
+    end
+
+    def memory(message)
+      begin
+        return yield if block_given?
+      ensure
+        GC.start
+        count = ObjectSpace.each_object { |item| }
+        self.debug("#{message}  count=#{count}")
+        self.debug("#{message} memory=#{`ps -o rss= -p #{$$}`.to_i}")
+      end
     end
 
     def exception(exception)
@@ -27,38 +42,27 @@ module RubyApp
       self.error('-' * 80)
     end
 
-    def memory(message)
-      self.debug("#{message} memory_usage=#{`ps -o rss= -p #{$$}`.to_i}")
-    end
-
-    def hash(hash, indent = 0)
-      hash.each do |name, value|
-        if value.is_a?(Hash)
-          self.debug("#{' ' * 2 * indent}#{name.inspect}")
-          self.debug_hash(value, indent + 1)
-        else
-          self.debug("#{' ' * 2 * indent}#{name.inspect} = #{value.inspect}")
-        end
-      end
+    def self.prefix(object, method)
+      return "#{object.is_a?(Class) ? object : object.class}#{object.is_a?(Class) ? '.' : '#'}#{method}"
     end
 
     def self.get
-      @@_log
-    end
-
-    def self.prefix(object, method)
-      return "#{object.is_a?(Class) ? object : object.class}#{object.is_a?(Class) ? '.' : '#'}#{method}"
+      ( @@_log ||= nil ) || ( @@_standard_log ||= RubyApp::Log.new($stdout) )
     end
 
-    def self.open!(path)
-      directory = File.dirname(path)
-      FileUtils.mkdir_p(directory)
-      @@_log = RubyApp::Log.new(path)
+    def self.open!
+      unless @@_log ||= nil
+        path = String.interpolate { RubyApp::Log.configuration.path }
+        FileUtils.mkdir_p(File.dirname(path))
+        @@_log = RubyApp::Log.new(path)
+      end
     end
 
     def self.close!
-      @@_log.close if @@_log
-      @@_log = nil
+      if @@_log ||= nil
+        @@_log.close
+        @@_log = nil
+      end
     end
 
     private

data/lib/ruby_app/mixins.rb

@@ -0,0 +1,7 @@
+require 'ruby_app/mixins/configuration_mixin'
+require 'ruby_app/mixins/delegate_mixin'
+require 'ruby_app/mixins/hash_mixin'
+require 'ruby_app/mixins/render_mixin'
+require 'ruby_app/mixins/route_mixin'
+require 'ruby_app/mixins/template_mixin'
+require 'ruby_app/mixins/translate_mixin'

data/lib/ruby_app/mixins/configuration_mixin.rb

@@ -3,7 +3,7 @@ module RubyApp
   module Mixins
 
     module ConfigurationMixin
-      require 'ruby_app/configuration'
+      require 'ruby_app'
 
       def configuration
 

data/lib/ruby_app/mixins/delegate_mixin.rb

@@ -5,7 +5,7 @@ module RubyApp
     module DelegateMixin
 
       def method_missing(name, *arguments, &block)
-        self.get.send(name, *arguments, &block)
+        return self.get.send(name, *arguments, &block)
       end
 
     end

data/lib/ruby_app/mixins/hash_mixin.rb

@@ -9,7 +9,7 @@ module RubyApp
           capture = $~.captures[0]
           self[capture.to_sym] = arguments[0]
         else
-          self[name.to_sym]
+          return self[name.to_sym]
         end
       end
 

data/lib/ruby_app/mixins/render_mixin.rb

@@ -8,59 +8,57 @@ module RubyApp
   module Mixins
 
     module RenderMixin
-      require 'ruby_app/request'
+      require 'ruby_app'
 
-      def rendered?(template)
-        unless RubyApp::Request.rendered?(template)
+      def templates(format)
+        return self.is_a?(Class) ? self.get_templates(format) : self.class.get_templates(format)
+      end
+
+      def rendered?(file)
+        unless RubyApp::Response.rendered?(file)
           yield
-          RubyApp::Request.rendered(template)
+          RubyApp::Response.rendered(file)
         end
       end
 
       def content_for(name, value = nil, &block)
-        RubyApp::Request.content_for(self, name, value, &block)
+        return RubyApp::Response.content_for(self, name, value, &block)
       end
 
-      def render(format, write_cache = false)
-        cache = self.is_a?(Class) ? self.get_cache(format) : self.class.get_cache(format)
-        if File.exists?(cache)
-          self.rendered?(cache) do
-            return File.read(cache)
-          end
-        else
-          templates = self.is_a?(Class) ? self.get_templates(format) : self.class.get_templates(format)
-          unless templates.empty?
-            self.init_haml_helpers
-            begin
-              yield(self) if block_given?
-              templates.each_with_index do |template, index|
-                content = Haml::Engine.new(File.read(template), :filename => template).render(self) do |*arguments|
-                  if arguments.empty?
-                    index == 0 ? nil : RubyApp::Request.get_content(self, templates[index - 1])
+      def render(format)
+
+        templates = self.templates(format)
+
+        unless templates.empty?
+
+          self.init_haml_helpers unless @haml_buffer
+
+          begin
+
+            yield(self) if block_given?
+
+            templates.each_with_index do |template, index|
+              content = Haml::Engine.new(File.read(template), :filename => template).render(self) do |*arguments|
+                if arguments.empty?
+                  index == 0 ? nil : RubyApp::Response.get_content(self, templates[index - 1])
+                else
+                  _content = RubyApp::Response.get_content(self, arguments[0])
+                  if self.block_is_haml?(_content)
+                    self.capture_haml(arguments, &_content)
                   else
-                    _content = RubyApp::Request.get_content(self, arguments[0])
-                    if self.block_is_haml?(_content)
-                      self.capture_haml(arguments, &_content)
-                    else
-                      _content
-                    end
+                    _content
                   end
                 end
-                RubyApp::Request.content_for(self, template, content)
-              end
-              if cache && write_cache
-                cache_directory = File.dirname(cache)
-                Dir.mkdir(cache_directory) unless File.exists?(cache_directory)
-                File.open(cache, 'w') do |file|
-                  file.write(RubyApp::Request.get_content(self, templates.last))
-                  file.flush
-                end
               end
-              return RubyApp::Request.get_content(self, templates.last)
-            ensure
-              RubyApp::Request.clear_content(self)
+              RubyApp::Response.content_for(self, template, content)
             end
+
+            return RubyApp::Response.get_content(self, templates.last)
+
+          ensure
+            RubyApp::Response.clear_content(self)
           end
+
         end
       end
 

data/lib/ruby_app/mixins/route_mixin.rb

@@ -25,11 +25,7 @@ module RubyApp
       end
 
       def routes
-        @_routes ||= []
-      end
-
-      def clear_routes
-        self.routes.clear
+        return @_routes ||= []
       end
 
     end

data/lib/ruby_app/mixins/template_mixin.rb

@@ -5,13 +5,11 @@ module RubyApp
     module TemplateMixin
 
       def template_name
-
         name = self.to_s.split('::').last
         name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
         name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
         name.tr!("-", "_")
-        name.downcase
-
+        return name.downcase
       end
 
       def template_path(format, path)
@@ -19,7 +17,7 @@ module RubyApp
       end
 
       def exclude_parent_template?(format)
-        ( @_exclude_parent_template_formats ||= [] ).include?(:all) || @_exclude_parent_template_formats.include?(format)
+        return ( @_exclude_parent_template_formats ||= [] ).include?(:all) || @_exclude_parent_template_formats.include?(format)
       end
 
       def exclude_parent_template(*formats)
@@ -27,18 +25,12 @@ module RubyApp
       end
 
       def get_template(format)
-        (@_template_path[format] || @_template_path[:all]).gsub(/\*/,format.to_s)
-      end
-
-      def get_cache(format)
-        cache = self.get_template(format)
-        cache = cache.gsub(/\.haml/, '')
-        File.join(File.dirname(cache), '.cache', File.basename(cache))
+        return (@_template_path[format] || @_template_path[:all]).gsub(/\*/,format.to_s)
       end
 
       def get_templates(format)
         template = self.get_template(format)
-        (File.exists?(template) ? [template] : []).concat((!self.exclude_parent_template?(format) && self.superclass.respond_to?(:get_templates) ) ? self.superclass.get_templates(format) : [])
+        return (File.exists?(template) ? [template] : []).concat((!self.exclude_parent_template?(format) && self.superclass.respond_to?(:get_templates) ) ? self.superclass.get_templates(format) : [])
       end
 
     end