simplec 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60e1f58d4c9b9f14e5f5b351649420083c35e457
-  data.tar.gz: f5242acb988463f804efdb1b9707cfd8a1c1011b
+  metadata.gz: 9dee3744e8854330cbcf79ae6c9f2495c342a02e
+  data.tar.gz: ff0bceb7a5930bee2c635b0cc9d46076ee70bc99
 SHA512:
-  metadata.gz: 449575640f16da976384986804fc3906cbd5ce3558a1b3928d8ebefb05ae0f9a4b8e34473218301deb1fa7ea8d249dab28247fab300df94a8a096ef2d8368684
-  data.tar.gz: bc82948bcc1feb8e4715bb774b7b2f1957e2a1e3e2db855147c216860647cb3d06a791cd3f7403a42d847c4aae3c4bdcef1e7989564c02ccfc552226f563a0ea
+  metadata.gz: d93a2f80baa72c5db2973d063d4246c9eac0bf218be65576be8b9162733e6188cd74b85240418cc72acd40d7df426ea01f802d7e9e277c5087fd294175a59a66
+  data.tar.gz: 0bd3858809d3d3587920e1989e879f37e5fcdca6fcc4bce2b556f0a5fc5041e8e0b5a67ce25e6b7f9c318b8e8654e0effef128b61be40834cb643970ad781744

data/app/models/simplec/document.rb

@@ -16,6 +16,14 @@ module Simplec
       self.file.url
     end
 
+    # @!visibility private
+    module Normalizers
+      def slug=(val)
+        super val.blank? ? nil : val
+      end
+    end
+    prepend Normalizers
+
     private
 
     def validate_subdomain_or_set!
@@ -25,13 +33,13 @@ module Simplec
     end
 
     def validate_slug!
-      return if self.slug.nil?
+      return if self.slug.blank?
       similar = self.class.where(slug: self.slug).where.not(id: self.id)
       return if similar.size == 0
       return if (
         similar.map(&:subdomain_ids).flatten & self.subdomain_ids
       ).length == 0
-      errors.add :slug, 'slug must be unique across linked subdomains'
+      errors.add :slug, 'must be unique across linked subdomains'
     end
 
   end

data/app/models/simplec/document_set.rb

@@ -9,6 +9,14 @@ module Simplec
     validate :validate_subdomain!
     validate :validate_slug!
 
+    # @!visibility private
+    module Normalizers
+      def slug=(val)
+        super val.blank? ? nil : val
+      end
+    end
+    prepend Normalizers
+
     private
 
     def validate_subdomain!
@@ -17,12 +25,13 @@ module Simplec
     end
 
     def validate_slug!
+      return if self.slug.blank?
       similar = self.class.where(slug: self.slug).where.not(id: self.id)
       return if similar.size == 0
       return if (
         similar.map(&:subdomain_ids).flatten & self.subdomain_ids
       ).length == 0
-      errors.add :slug, 'slug must be unique across linked subdomains'
+      errors.add :slug, 'must be unique across linked subdomains'
     end
 
   end

data/app/models/simplec/page.rb

@@ -392,13 +392,12 @@ module Simplec
     # @!visibility private
     module Normalizers
       def slug=(val)
-        val = val ? val.to_s.split('/').reject(&:blank?).join('/') : val
-        super val
+        super clean_path(val)
       end
 
       def slug
         if self.parent_id && self.parent.nil?
-          self.path.to_s.split('/').reject(&:blank?).join('/')
+          clean_path(self.path)
         else
           super
         end
@@ -410,6 +409,12 @@ module Simplec
 
     private
 
+    def clean_path(val)
+      val ?
+        val.to_s.strip.gsub(/[\s-]+/, '-').gsub(/[^\w-]/, '').split('/').reject(&:blank?).join('/') :
+        val
+    end
+
     def validate_path_not_nil!
       return unless self.path.nil?
       errors.add :path, "cannot be nil"

data/lib/simplec/version.rb

@@ -1,3 +1,3 @@
 module Simplec
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplec
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Matt Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails