releaf-core 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca323310f4d59facd1e6408a4eb506971b5cc276
-  data.tar.gz: 81a3f6d2d484930fb106606b032eb85968ee910b
+  metadata.gz: b20117c8f011eeb352f897d424a54c9aca0da121
+  data.tar.gz: f350cbf3d9c4c8428b023457e0ad705c633f9af0
 SHA512:
-  metadata.gz: 9a46e111961604581a9bde9e10866cabe2c1dfc6f7c58ffee02780308146e9cce844cb2f44c7b6d4d47d7721cfe43ffc3dcf51f8f770205bd83360769b218dcc
-  data.tar.gz: b7c436977a939f69a28e6af94c1441c7224276f86ce906f3d590a3761e11bde626e90f375c6acabb6259ee18a492323ef5c93786a477ee5bae0c81049afaccde
+  metadata.gz: fe61243ff475a95c0fea93023b5a3e83f212e981c3ad2871315d411cf9f396affbb4f3bb3ca7f46ce97edf7b1aa71da887270283e7550017d80a4427da97f1fb
+  data.tar.gz: aa0c250c7a029ef6dbee115b458ed1135eda3ea7571c70ee13f4aad45a62fb84ba6d19a59a0a143a41929ecdaf9a9a2c1e917ca296d70575f0528bda5a13c32a

data/app/assets/javascripts/releaf/include/field.type_richtext.js

@@ -84,9 +84,17 @@ jQuery(function()
             textarea.attr( 'id', 'richtext_' + String((new Date()).getTime()).replace(/\D/gi,'') );
         }
 
-        if (textarea.data('attachment-upload-url'))
+        if (textarea.data('attachment-upload-url') || textarea.data('attachment-browse-url'))
         {
-            config.filebrowserUploadUrl = textarea.data('attachment-upload-url');
+            if (textarea.data('attachment-browse-url'))
+            {
+                config.filebrowserBrowseUrl = textarea.data('attachment-browse-url');
+            }
+
+            if (textarea.data('attachment-upload-url'))
+            {
+                config.filebrowserUploadUrl = textarea.data('attachment-upload-url');
+            }
         }
         else
         {

data/app/assets/stylesheets/releaf/layout/main.scss

@@ -12,12 +12,16 @@ main
     position: relative;
     min-height: 100%;
 }
