releaf-permissions 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e2daa005e753bff94a9990a799b2e50d40530b
-  data.tar.gz: 6a8f100532f01a1cd79ef75b3b8accfe1431e5da
+  metadata.gz: 22d4c4ec21dcc37af40f4a7690106ae8a3f291aa
+  data.tar.gz: 5f07c3941d2916abe91660513eb0219762c47e6c
 SHA512:
-  metadata.gz: f72a310dcdd9ca752e524455bda6d5c0a8f303ab6001f264dacfbd8027051110429c13d6e68b2aea963cffe71247aa93e69c8bc7c5cf0209472c8af912605142
-  data.tar.gz: 48ba4fffaef9850db30b784823b7431002e9162b5a05fdcfcad820123ea5b27f5238851aa98a06773f75ed375c4db35fe2b990b355c68cd812c9ed0fcf4531fd
+  metadata.gz: 3b2c1cd291b89b48777af2112c74c9fcf94c79f45515d4d1fa595cfa669b70d99d52e3490a00ebd6f4ee4435a3aaaa2dbdcc177ecef605c8d1fc08994a2188bd
+  data.tar.gz: 984844a5bc126f0e2cbd84e8bec4e0772dc332ca15fe120df4d0b59dcb956ce247d114fa26f7d03be8bd36efac0fca9520845619194ce9c2ab43850a343c050e

data/app/builders/releaf/permissions/page/layout_builder.rb

@@ -7,11 +7,11 @@ class Releaf::Permissions::Page::LayoutBuilder < Releaf::Builders::Page::LayoutB
     Releaf::Permissions::Page::MenuBuilder
   end
 
-  def body_content(&block)
+  def body_content_blocks
     if controller.respond_to?(:authorized?) && controller.authorized?
       super
     else
-      yield
+      [yield]
     end
   end
 end

data/app/controllers/releaf/permissions/sessions_controller.rb

@@ -1,4 +1,5 @@
 class Releaf::Permissions::SessionsController < Devise::SessionsController
+  include Releaf::ActionController::Layout
   layout "releaf/admin"
   helper_method :page_title
 

data/spec/builders/releaf/permissions/page/layout_builder_spec.rb

@@ -2,6 +2,7 @@ require "rails_helper"
 
 describe Releaf::Permissions::Page::LayoutBuilder, type: :class do
   class PermissionsLayoutBuilderView < ActionView::Base; end
+
   let(:controller){ Releaf::RootController.new }
   let(:template){ PermissionsLayoutBuilderView.new }
   subject { described_class.new(template) }
@@ -26,39 +27,34 @@ describe Releaf::Permissions::Page::LayoutBuilder, type: :class do
     end
   end
 
-  describe "#body_content" do
+  describe "#body_content_blocks" do
     before do
       allow(subject).to receive(:header).and_return("_header")
       allow(subject).to receive(:menu).and_return("_menu")
       allow(subject).to receive(:notifications).and_return("_notifications")
+      allow(subject).to receive(:assets).and_return("_assets_")
     end
 
     context "when controller responds to `authorized?` and `authorized?` call return true" do
       it "returns `super` content" do
         allow(controller).to receive(:authorized?).and_return(true)
-        expect(subject.body_content{ "x" }).to eq("_header_menu<main id=\"main\">x</main>_notifications")
+        expect(subject.body_content_blocks{ "x" }).to eq(["_header", "_menu", "<main id=\"main\">x</main>",
+                                                          "_notifications", "_assets_"])
       end
     end
 
     context "when controller responds to `authorized?` and `authorized?` call return false" do
       it "returns given block content" do
         allow(controller).to receive(:authorized?).and_return(false)
-        expect(subject.body_content{ "x" }).to eq("x")
+        expect(subject.body_content_blocks{ "x" }).to eq(["x"])
       end
     end
 
     context "when controller does not responds to `authorized?`" do
       it "returns given block content" do
         allow(controller).to receive(:respond_to?).with(:authorized?).and_return(false)
-        expect(subject.body_content{ "x" }).to eq("x")
+        expect(subject.body_content_blocks{ "x" }).to eq(["x"])
       end
     end
   end
-  #def body_content(&block)
-    #if controller.respond_to?(:authorized?) && controller.authorized?
-      #super
-    #else
-      #yield
-    #end
-  #end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-permissions
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - CubeSystems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: releaf-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement