RubyApp 0.2.4 → 0.2.5

data/lib/ruby_app/mixins/render_mixin.rb

@@ -10,6 +10,10 @@ module RubyApp
     module RenderMixin
       require 'ruby_app'
 
+      def cache(format)
+        return self.is_a?(Class) ? self.get_cache(format) : self.class.get_cache(format)
+      end
+
       def templates(format)
         return self.is_a?(Class) ? self.get_templates(format) : self.class.get_templates(format)
       end

data/lib/ruby_app/mixins/template_mixin.rb

@@ -33,6 +33,11 @@ module RubyApp
         return (File.exists?(template) ? [template] : []).concat((!self.exclude_parent_template?(format) && self.superclass.respond_to?(:get_templates) ) ? self.superclass.get_templates(format) : [])
       end
 
+      def get_cache(format)
+        template = self.get_template(format)
+        return File.join(File.dirname(template), '.cache', File.basename(template)).gsub(/\.haml/, '')
+      end
+
     end
 
   end

data/lib/ruby_app/rack/request.rb

@@ -1,9 +1,9 @@
 module RubyApp
 
   module Rack
+    require 'ruby_app'
 
     class Request
-      require 'ruby_app'
 
       def initialize(application)
         @application = application

data/lib/ruby_app/rack/response.rb

@@ -1,9 +1,9 @@
 module RubyApp
 
   module Rack
+    require 'ruby_app'
 
     class Response
-      require 'ruby_app'
 
       def initialize(application)
         @application = application

data/lib/ruby_app/rack/route.rb

@@ -40,7 +40,8 @@ module RubyApp
         RubyApp::Response['Content-Type'] = RubyApp::Element.get_content_type(format)
         page = RubyApp::Session.pages.last
         RubyApp::Log.duration("GET  #{page.class} #{format}") do
-          RubyApp::Response.write(page.render(format.to_sym))
+          RubyApp::Response.write_from_cache(page, format.to_sym)
+          #RubyApp::Response.write(page.render(format.to_sym))
         end
       end
 

data/lib/ruby_app/rack/session.rb

@@ -1,9 +1,9 @@
 module RubyApp
 
   module Rack
+    require 'ruby_app'
 
     class Session
-      require 'ruby_app'
 
       def initialize(application)
         @application = application

data/lib/ruby_app/response.rb

@@ -9,6 +9,7 @@ module RubyApp
 
   class Response < ::Rack::Response
     extend RubyApp::Mixins::DelegateMixin
+    extend RubyApp::Mixins::ConfigurationMixin
 
     def rendered?(template)
       return @rendered.key?(template)
@@ -32,6 +33,29 @@ module RubyApp
       @content[element] = {}
     end
 
+    def write_from_cache(element, format)
+      if RubyApp::Response.configuration.cache.formats.include?(format)
+        cache = element.cache(format)
+        if RubyApp::Response.configuration.cache.read? && File.exists?(cache)
+          RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} READ  #{cache.inspect}")
+          self.write(File.read(cache))
+        else
+          content = element.render(format)
+          if RubyApp::Response.configuration.cache.write? && !File.exists?(cache)
+            FileUtils.mkdir_p(File.dirname(cache))
+            RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} WRITE #{cache.inspect}")
+            File.open(cache, 'w') do |file|
+              file.write(content)
+              file.flush
+            end
+          end
+          self.write(content)
+        end
+      else
+        self.write(element.render(format))
+      end
+    end
+
     def self.get
       return Thread.current[:_response]
     end

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
   ROOT    = File.expand_path(File.dirname(__FILE__))
 end

data/rakefile

@@ -10,12 +10,12 @@ namespace :ruby_app do
 
   desc 'Create console'
   task :console do |task|
-    system("cd ./lib/ruby_app && clear && bundle exec ../../bin/ruby_app console")
+    system('cd ./lib/ruby_app && clear && bundle exec ../../bin/ruby_app console')
   end
 
   desc 'Run'