+body[data-layout-features~="sidebar"] > main
+{
+    padding-left: steps(20 + 3);
+}
 
 main
 {
     display: block;  /* as of now, not all rendering engines recognize the main element as a block */
     position: relative;
-    padding: 0 steps(3) steps(4) steps(20 + 3);
+    padding: 0 steps(3) steps(4) steps(3);
     z-index: 1;
 
     .side-compact &

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

@@ -21,20 +21,30 @@ module Releaf::Builders::Page
 
     def body
       tag(:body, body_atttributes) do
-        body_content{ yield } << assets(:javascripts, :javascript_include_tag)
+        safe_join{ body_content_blocks{ yield } }
       end
     end
 
     def body_atttributes
-      {class: body_classes, "data-settings-path" => settings_path}
+      {class: body_classes, "data-settings-path" => settings_path, "data-layout-features" => features.join(" ")}
     end
 
     def settings_path
       url_for(action: "store_settings", controller: "/releaf/root", only_path: true)
     end
 
-    def body_content(&block)
-      header << menu << tag(:main, id: "main", &block) << notifications
+    def feature_available?(feature)
+      features.include? feature
+    end
+
+    def body_content_blocks
+      parts = []
+      parts << header if feature_available?(:header)
+      parts << menu if feature_available?(:sidebar)
+      parts << tag(:main, id: :main){ yield } if feature_available?(:main)
+      parts << notifications
+      parts << assets(:javascripts, :javascript_include_tag)
+      parts
     end
 
     def notifications
@@ -57,6 +67,10 @@ module Releaf::Builders::Page
       Releaf::Builders::Page::MenuBuilder
     end
 
+    def features
+      controller.layout_features
+    end
+
     def assets(type, tag_method)
       safe_join do
         send(type).collect do |asset|

data/app/controllers/releaf/action_controller.rb

@@ -13,6 +13,7 @@ class Releaf::ActionController < ActionController::Base
   include Releaf::ActionController::Breadcrumbs
   include Releaf::ActionController::RichtextAttachments
   include Releaf::ActionController::Views
+  include Releaf::ActionController::Layout
   include Releaf::Responders
 
   helper_method :controller_scope_name, :page_title

data/app/lib/releaf/action_controller/layout.rb

@@ -0,0 +1,7 @@
+module Releaf::ActionController::Layout
+  extend ActiveSupport::Concern
+
+  def layout_features
+    [:header, :sidebar, :main]
+  end
+end

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

@@ -47,6 +47,14 @@ describe Releaf::Builders::Page::LayoutBuilder, type: :class do
     end
   end
 
+  describe "#features" do
+    it "returns controller layout features" do
+      allow(subject).to receive(:controller).and_return(NewRolesController.new)
+      allow(subject.controller).to receive(:layout_features).and_return([:a, :c])
+      expect(subject.features).to eq([:a, :c])
+    end
+  end
+
   describe "#header_builder" do
     it "returns `Releaf::Builders::Page::HeaderBuilder` class" do
       expect(subject.header_builder).to eq(Releaf::Builders::Page::HeaderBuilder)
@@ -59,6 +67,20 @@ describe Releaf::Builders::Page::LayoutBuilder, type: :class do
     end
   end
 
+  describe "#feature_available?" do
+    before do
+      allow(subject).to receive(:features).and_return([:a, :b])
+    end
+
+    it "returns true when feature is available" do
+      expect(subject.feature_available?(:a)).to be true
+    end
+
+    it "returns false when feature is not available" do
+      expect(subject.feature_available?(:c)).to be false
+    end
+  end
+
   describe "#stylesheets" do
     it "returns stylesheets from assets resolver for given controller" do
       allow(subject).to receive(:assets_resolver).and_return(DummyAssetsResolver)
@@ -111,10 +133,52 @@ describe Releaf::Builders::Page::LayoutBuilder, type: :class do
 
   describe "#body" do
     it "returns body with body attributes and" do
-      allow(subject).to receive(:assets).with(:javascripts, :javascript_include_tag).and_return("_assets_")
       allow(subject).to receive(:body_atttributes).and_return(class: ["xx", "y"], id: "121212")
-      allow(subject).to receive(:body_content){|*args, &block| expect(block.call).to eq("x") }.and_return("body content")
-      expect(subject.body{ "x" }).to eq("<body class=\"xx y\" id=\"121212\">body content_assets_</body>")
+      allow(subject).to receive(:body_content_blocks){|*args, &block| expect(block.call).to eq("x") }
+        .and_return(["a<b>".html_safe, "b<i>", "c<d>".html_safe])
+      expect(subject.body{ "x" }).to eq("<body class=\"xx y\" id=\"121212\">a<b>b&lt;i&gt;c<d></body>")
+    end
+  end
+
+      #parts = []
+      #parts << header if feature_available?(:header)
+      #parts << menu if feature_available?(:sidebar)
+      #parts << tag(:main, id: "main"){ yield } if feature_available?(:main)
+      #parts << notifications
+      #parts << assets(:javascripts, :javascript_include_tag)
+      #parts
+
+
+  describe "#body_content_blocks" do
+    before do
+      allow(subject).to receive(:feature_available?).with(:header).and_return(true)
+      allow(subject).to receive(:feature_available?).with(:sidebar).and_return(true)
+      allow(subject).to receive(:feature_available?).with(:main).and_return(true)
+
+      allow(subject).to receive(:assets).with(:javascripts, :javascript_include_tag).and_return("_assets_")
+      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(:tag).with(:main, id: :main){|*args, &block| expect(block.call).to eq("x") }.and_return("body content")
+    end
+
+    it "returns body with body attributes and" do
+      expect(subject.body_content_blocks{ "x" }).to eq(["_header_", "_menu_", "body content", "_notifications_", "_assets_"])
+    end
+
+    it "skips header when header feature not available" do
+      allow(subject).to receive(:feature_available?).with(:header).and_return(false)
+      expect(subject.body_content_blocks{ "x" }).to eq(["_menu_", "body content", "_notifications_", "_assets_"])
+    end
+
+    it "skips menu when sidebar feature not available" do
+      allow(subject).to receive(:feature_available?).with(:sidebar).and_return(false)
+      expect(subject.body_content_blocks{ "x" }).to eq(["_header_", "body content", "_notifications_", "_assets_"])
+    end
+
+    it "skips main conrtent when main feature not available" do
+      allow(subject).to receive(:feature_available?).with(:main).and_return(false)
+      expect(subject.body_content_blocks{ "x" }).to eq(["_header_", "_menu_", "_notifications_", "_assets_"])
     end
   end
 
@@ -134,10 +198,13 @@ describe Releaf::Builders::Page::LayoutBuilder, type: :class do
   end
 
   describe "#body_atttributes" do
-    it "returns hash with classes and data-settings-path" do
+    it "returns hash with classes, data-settings-path and data-layout-features" do
+      allow(subject).to receive(:features).and_return([:top, :bottom])
       allow(subject).to receive(:controller_body_classes).and_return(["a", "b"])
       allow(subject).to receive(:settings_path).and_return("/xxx/sett")
-      expect(subject.body_atttributes).to eq(class: ["application-dummy", "a", "b"], "data-settings-path" => "/xxx/sett")
+      expect(subject.body_atttributes).to eq(class: ["application-dummy", "a", "b"],
+                                             "data-settings-path" => "/xxx/sett",
+                                             "data-layout-features" => "top bottom")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-core
 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: rails
@@ -395,6 +395,7 @@ files:
 - app/lib/releaf/action_controller/breadcrumbs.rb
 - app/lib/releaf/action_controller/builders.rb
 - app/lib/releaf/action_controller/features.rb
+- app/lib/releaf/action_controller/layout.rb
 - app/lib/releaf/action_controller/notifications.rb
 - app/lib/releaf/action_controller/resources.rb
 - app/lib/releaf/action_controller/richtext_attachments.rb