RubyApp 0.0.69 → 0.0.70

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.69)
+    RubyApp (0.0.70)
       BlueCloth
       chronic
       chronic_duration

data/lib/ruby_app/elements/navigation/page_link.html.haml

@@ -3,7 +3,7 @@
 %span.link{attributes}
   - if self.current_page?
     %span.current{:href => '', :page => self.page}
-      = self.content_for(self.page) || self.page.translate.title
+      = yield(self.page) || self.page.translate.title
   - else
     %a.page{:href => '', :page => self.page}
-      = self.content_for(self.page) || self.page.translate.title
+      = yield(self.page) || self.page.translate.title

data/lib/ruby_app/mixins/render_mixin.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'facets/string/interpolate'
 require 'haml'
 
 module RubyApp
@@ -9,28 +8,17 @@ module RubyApp
   module Mixins
 
     module RenderMixin
+      require 'ruby_app/request'
 
       def rendered?(template)
-        unless ( Thread.current[:_rendered] ||= {} ).key?(template)
+        unless RubyApp::Request.rendered?(template)
           yield
-          Thread.current[:_rendered][template] = ( Thread.current[:_rendered][template] || 0 ) + 1
+          RubyApp::Request.rendered(template)
         end
       end
 
       def content_for(name, value = nil, &block)
-        ( @_content ||= {} )[Thread.current] ||= {}
-        if block_given?
-          @_content[Thread.current][name] = block
-        elsif value
-          @_content[Thread.current][name] = String.interpolate { value }
-        else
-          @_content[Thread.current][name]
-        end
-      end
-
-      def clear_content_for
-        ( @_content ||= {} )[Thread.current] ||= {}
-        @_content.delete(Thread.current)
+        RubyApp::Request.content_for(self, name, value, &block)
       end
 
       def render(format)
@@ -42,9 +30,9 @@ module RubyApp
             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 : self.content_for(templates[index - 1])
+                  index == 0 ? nil : RubyApp::Request.get_content(self, templates[index - 1])
                 else
-                  _content = self.content_for(arguments[0])
+                  _content = RubyApp::Request.get_content(self, arguments[0])
                   if self.block_is_haml?(_content)
                     self.capture_haml(arguments, &_content)
                   else
@@ -52,11 +40,11 @@ module RubyApp
                   end
                 end
               end
-              self.content_for(template, content)
+              RubyApp::Request.content_for(self, template, content)
             end
-            return self.content_for(templates.last)
+            return RubyApp::Request.get_content(self, templates.last)
           ensure
-            self.clear_content_for
+            RubyApp::Request.clear_content(self)
           end
         end
 

data/lib/ruby_app/request.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'facets/string/interpolate'
 require 'rack'
 
 module RubyApp
@@ -26,13 +27,34 @@ module RubyApp
       self.params
     end
 
+    def rendered?(template)
+      @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
       Thread.current[:_request]
     end
 
     def self.create!(environment = RubyApp::Application.environment)
       Thread.current[:_request] = RubyApp::Request.new(environment)
-      Thread.current[:_rendered] = {}
 
       if block_given?
         begin
@@ -62,7 +84,6 @@ module RubyApp
     end
 
     def self.destroy!
-      Thread.current[:_rendered] = nil
       Thread.current[:_request] = nil
     end
 
@@ -70,6 +91,8 @@ module RubyApp
 
       def initialize(environment)
         super(environment)
+        @rendered = {}
+        @content = {}
       end
 
   end

data/lib/ruby_app/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 149
+  hash: 147
   prerelease: 
   segments: 
   - 0
   - 0
-  - 69
-  version: 0.0.69
+  - 70
+  version: 0.0.70
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-01-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false