vidibus-permalink 0.1.9 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a0f6739c06733a192c1cc9d64e185be44323af2a
+  data.tar.gz: 87b4010b49dab36fbe7e7bd23a0566a046721fd2
+SHA512:
+  metadata.gz: a32a63c0e96135aa6915add4a471666008bdfac1fe19053094b53a874268dc49925e60d61df67efa40e377797fdabe5c8944444fa21f23677308a8ea08f13a8e
+  data.tar.gz: 55eac63dd2eba1965e68624cdb516bb99d6028c6e17c079a1a0c0fd6d7c13a559a0592dab10f3656da438de8bef6701b74ee486bee45a7bed3ab67727a1144cf

data/README.md

@@ -28,4 +28,4 @@ Then call bundle install on your console.
 
 ## Copyright
 
-Copyright (c) 2010-2013 Andre Pankratz. See LICENSE for details.
+Copyright (c) 2010-2019 Andre Pankratz. See LICENSE for details.

data/app/models/permalink.rb

@@ -2,41 +2,19 @@ class Permalink
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  class UuidRequiredError < StandardError; end
+  belongs_to :linkable, polymorphic: true
 
   field :value
-  field :linkable_class
-  field :linkable_uuid
-  field :scope, :type => Array
-  field :_current, :type => Boolean, :default => true
+  field :scope, type: Array
+  field :_current, type: Boolean, default: true
 
   before_validation :sanitize_value!
-  after_save :unset_other_current, :if => :current?
-  after_destroy :set_last_current, :if => :current?
-
-  validates :linkable_uuid, :uuid => true
-  validates :value, :linkable_class, :presence => true
-
-  index value: 1
-
-  # Sets object as linkable.
-  def linkable=(obj)
-    @linkable = nil
-    self.linkable_class = obj.class.to_s
-    if uuid = obj.try!(:uuid)
-      self.linkable_uuid = uuid
-    else
-      raise UuidRequiredError.new("The linkable object must respond to #uuid. The gem vidibus-uuid will help you.")
-    end
-  end
+  after_save :unset_other_current, if: :current?
+  after_destroy :set_last_current, if: :current?
 
-  # Returns the linkable object.
-  def linkable
-    @linkable ||= begin
-      return unless linkable_class and linkable_uuid
-      linkable_class.constantize.where(:uuid => linkable_uuid).first
-    end
-  end
+  validates :value, :linkable, presence: true
+
+  index({value: 1}, {sparse: true})
 
   # Sanitizes and increments string, if necessary.
   def sanitize_value!
@@ -69,7 +47,7 @@ class Permalink
       if current?
         self
       else
-        Permalink.where(:linkable_uuid => linkable_uuid, :_current => true).first
+        Permalink.where(linkable_id: linkable.id, _current: true).first
       end
     end
   end
@@ -83,18 +61,18 @@ class Permalink
   class << self
     # Scope method for finding Permalinks for given object.
     def for_linkable(object)
-      where(:linkable_uuid => object.uuid)
+      where(linkable_id: object.id)
     end
 
     # Scope method for finding Permalinks for given value.
     # The value will be sanitized.
     def for_value(value)
-      where(:value => sanitize(value))
+      where(value: sanitize(value))
     end
 
     def for_scope(scope)
       return all unless scope
-      all_in(:scope => scope_list(scope))
+      all_in(scope: scope_list(scope))
     end
 
     # Returns a dispatcher object for given path.
@@ -112,7 +90,7 @@ class Permalink
     def scope_list(scope)
       return [] unless scope
       return scope if scope.kind_of?(Array)
-      scope.map {|key, value| "#{key}:#{value}"}
+      scope.map { |key, value| "#{key}:#{value}" }
     end
   end
 
@@ -158,24 +136,32 @@ class Permalink
   # Finds existing permalinks with current value.
   def existing(string)
     @existing ||= {}