-  task :run do |task|
-    system("cd ./lib/ruby_app && clear && bundle exec ../../bin/ruby_app run")
+  task :run => ['ruby_app:cache:destroy'] do |task|
+    system('cd ./lib/ruby_app && clear && bundle exec ../../bin/ruby_app run')
   end
 
   desc 'Get version'
@@ -25,18 +25,19 @@ namespace :ruby_app do
 
   desc 'Push to master, release, and increment version'
   task :release do |task|
-      system "git push origin master && rake release"
+      system('git push origin master && rake release')
       version_file = File.join(RubyApp::ROOT, %w[version.rb])
       RubyApp::VERSION =~ /(\d+)\.(\d+)\.(\d+)/
-      system "sed 's|[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*|#{$1}.#{$2}.#{$3.to_i + 1}|g' < '#{version_file}' > '#{version_file}.out'; rm '#{version_file}'; mv '#{version_file}.out' '#{version_file}'"
-      system "git commit --all --message='Incrementing version'"
+      system("sed 's|[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*|#{$1}.#{$2}.#{$3.to_i + 1}|g' < '#{version_file}' > '#{version_file}.out'; rm '#{version_file}'; mv '#{version_file}.out' '#{version_file}'")
+      system('git commit --all --message=\'Incrementing version\'')
   end
 
   namespace :test do
 
     desc 'Run all tests'
-    task :all => ['test:specs',
-                  'test:features']
+    task :all => ['ruby_app:cache:destroy',
+                  'ruby_app:test:specs',
+                  'ruby_app:test:features']
 
     desc 'Run RSpec tests'
     task :specs, :file, :line do |task, arguments|
@@ -47,14 +48,14 @@ namespace :ruby_app do
           system("bundle exec rspec #{arguments.file} --format=documentation --colour")
         end
       else
-        system("bundle exec rspec spec/ --format=documentation --colour")
+        system('bundle exec rspec spec/ --format=documentation --colour')
       end
     end
 
     desc 'Run feature tests for all features or the given feature file'
     task :features, :file do |task, arguments|
       unless arguments.file
-        system("bundle exec cucumber --format pretty --tags ~@broken --require features")
+        system('bundle exec cucumber --format pretty --tags ~@broken --require features')
       else
         system("bundle exec cucumber --format pretty --tags ~@broken --require features '#{arguments.file}'")
       end
@@ -62,4 +63,19 @@ namespace :ruby_app do
 
   end
 
+  namespace :cache do
+
+    desc 'List all cached files'
+    task :list do
+      system('find . | grep \'\\.cache\'')
+    end
+
+    desc 'Remove all cached files'
+    task :destroy do
+      puts 'Removing cached files ...'
+      system('find . -name \'.cache\' | xargs rm -rv')
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 Z
+date: 2012-03-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: BlueCloth
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   type: :runtime
-  prerelease: false
-  name: BlueCloth
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: chronic
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -41,11 +43,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   type: :runtime
-  prerelease: false
-  name: chronic
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: chronic_duration
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,11 +57,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   type: :runtime
-  prerelease: false
-  name: chronic_duration
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: facets
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,11 +71,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   type: :runtime
-  prerelease: false
-  name: facets
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: fileutils
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,11 +85,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   type: :runtime
-  prerelease: false
-  name: fileutils
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: haml
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -97,11 +99,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
   type: :runtime
-  prerelease: false
-  name: haml
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,11 +113,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
   type: :runtime
-  prerelease: false
-  name: json
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: mime-types
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -125,11 +127,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
   type: :runtime
-  prerelease: false
-  name: mime-types
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: r18n-core
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -139,11 +141,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
   type: :runtime
-  prerelease: false
-  name: r18n-core
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rack
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -153,11 +155,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
   type: :runtime
-  prerelease: false
-  name: rack
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: ruby-event
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -167,11 +169,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
   type: :runtime
-  prerelease: false
-  name: ruby-event
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: ruby-openid
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -181,11 +183,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
   type: :runtime
