releaf-content 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 026715c8a6ea2c87e202bf6790b4f67df7afb238
-  data.tar.gz: 908892fee01d32e657a5dfbb186c138df5d6b437
+  metadata.gz: 50140d486352908f00053195a847e307f6905bf8
+  data.tar.gz: 60cbeff04c5d56eb50042904845de7bf87c9b7e2
 SHA512:
-  metadata.gz: daaa7f982c8747ce37087b831f57f7fdaf37caefb5c45553881dcfd4fee3ec356c8b61d4538675512e7d540ab8a5080a2bdebdd4a284b65f95060bc6bd3a2bbe
-  data.tar.gz: f860c3d0ccaaf1dc3a735674e1f40f75ff386f2e97bbf7a5ca5625c5ae959ef5ef51d79fd589a850aa3743d75cef6359cf90897cc21b53a3fa99b2c3fc992b03
+  metadata.gz: ff76c9fb70089fdd796c29447b5e37f67740d2cc0c691cd08c4314fac8c1425fc0ce50f3258d6a4978680b7cd86c00cf30aa9d2c53a9467ab15aa5499f394c45
+  data.tar.gz: 1a2a711aa4d467fc697ba3fcaaec0eed5a7ee4e0c500c39df401a99ed6f329ef2a19a35c0707d514ed570c9276d7f0425da2d7270f184cc1c805fb9bd3e9d449

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

@@ -61,7 +61,7 @@ jQuery(function()
                     slug_input.val( slug );
                     slug_link.find('span').text( encodeURIComponent( slug ) );
                     slug_button.trigger('loadingend');
-                }, 'text');
+                });
             });
 
             slug_button.click(function()
@@ -72,9 +72,12 @@ jQuery(function()
             if (name_input.val() === '')
             {
                 // bind onchange slug generation only if starting out with an empty name
-                name_input.change(function()
+                name_input.on('change', function()
                 {
-                    slug_input.trigger('sluggenerate');
+                    if(slug_input.val().length === 0)
+                    {
+                        slug_input.trigger('sluggenerate');
+                    }
                 });
             }
         }

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

@@ -10,9 +10,7 @@ class Releaf::Content::NodesController < Releaf::ActionController
     tmp_resource.name = params[:name]
     tmp_resource.reasign_slug
 
-    respond_to do |format|
-      format.js { render text: tmp_resource.slug }
-    end
+    render text: tmp_resource.slug
   end
 
   def content_type_dialog

data/lib/releaf/content/node.rb

@@ -132,6 +132,10 @@ module Releaf::Content
         locale_selection_enabled? && root?
       end
 
+      def invalid_slug_format?
+        slug.present? && slug.to_url != slug
+      end
+
       protected
 
       def validate_parent_node_is_not_self
@@ -146,6 +150,10 @@ module Releaf::Content
         self.errors.add(:parent_id, "descendant can't be parent")
       end
 
+      def validate_slug
+        errors.add(:slug, :invalid) if invalid_slug_format?
+      end
+
       private
 
       def prevent_auto_update_settings_timestamp?
@@ -198,6 +206,7 @@ module Releaf::Content
       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
       accepts_nested_attributes_for :content
 

data/spec/features/nodes_spec.rb

@@ -271,6 +271,34 @@ describe "Nodes", js: true, with_tree: true, with_root: true do
 
   end
 
+  scenario "Slugs", with_tree: false do
+    visit admin_nodes_path
+
+    open_toolbox_dialog 'Add child', @lv_root, ".view-index .collection li"
+    within_dialog do
+    click_link("Text page")
+    end
+
+    fill_in "Slug", with: "some-slug"
+    fill_in 'Name', with: "About us"
+    expect(page).to have_field("Slug", with: "some-slug")
+
+    fill_in "Slug", with: ""
+    fill_in 'Name', with: "About them"
+    expect(page).to have_field("Slug", with: "about-them")
+
+    # fill text to allow text page save
+    fill_in_richtext "Text", with: "asdasd"
+
+    fill_in "Slug", with: "invalid slug <>!"
+    click_button "Save"
+    expect(page).to have_error("is invalid", field: "Slug")
+    click_button "Suggest slug"
+    expect(page).to have_field("Slug", with: "about-them")
+    click_button "Save"
+    expect(page).to have_notification("Create succeeded")
+  end
+
   describe "node order", with_tree: false do
     def create_child parent, child_text, position=nil
       visit admin_nodes_path

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

@@ -353,6 +353,50 @@ describe Node do
     end
   end
 
+  describe "#validate_slug" do
+    it "is called during validations" do
+      expect( subject ).to receive(:validate_slug)
+      subject.valid?
+    end
+
+    context "when invalid slug" do
+      it "adds format error on slug" do
+        allow(subject).to receive(:invalid_slug_format?).and_return(true)
+        expect{ subject.send(:validate_slug) }.to change{ subject.errors[:slug] }.to(["is invalid"])
+      end
+    end
+
+    context "when valid slug" do
+      it "does not add format error on slug" do
+        allow(subject).to receive(:invalid_slug_format?).and_return(false)
+        expect{ subject.send(:validate_slug) }.to_not change{ subject.errors[:slug] }.from([])
+      end
+    end
+  end
+
+  describe "#invalid_slug_format?" do
+    context "when slug value converted to url differs" do
+      it "returns true" do
+        subject.slug = "asd xx"
+        expect(subject.invalid_slug_format?).to be true
+      end
+    end
+
+    context "when slug value converted to url is same" do
+      it "returns false" do
+        subject.slug = "asd-xx"
+        expect(subject.invalid_slug_format?).to be false
+      end
+    end
+
+    context "when slug value is nil" do
+      it "returns false" do
+        subject.slug = nil
+        expect(subject.invalid_slug_format?).to be false
+      end
+    end
+  end
+
   describe "#validate_parent_node_is_not_self" do
     let(:node1) { create(:node, locale: "lv") }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-content
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - CubeSystems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-12-06 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.4
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Node and content routes support for releaf