RubyApp 0.2.5 → 0.2.6

data/lib/ruby_app/elements/pages/test_pages/link_test_page.html.haml

@@ -1,7 +1,7 @@
-- self.content_for(:content) do
+- self.content_for(:html, :content) do
   /
     #{__FILE__}
   = @markdown.render(:html) do |element|
-    - element.content_for(:body, self.translate.content.body)
+    - element.content_for(:html, :body, self.translate.content.body)
   = @link.render(:html) do |element|
-    - element.content_for(:body, self.translate.link.body)
+    - element.content_for(:html, :body, self.translate.link.body)

data/lib/ruby_app/elements/pages/test_pages/linked_test_page.html.haml

@@ -1,5 +1,5 @@
-- self.content_for(:content) do
+- self.content_for(:html, :content) do
   /
     #{__FILE__}
   = @markdown.render(:html) do |element|
-    - element.content_for(:body, self.translate.content.body)
+    - element.content_for(:html, :body, self.translate.content.body)

data/lib/ruby_app/elements/pages/test_pages/list_test_page.html.haml

@@ -1,7 +1,7 @@
-- self.content_for(:content) do
+- self.content_for(:html, :content) do
   /
     #{__FILE__}
   = @markdown.render(:html) do |element|
-    - element.content_for(:body, self.translate.content.body)
+    - element.content_for(:html, :body, self.translate.content.body)
   = @list.render(:html)
   = @select.render(:html)

data/lib/ruby_app/elements/pages/test_pages/markdown_test_page.html.haml

@@ -1,5 +1,5 @@
-- self.content_for(:content) do
+- self.content_for(:html, :content) do
   /
     #{__FILE__}
   = @markdown.render(:html) do |element|
-    - element.content_for(:body, self.translate.content.body)
+    - element.content_for(:html, :body, self.translate.content.body)

data/lib/ruby_app/elements/pages/test_pages/test_page.html.haml

@@ -1,8 +1,8 @@
-- self.content_for(:content) do
+- self.content_for(:html, :content) do
   /
     #{__FILE__}
   = @markdown.render(:html) do |element|
-    - element.content_for(:body, self.translate.content.body(RubyApp::Request.cookies['_cookie']))
+    - element.content_for(:html, :body, self.translate.content.body(RubyApp::Request.cookies['_cookie']))
   %ul
     %li#rendered
       = self.translate.rendered

data/lib/ruby_app/mixins/render_mixin.rb

@@ -25,8 +25,8 @@ module RubyApp
         end
       end
 
-      def content_for(name, value = nil, &block)
-        return RubyApp::Response.content_for(self, name, value, &block)
+      def content_for(format, name, value = nil, &block)
+        return RubyApp::Response.content_for(self, format, name, value, &block)
       end
 
       def render(format)
@@ -37,32 +37,26 @@ module RubyApp
 
           self.init_haml_helpers unless @haml_buffer
 
-          begin
+          yield(self) if block_given?
 
-            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])
+          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, format, templates[index - 1])
+              else
+                _content = RubyApp::Response.get_content(self, format, arguments[0])
+                if self.block_is_haml?(_content)
+                  self.capture_haml(arguments, &_content)
                 else
-                  _content = RubyApp::Response.get_content(self, arguments[0])
-                  if self.block_is_haml?(_content)
-                    self.capture_haml(arguments, &_content)
-                  else
-                    _content
-                  end
+                  _content
                 end
               end
-              RubyApp::Response.content_for(self, template, content)
             end
-
-            return RubyApp::Response.get_content(self, templates.last)
-
-          ensure
-            RubyApp::Response.clear_content(self)
+            RubyApp::Response.content_for(self, format, template, content)
           end
 
+          return RubyApp::Response.get_content(self, format, templates.last)
+
         end
       end
 

data/lib/ruby_app/response.rb

@@ -19,20 +19,16 @@ module RubyApp
       @rendered[template] = true
     end
 
-    def content_for(element, name, value = nil, &block)
+    def content_for(element, format, name, value = nil, &block)
       @content[element] ||= {}
       @content[element][name] = block_given? ? block : String.interpolate { value }
     end
 
-    def get_content(element, name)
+    def get_content(element, format, name)
       @content[element] ||= {}
       return @content[element][name]
     end
 
-    def clear_content(element)
-      @content[element] = {}
-    end
-
     def write_from_cache(element, format)
       if RubyApp::Response.configuration.cache.formats.include?(format)
         cache = element.cache(format)

data/lib/ruby_app/templates/application/Rakefile

@@ -15,20 +15,21 @@ namespace :_APPLICATION_DOWNCODE_ do
   end
 
   desc 'Run'
-  task :run do |task|
+  task :run => ['_APPLICATION_DOWNCODE_:cache:destroy'] do |task|
     system("clear; bundle exec ruby_app run")
   end
 
   namespace :cache do
 
-    desc 'Create element cache'
-    task :create do |task|
-      _APPLICATION_UPCODE_::Application.create_cache(File.join(File.dirname(__FILE__), %w[lib _APPLICATION_DOWNCODE_ elements pages]), File.join(File.dirname(__FILE__), %w[lib]))
+    desc 'List all cached files'
+    task :list do
+      system('find . | grep \'\\.cache\'')
     end
 
-    desc 'Delete element cache'
-    task :destroy do |task|
-      _APPLICATION_UPCODE_::Application.destroy_cache(File.join(File.dirname(__FILE__), %w[lib _APPLICATION_DOWNCODE_ elements]))
+    desc 'Remove all cached files'
+    task :destroy do
+      puts 'Removing cached files ...'
+      system('find . -name \'.cache\' | xargs rm -rv')
     end
 
   end

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

@@ -9,6 +9,13 @@ default:
         - "#{_APPLICATION_UPCODE_::ROOT}/translations"
     log:
       path: "#{_APPLICATION_UPCODE_::ROOT}/process/log/application.log"
+    response:
+      cache:
+        formats:
+          - :css
+          - :js
+        read?: true
+        write?: true
     session:
       _class: "_APPLICATION_UPCODE_::Session"
       expires: 900

data/lib/ruby_app/templates/application/lib/_APPLICATION_DOWNCODE_/elements/pages/default_page.html.haml

@@ -1,4 +1,4 @@
-- self.content_for(:body) do
+- self.content_for(:html, :body) do
   /
     #{__FILE__}
   %div.welcome

data/lib/ruby_app/themes/mobile/pages/base/base_blank_page.html.haml

@@ -1,4 +1,4 @@
-- self.content_for(:body) do
+- self.content_for(:html, :body) do
   /
     #{__FILE__}
   %div.header

data/lib/ruby_app/version.rb

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

data/spec/elements/derived_element.html.haml

@@ -1,4 +1,4 @@
-- self.content_for(:base_element) do
+- self.content_for(:html, :base_element) do
   /
     #{__FILE__}
   %div{attributes}

metadata

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