-  prerelease: false
-  name: ruby-openid
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: sass
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -195,11 +197,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
   type: :runtime
-  prerelease: false
-  name: sass
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: term-ansicolor
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -209,11 +211,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id014
   type: :runtime
-  prerelease: false
-  name: term-ansicolor
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: yajl-ruby
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -223,11 +225,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id015
   type: :runtime
-  prerelease: false
-  name: yajl-ruby
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: capybara
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -237,11 +239,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id016
   type: :development
-  prerelease: false
-  name: capybara
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: cucumber
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -251,11 +253,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id017
   type: :development
-  prerelease: false
-  name: cucumber
+  requirement: *id017
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: launchy
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -265,11 +267,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id018
   type: :development
-  prerelease: false
-  name: launchy
+  requirement: *id018
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rake
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -279,11 +281,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id019
   type: :development
-  prerelease: false
-  name: rake
+  requirement: *id019
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -293,11 +295,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id020
   type: :development
-  prerelease: false
-  name: rspec
+  requirement: *id020
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec-mocks
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -307,10 +309,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id021
   type: :development
-  prerelease: false
-  name: rspec-mocks
+  requirement: *id021
 description: A web application framework in Ruby
 email: 
 - frank.ficnar@gmail.com
@@ -432,6 +432,8 @@ files:
 - lib/ruby_app/elements/navigation/page_link.js.haml
 - lib/ruby_app/elements/navigation/page_link.rb
 - lib/ruby_app/elements/page.rb
+- lib/ruby_app/elements/pages/.cache/default_page.css
+- lib/ruby_app/elements/pages/.cache/default_page.js
 - lib/ruby_app/elements/pages/authentication/open_id/authentication_page.rb
 - lib/ruby_app/elements/pages/authentication/open_id/ax_authentication_page.rb
 - lib/ruby_app/elements/pages/authentication/open_id/base/base_authentication_page.html.haml
@@ -457,6 +459,24 @@ files:
 - lib/ruby_app/elements/pages/settings_page.js.haml
 - lib/ruby_app/elements/pages/settings_page.rb
 - lib/ruby_app/elements/pages/test_pages.rb
+- lib/ruby_app/elements/pages/test_pages/.cache/button_test_page.css
+- lib/ruby_app/elements/pages/test_pages/.cache/button_test_page.js
+- lib/ruby_app/elements/pages/test_pages/.cache/default_test_page.css
+- lib/ruby_app/elements/pages/test_pages/.cache/default_test_page.js
+- lib/ruby_app/elements/pages/test_pages/.cache/dialog_test_page.css
+- lib/ruby_app/elements/pages/test_pages/.cache/dialog_test_page.js
+- lib/ruby_app/elements/pages/test_pages/.cache/input_test_page.css
+- lib/ruby_app/elements/pages/test_pages/.cache/input_test_page.js
+- lib/ruby_app/elements/pages/test_pages/.cache/link_test_page.css
+- lib/ruby_app/elements/pages/test_pages/.cache/link_test_page.js
+- lib/ruby_app/elements/pages/test_pages/.cache/linked_test_page.css
+- lib/ruby_app/elements/pages/test_pages/.cache/linked_test_page.js
+- lib/ruby_app/elements/pages/test_pages/.cache/list_test_page.css
+- lib/ruby_app/elements/pages/test_pages/.cache/list_test_page.js
+- lib/ruby_app/elements/pages/test_pages/.cache/markdown_test_page.css
+- lib/ruby_app/elements/pages/test_pages/.cache/markdown_test_page.js
+- lib/ruby_app/elements/pages/test_pages/.cache/test_page.css
+- lib/ruby_app/elements/pages/test_pages/.cache/test_page.js
 - lib/ruby_app/elements/pages/test_pages/button_test_page.css.haml
 - lib/ruby_app/elements/pages/test_pages/button_test_page.html.haml
 - lib/ruby_app/elements/pages/test_pages/button_test_page.js.haml
@@ -608,7 +628,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: A web application framework in Ruby