jubako 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e59d567d99960b86a2ae3556086704dd5e4ed15b
-  data.tar.gz: ed89d7e1fb91c72b3cf2588ea564cb43208501b2
+  metadata.gz: 8e90169632a8b7304431ac0fbce590b1725dd45a
+  data.tar.gz: 8569d0de2b63274b1ee1a183a7051721220526c4
 SHA512:
-  metadata.gz: 96b41a49c8a52e25f17a4d531b1553cb25ea210b6250c348c7679b4447cf1afc86d736adc4dcf7ed9d87f522f0b088e00ac784ea7af32b6667737c600ae70d0c
-  data.tar.gz: 09eae93539e9dd7c418c4143d8fb5e79217f67c9916c52c01b4004358beeb181f4fae4f1f4c755441e4293471013a8e449506fa1e2d5075a64cb8b63e25517be
+  metadata.gz: 50b3ad00133e10bc39c2190e600bc9abf2d4ba2956eab39f41ff09314acf12a878718a01de6f8e200b7b599a726c337c334c768fc37795b76c49b898dbb7e465
+  data.tar.gz: 272505489661328f3222fa62a8ef4c5b2d876b15aa59cd9a4115fbaf550beb8060ca4fe069c9c9c5afb7dd8b9dc563607bac9e241e8c102d1128bb504d2c2bed

data/app/views/layout/_jubako.html.erb

@@ -0,0 +1 @@
+<%= jubako_renderer(local_assigns) { yield } %>

data/app/views/layout/jubako.html.erb

@@ -1 +1 @@
-<%= jubako_renderer(jubako_original_layout, local_assigns) { yield } %>
+<%= jubako_renderer(local_assigns) { yield } %>

data/lib/jubako.rb

@@ -1,10 +1,11 @@
 require "jubako/engine"
 require "jubako/renderer"
-require "jubako/template_renderer"
+require "jubako/helpers/rendering"
 require "jubako/helpers/extends"
 require "jubako/helpers/block"
 
-ActionView::TemplateRenderer.send(:include, Jubako::TemplateRenderer)
-ActionView::Base.send(:include, Jubako::Renderer)
+ActionView::Base.send(:include, Jubako::Helpers::Rendering)
 ActionView::Base.send(:include, Jubako::Helpers::Extends)
 ActionView::Base.send(:include, Jubako::Helpers::Block)
+
+ActionView::Renderer.send(:include, Jubako::Renderer)

data/lib/jubako/helpers/extends.rb

@@ -1,7 +1,8 @@
 module Jubako::Helpers
   module Extends
     def extends(layout)
-      content_for(:jubako_extend_layout, layout, flush: true)
+      scope = content_for(:jubako_scope)
+      content_for("jubako_extend_#{scope}", layout, flush: true)
     end
   end
 end

data/lib/jubako/helpers/rendering.rb

@@ -0,0 +1,31 @@
+module Jubako::Helpers
+  module Rendering
+    def jubako_renderer(locals = {})
+      scope   = content_for(:jubako_scope)
+      extends = content_for("jubako_extend_#{scope}")
+
+      layout  = locals["jubako_layout_#{scope}"]
+      layout  = layout.call if layout.is_a?(Proc)
+
+      args    = { locals: locals, jubako: true }
+
+      if layout
+        if extends
+          args[:template] = extends
+          args[:layout]   = layout
+        else
+          args[:template] = layout
+        end
+      else
+        if extends
+          args[:template] = extends
+        else
+          return yield
+        end
+      end
+
+      content_for("jubako_extend_#{scope}", '', flush: true)
+      render(args)
+    end
+  end
+end

data/lib/jubako/renderer.rb

@@ -1,28 +1,40 @@
 module Jubako
   module Renderer
-    def jubako_renderer(layout, locals = {})
-      extends = content_for(:jubako_extend_layout)
-      layout  = layout.call if layout.is_a?(Proc)
-      args    = { locals: locals }
-
-      content_for(:jubako_extend_layout, '', flush: true)
-
-      if layout.nil?
-        if extends.nil?
-          return yield
-        else
-          args[:template] = extends
-        end
-      else
-        if extends.nil?
-          args[:template] = layout
-        else
-          args[:template] = extends
-          args[:layout]   = layout
-        end
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method_chain :render_template, :jubako
+      alias_method_chain :render_partial, :jubako
+    end
+
+    def render_template_with_jubako(context, options)
+      jubako_scoped(context, options) do
+        render_template_without_jubako(context, options)
+      end
+    end
+
+    def render_partial_with_jubako(context, options, &block)
+      jubako_scoped(context, options) do
+        render_partial_without_jubako(context, options, &block)
       end
+    end
+
+    private
+
+    def jubako_scoped(ctx, opts)
+      old_scope = ctx.content_for(:jubako_scope)
+      new_scope = old_scope
+      new_scope = SecureRandom.hex(8) unless opts[:jubako]
+
+      opts[:locals] ||= {}
+      opts[:locals]["jubako_layout_#{new_scope}"] = opts[:layout]
+      opts[:layout] = 'layout/jubako'
+
+      ctx.content_for(:jubako_scope, new_scope, flush: true)
+      ret = yield(new_scope)
+      ctx.content_for(:jubako_scope, old_scope || '', flush: true)
 
-      render(args)
+      ret
     end
   end
 end

data/lib/jubako/version.rb

@@ -1,3 +1,3 @@
 module Jubako
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jubako
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yuki Hattori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,13 +62,14 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/views/layout/_jubako.html.erb
 - app/views/layout/jubako.html.erb
 - lib/jubako.rb
 - lib/jubako/engine.rb
 - lib/jubako/helpers/block.rb
 - lib/jubako/helpers/extends.rb
+- lib/jubako/helpers/rendering.rb
 - lib/jubako/renderer.rb
-- lib/jubako/template_renderer.rb
 - lib/jubako/version.rb
 homepage: https://github.com/yhatt
 licenses:

data/lib/jubako/template_renderer.rb

@@ -1,17 +0,0 @@
-module Jubako
-  module TemplateRenderer
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :render_template, :jubako
-    end
-
-    def render_template_with_jubako(template, layout_name = nil, locals = nil)
-      locals ||= {}
-      locals[:jubako_original_layout] = layout_name
-
-      layout_name = find_layout('layout/jubako', locals.keys)
-      render_template_without_jubako(template, layout_name, locals)
-    end
-  end
-end