-    @existing[string] ||=
-      Permalink.for_scope(scope).where(:value => /^#{string}(-\d+)?$/).excludes(:_id => id).to_a
+    @existing[string] ||= Permalink
+      .for_scope(scope)
+      .where(value: /^#{string}(-\d+)?$/)
+      .excludes(:_id => id)
+      .to_a
   end
 
   # Sets _current to false on all permalinks of the assigned linkable.
   def unset_other_current
     return unless linkable
-    conditions = {:linkable_uuid => linkable_uuid, :_id => {"$ne" => _id}}
+    conditions = {linkable_id: linkable.id, _id: {'$ne' => id}}
     conditions[:scope] = Permalink.scope_list(scope) if scope.present?
-    collection.
-      find(conditions).
-      update({'$set' => {_current: false}}, {multi: true})
+    Permalink.where(conditions).each do |obj|
+      obj.set(_current: false)
+    end
   end
 
   # Sets the lastly updated permalink of the assigned linkable as current one.
   def set_last_current
-    if last = Permalink.where(:linkable_uuid => linkable_uuid).order_by(:updated_at.desc).limit(1).first
-      last.update_attributes!(:_current => true)
+    last = Permalink
+      .where(linkable_id: linkable.id)
+      .order_by(:updated_at.desc)
+      .limit(1)
+      .first
+    if last
+      last.update_attributes!(_current: true)
     end
   end
 end

data/lib/vidibus/permalink/dispatcher.rb

@@ -60,12 +60,12 @@ module Vidibus
       private
 
       def resolve_path
-        results = ::Permalink.for_scope(@scope).any_in(:value => parts)
+        results = ::Permalink.for_scope(@scope).any_in(value: parts)
         links = Array.new(parts.length)
         done = {}
         for result in results
           if i = parts.index(result.value)
-            key = "#{result.linkable_class}##{result.linkable_uuid}"
+            key = "#{result.linkable_type}##{result.linkable_id}"
             next if done[key]
             links[i] = result
             done[key] = true
@@ -76,11 +76,11 @@ module Vidibus
 
       # Returns an array containing the current permalinks of all objects.
       def current_parts
-        objects.map {|o| o.current.value}
+        objects.map { |o| o.current.value }
       end
 
       def redirectables
-        objects.select {|o| !o.current?}
+        objects.select { |o| !o.current? }
       end
     end
   end

data/lib/vidibus/permalink/mongoid.rb

@@ -6,18 +6,18 @@ module Vidibus
       class PermalinkConfigurationError < StandardError; end
 
       included do
-        field :permalink, :type => String
-        field :static_permalink, :type => String
+        field :permalink, type: String
+        field :static_permalink, type: String
 
-        index permalink: 1
-        index static_permalink: 1
+        index({permalink: 1}, {sparse: true})
+        index({static_permalink: 1}, {sparse: true})
 
         attr_accessor :skip_permalink
 
-        before_validation :set_permalink, :unless => :skip_permalink
-        validates :permalink, :presence => true, :unless => :skip_permalink
+        before_validation :set_permalink, unless: :skip_permalink
+        validates :permalink, presence: true, unless: :skip_permalink
 
-        after_save :store_permalink_object, :unless => :skip_permalink
+        after_save :store_permalink_object, unless: :skip_permalink
         after_destroy :destroy_permalink_objects
       end
 
@@ -42,18 +42,23 @@ module Vidibus
 
       # Returns the defined permalink repository object.
       def permalink_repository
-        @permalink_repository ||= (self.class.permalink_options[:repository] == false) ? nil : ::Permalink
+        @permalink_repository ||= begin
+          self.class.permalink_options[:repository] == false ? nil : ::Permalink
+        end
       end
 
       # Returns the current permalink object.
       def permalink_object
-        @permalink_object ||
-          permalink_repository.for_linkable(self).where(:_current => true).first if permalink_repository
+        @permalink_object || if permalink_repository
+          permalink_repository.for_linkable(self).where(_current: true).first
+        end
       end
 
       # Returns all permalink objects ordered by time of update.
       def permalink_objects
-        permalink_repository.for_linkable(self).asc(:updated_at) if permalink_repository
+        if permalink_repository
+          permalink_repository.for_linkable(self).asc(:updated_at)
+        end
       end
 
       # Returns permalink scope.
@@ -66,14 +71,21 @@ module Vidibus
       # Returns a existing or new permalink object with wanted value.
       # The permalink scope is also applied
       def permalink_object_by_value(value)
-        permalink_repository.for_linkable(self).for_value(value).for_scope(permalink_scope).first ||
-          permalink_repository.new(:value => value, :scope => permalink_scope, :linkable => self)
+        item = permalink_repository
+          .for_linkable(self)
+          .for_value(value)
+          .for_scope(permalink_scope)
+          .first
+        item ||= permalink_repository.new({
+          value: value,
+          scope: permalink_scope,
+          linkable: self
+        })
       end
 
       def get_scope
         scope = self.class.permalink_options[:scope]
         return unless scope
-
         {}.tap do |hash|
           scope.each do |key, value|
             if value.kind_of?(String)
@@ -99,12 +111,12 @@ module Vidibus
 
         changed = false
         values = []
-        for a in attribute_names
-          changed = send("#{a}_changed?") unless changed == true
-          values << send(a)
+        attribute_names.each do |name|
+          changed ||= changes[name].present?
+          values << attributes[name.to_s]
         end
-        return unless permalink.blank? or changed
-        value = values.join(" ")
+        return unless permalink.blank? || changed
+        value = values.join(' ')
         if permalink_repository
           @permalink_object = permalink_object_by_value(value)
           @permalink_object.sanitize_value!
@@ -123,13 +135,16 @@ module Vidibus
 
       # Stores current new permalink object or updates an existing one that matches.
       def store_permalink_object
-        return unless @permalink_object
-        @permalink_object.updated_at = Time.now
-        @permalink_object.save!
+        return unless obj = @permalink_object
+        @permalink_object = nil # reset to avoid storing it again
+        obj.updated_at = Time.now
+        obj.save!
       end
 
       def destroy_permalink_objects
-        permalink_repository.delete_all(:conditions => {:linkable_uuid => uuid}) if permalink_repository
+        if permalink_repository
+          permalink_repository.where(linkable_id: id).delete
+        end
       end
     end
   end

data/lib/vidibus/permalink/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Permalink
-    VERSION = '0.1.9'
+    VERSION = '1.1.1'
   end
 end

data/lib/vidibus-permalink.rb

@@ -1,7 +1,6 @@
 require "active_support"
 require "mongoid"
 require "vidibus-core_extensions"
-require "vidibus-uuid"
 require "vidibus-words"
 
 require "vidibus/permalink"

metadata

@@ -1,190 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: vidibus-permalink
 version: !ruby/object:Gem::Version
-  version: 0.1.9
-  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors:
 - Andre Pankratz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: vidibus-core_extensions
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vidibus-uuid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vidibus-words
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Allows changeable permalinks (good for SEO).
@@ -193,41 +156,37 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/vidibus/permalink/dispatcher.rb
-- lib/vidibus/permalink/mongoid.rb
-- lib/vidibus/permalink/version.rb
-- lib/vidibus/permalink.rb
-- lib/vidibus-permalink.rb
-- app/models/permalink.rb
 - LICENSE
 - README.md
 - Rakefile
+- app/models/permalink.rb
+- lib/vidibus-permalink.rb
+- lib/vidibus/permalink.rb
+- lib/vidibus/permalink/dispatcher.rb
+- lib/vidibus/permalink/mongoid.rb
+- lib/vidibus/permalink/version.rb
 homepage: https://github.com/vidibus/vidibus-permalink
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3383487206857057643
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Permalink handling
 test_files: []