releaf-content 1.1.22 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1637dcdeaab2669dc82f88448544a9a21b1b36095373431baf9cf8aae3c83746
-  data.tar.gz: f509768c07ac56b563258d2a2f4501d6396cd4f1d8a1908057bc6d0b60e74256
+  metadata.gz: 900ae0e38ceb2c4d2a99f33aeac58222a7d3bf9dd3101527d00b52048754f951
+  data.tar.gz: 7cc316c4cc9351d81a7012debc8c26c1df209c8b37c95ab9e702377ccf56f247
 SHA512:
-  metadata.gz: '094e38b9d0064c32b01157e7a1a2165442d806100c0882775a7ea988687f831209bbdd8b19c0aef760705195ae3ef0e2ecc6494b1166027dabd333d037bd7f64'
-  data.tar.gz: e139db290880054b924b112ec972aeee2cdf059ec62e213c44c4dab1ff7a166c4f5ba383f004e2ffbc26e41f88e0abd1f0d813e58df0de7af1fe1e8b808e5438
+  metadata.gz: 889dd3be635bc6a64c219a700253f2c46770624314af350c072566e07c168b86186e5fae5d3c63cae2c7f107d6c10a9f50a9b893a9c7feb3c6701f9e4787669d
+  data.tar.gz: f17de37b5b96ab4dcfe50c71802076b2e96897a2f524975d834f4ccf47740986ec24aaf12b0f4e80863ccd1623dbc7dbbd9e74dd95ae8a05e97458f85fa16bb1

data/app/assets/config/releaf_content_manifest.js

@@ -0,0 +1,2 @@
+//= link controllers/releaf/content/nodes.css
+//= link controllers/releaf/content/nodes.js

data/app/assets/javascripts/controllers/releaf/content/nodes.js

@@ -76,17 +76,14 @@ jQuery(function()
                 slug_input.trigger('sluggenerate');
             });
 
-            if (name_input.val() === '')
+            // bind onchange slug generation only if starting out with an empty name
+            name_input.on('change', function()
             {
-                // bind onchange slug generation only if starting out with an empty name
-                name_input.on('change', function()
+                if(slug_input.val().length === 0)
                 {
-                    if(slug_input.val().length === 0)
-                    {
-                        slug_input.trigger('sluggenerate');
-                    }
-                });
-            }
+                    slug_input.trigger('sluggenerate');
+                }
+            });
         }
 
     });

data/app/controllers/releaf/content/nodes_controller.rb

@@ -10,7 +10,7 @@ class Releaf::Content::NodesController < Releaf::ActionController
     tmp_resource.name = params[:name]
     tmp_resource.reasign_slug
 
-    render text: tmp_resource.slug
+    render plain: tmp_resource.slug
   end
 
   def content_type_dialog

data/lib/releaf/content/engine.rb

@@ -1,7 +1,7 @@
 module Releaf::Content
   class Engine < ::Rails::Engine
-    initializer 'precompile', group: :all do |app|
-      app.config.assets.precompile += %w(controllers/releaf/content/*)
+    initializer 'releaf_content.assets_precompile', group: :all do |app|
+      app.config.assets.precompile << "releaf_content_manifest.js"
     end
   end
 end

data/lib/releaf/content/node.rb

@@ -218,14 +218,14 @@ module Releaf::Content
       scope :active, ->() { where(active: true) }
 
       validates_presence_of :name, :slug, :content_type
-      validates_uniqueness_of :slug, scope: :parent_id
+      validates_uniqueness_of :slug, scope: :parent_id, case_sensitive: false
       validates_length_of :name, :slug, :content_type, maximum: 255
-      validates_uniqueness_of :locale, scope: :parent_id, if: :validate_root_locale_uniqueness?
+      validates_uniqueness_of :locale, scope: :parent_id, if: :validate_root_locale_uniqueness?, case_sensitive: false
       validates_presence_of :parent, if: :parent_id?
       validate :validate_parent_node_is_not_self
       validate :validate_parent_is_not_descendant
       validate :validate_slug
-      belongs_to :content, polymorphic: true, dependent: :destroy
+      belongs_to :content, polymorphic: true, dependent: :destroy, required: false
       accepts_nested_attributes_for :content
 
       after_save :update_settings_timestamp, unless: :prevent_auto_update_settings_timestamp?

data/lib/releaf/content/route.rb

@@ -57,7 +57,6 @@ module Releaf::Content
     # @return [Array] array of Content::Route objects
     def self.for(node_class, node_content_class, default_controller)
       node_class = node_class.constantize if node_class.is_a? String
-
       Releaf::Content::BuildRouteObjects.call(
         node_class: node_class,
         node_content_class: node_content_class,

data/spec/builders/content/nodes/action_dialog_spec.rb

@@ -10,7 +10,7 @@ describe Releaf::Content::Builders::ActionDialog, type: :class do
     def action; end
   end
 
-  let(:template){ ConfirmDestroyDialogTestHelper.new }
+  let(:template){ ConfirmDestroyDialogTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
   let(:object){ Book.new }
   let(:subject){ ActionDialogIncluder.new(template) }
 

data/spec/builders/content/nodes/content_form_builder_spec.rb

@@ -9,7 +9,7 @@ describe Releaf::Content::Nodes::ContentFormBuilder, type: :class do
     def generate_url_releaf_content_nodes_path(args); end
   end
 
-  let(:template){ FormBuilderTestHelper.new }
+  let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
   let(:node){ Node.new(content_type: "TextPage", slug: "b", id: 2,
                          parent: Node.new(content_type: "TextPage", slug: "a", id: 1)) }
   let(:object){ node.build_content }

data/spec/builders/content/nodes/form_builder_spec.rb

@@ -9,7 +9,7 @@ describe Releaf::Content::Nodes::FormBuilder, type: :class do
     def generate_url_releaf_content_nodes_path(args); end
   end
 
-  let(:template){ FormBuilderTestHelper.new }
+  let(:template){ FormBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
   let(:object){ Node.new(content_type: "TextPage", slug: "b", id: 2,
                          parent: Node.new(content_type: "TextPage", slug: "a", id: 1)) }
   let(:subject){ described_class.new(:resource, object, template, {}) }

data/spec/builders/content/nodes/toolbox_builder_spec.rb

@@ -7,7 +7,7 @@ describe Releaf::Content::Nodes::ToolboxBuilder, type: :class do
     include Releaf::ApplicationHelper
   end
 
-  let(:template){ NodeToolboxBuilderTestHelper.new }
+  let(:template){ NodeToolboxBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
   subject { described_class.new(template) }
 
   let(:node){ Node.new(content_type: "TextPage", slug: "a", id: 99) }

data/spec/features/nodes_services_spec.rb

@@ -423,8 +423,8 @@ describe "Nodes services (copy, move)" do
         expect_different_values(original_url, copied_file_urls[key])
 
         [original_url, copied_file_urls[key]].each do |file_url|
-          visit file_url
-          expect(page.status_code).to eq 200
+          tmpfile = download_file(file_url)
+          expect(Digest::SHA256.file(tmpfile)).to eq(Digest::SHA256.file(dummy_file_path))
         end
       end
 

data/spec/features/nodes_spec.rb

@@ -284,7 +284,7 @@ describe "Nodes", js: true, with_tree: true, with_root: true do
 
     open_toolbox_dialog 'Add child', @lv_root, ".view-index .collection li"
     within_dialog do
-    click_link("Text page")
+      click_link("Text page")
     end
 
     fill_in "Slug", with: "some-slug"
@@ -293,6 +293,7 @@ describe "Nodes", js: true, with_tree: true, with_root: true do
 
     fill_in "Slug", with: ""
     fill_in 'Name', with: "About them"
+    blur_from "Name"
     expect(page).to have_field("Slug", with: "about-them")
 
     # fill text to allow text page save

data/spec/lib/releaf/content/node_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe Node do
+describe Node, type: :model do
   class PlainNode < ActiveRecord::Base
     include Releaf::Content::Node
     self.table_name = "nodes"
@@ -9,7 +9,7 @@ describe Node do
   let(:plain_subject){ PlainNode.new }
 
   it { is_expected.to accept_nested_attributes_for(:content) }
-  it { is_expected.to belong_to(:content) }
+  it { is_expected.to belong_to(:content).required(false) }
 
   it "includes Releaf::Content::Node module" do
     expect( Node.included_modules ).to include Releaf::Content::Node
@@ -19,7 +19,7 @@ describe Node do
     it { is_expected.to validate_presence_of(:name) }
     it { is_expected.to validate_presence_of(:slug) }
     it { is_expected.to validate_presence_of(:content_type) }
-    it { is_expected.to validate_uniqueness_of(:slug).scoped_to(:parent_id) }
+    it { is_expected.to validate_uniqueness_of(:slug).scoped_to(:parent_id).case_insensitive }
     it { is_expected.to validate_length_of(:name).is_at_most(255) }
     it { is_expected.to validate_length_of(:slug).is_at_most(255) }
   end
@@ -31,10 +31,12 @@ describe Node do
     end
   end
 
-  describe ".active (scope)" do
+  describe ":active scope" do
     it "returns active nodes" do
-      expect( Node ).to receive(:where).with(active: true).and_return('foo')
-      expect( Node.active ).to eq 'foo'
+      item_1 = create(:node, active: true, locale: "en")
+      item_2 = create(:node, active: false, locale: "de")
+      item_3 = create(:node, active: true, locale: "lv")
+      expect(Node.active).to eq [item_1, item_3]
     end
   end
 
@@ -519,7 +521,7 @@ describe Node do
 
     context "when #prevent_auto_update_settings_timestamp? is false" do
       it "is called after save" do
-        node = FactoryGirl.build(:node)
+        node = build(:node)
         allow( node ).to receive(:prevent_auto_update_settings_timestamp?).and_return(false)
         expect( node ).to receive(:update_settings_timestamp).and_call_original
         node.save!
@@ -528,7 +530,7 @@ describe Node do
 
     context "when #prevent_auto_update_settings_timestamp? is true" do
       it "is not called after save" do
-        node = FactoryGirl.build(:node)
+        node = build(:node)
         allow( node ).to receive(:prevent_auto_update_settings_timestamp?).and_return(true)
         expect( node ).to_not receive(:update_settings_timestamp)
         node.save!

data/spec/lib/releaf/content/route_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 describe Releaf::Content::Route do
-  let(:node_route) { FactoryGirl.build(:node_route, node_class: Node, node_id: 12, locale: "en", path: "/en") }
+  let(:node_route) { FactoryBot.build(:node_route, node_class: Node, node_id: 12, locale: "en", path: "/en") }
 
 
   describe ".default_controller" do

data/spec/routing/node_mapper_spec.rb

@@ -165,7 +165,8 @@ describe Releaf::Content::NodeMapper do
       it "uses the custom path for public website route" do
         routes.draw do
           node_routes_for(TextPage) do |route|
-            get 'home_pages#show', path: "#{route.path}/abc/:my_id"
+            route.path += "/abc/:my_id"
+            get 'home_pages#show'
           end
         end
 

data/spec/services/releaf/content/node/copy_spec.rb

@@ -53,7 +53,7 @@ describe Releaf::Content::Node::Copy do
 
         # make sure the files are stored and exist
         expect(copy.content.top_banner.path).to start_with Dragonfly.app.datastore.root_path
-        expect(node.content.top_banner.path).to start_with Dragonfly.app.datastore.root_path
+        expect(node.content.class.find(node.content.id).top_banner.path).to start_with Dragonfly.app.datastore.root_path
         expect(copy.content.top_banner.path).to_not eq node.content.top_banner.path
       end
     end

data/spec/validators/content/node/parent_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe Releaf::Content::Node::ParentValidator do
-  let!(:root_node) { FactoryGirl.create(:node, content_type: 'HomePage') }
+  let!(:root_node) { FactoryBot.create(:node, content_type: 'HomePage') }
 
   class DummyNodeParentValidatorModel < ActiveRecord::Base
     acts_as_node
@@ -25,8 +25,8 @@ describe Releaf::Content::Node::ParentValidator do
 
   context "when parent is valid" do
     it "doesn't add error" do
-      parent = DummyNodeParentValidatorNode.create!( FactoryGirl.attributes_for(:node, content_type: 'DummyNodeParentValidator1Controller') )
-      child  = DummyNodeParentValidatorNode.new( FactoryGirl.attributes_for(:node, content_type: 'DummyNodeParentValidatorModel', parent_id: parent.id) )
+      parent = DummyNodeParentValidatorNode.create!( FactoryBot.attributes_for(:node, content_type: 'DummyNodeParentValidator1Controller') )
+      child  = DummyNodeParentValidatorNode.new( FactoryBot.attributes_for(:node, content_type: 'DummyNodeParentValidatorModel', parent_id: parent.id) )
 
       expect( child ).to be_valid
     end
@@ -34,8 +34,8 @@ describe Releaf::Content::Node::ParentValidator do
 
   context "when parent is invalid" do
     it "adds error on content_type" do
-      parent = DummyNodeParentValidatorNode.create!( FactoryGirl.attributes_for(:node, content_type: 'DummyNodeParentValidator2Controller') )
-      child  = DummyNodeParentValidatorNode.new( FactoryGirl.attributes_for(:node, content_type: 'DummyNodeParentValidatorModel', parent_id: parent.id) )
+      parent = DummyNodeParentValidatorNode.create!( FactoryBot.attributes_for(:node, content_type: 'DummyNodeParentValidator2Controller') )
+      child  = DummyNodeParentValidatorNode.new( FactoryBot.attributes_for(:node, content_type: 'DummyNodeParentValidatorModel', parent_id: parent.id) )
 
       expect( child ).to be_invalid
       expect( child.errors[:content_type].size ).to eq(1)
@@ -46,8 +46,8 @@ describe Releaf::Content::Node::ParentValidator do
 
   context "when content_type is not in child list" do
     it "doesn't add error" do
-      parent = DummyNodeParentValidatorNode.create!( FactoryGirl.attributes_for(:node, content_type: 'DummyNodeParentValidator1Controller') )
-      child  = DummyNodeParentValidatorNode.new( FactoryGirl.attributes_for(:node, content_type: 'DummyNodeParentValidator2Controller', parent_id: parent.id) )
+      parent = DummyNodeParentValidatorNode.create!( FactoryBot.attributes_for(:node, content_type: 'DummyNodeParentValidator1Controller') )
+      child  = DummyNodeParentValidatorNode.new( FactoryBot.attributes_for(:node, content_type: 'DummyNodeParentValidator2Controller', parent_id: parent.id) )
 
       expect( child ).to be_valid
     end

data/spec/validators/content/node/root_validator_spec.rb

@@ -19,11 +19,11 @@ describe Releaf::Content::Node::RootValidator do
 
 
   def create_node *params
-    DummyRootValidatorNode.create!( FactoryGirl.attributes_for(:node, *params) )
+    DummyRootValidatorNode.create!( FactoryBot.attributes_for(:node, *params) )
   end
 
   def build_node *params
-    DummyRootValidatorNode.new( FactoryGirl.attributes_for(:node, *params) )
+    DummyRootValidatorNode.new( FactoryBot.attributes_for(:node, *params) )
   end
 
   context "when node is allowed to be root node" do

data/spec/validators/content/node/singleness_validator_spec.rb

@@ -30,11 +30,11 @@ describe Releaf::Content::Node::SinglenessValidator do
 
 
   def create_node *params
-    DummySinglenessValidatorNode.create!( FactoryGirl.attributes_for(:node, *params) )
+    DummySinglenessValidatorNode.create!( FactoryBot.attributes_for(:node, *params) )
   end
 
   def build_node *params
-    DummySinglenessValidatorNode.new( FactoryGirl.attributes_for(:node, *params) )
+    DummySinglenessValidatorNode.new( FactoryBot.attributes_for(:node, *params) )
   end
 
   let!(:root_node) { create_node(content_type: 'HomePage') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-content
 version: !ruby/object:Gem::Version
-  version: 1.1.22
+  version: 2.0.0
 platform: ruby
 authors:
 - CubeSystems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-10-29 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.1.22
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.22
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '3.0'
 description: Content subsystem for releaf
 email: info@cubesystems.lv
 executables: []
@@ -73,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- app/assets/config/releaf_content_manifest.js
 - app/assets/javascripts/controllers/releaf/content/nodes.js
 - app/assets/stylesheets/controllers/releaf/content/nodes.scss
 - app/builders/releaf/content/builders/action_dialog.rb
@@ -135,7 +136,7 @@ homepage: https://github.com/cubesystems/releaf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,8 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Node and content routes support for releaf
 test_files: