active_permalink 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da5262296637cea151a12211bbff29a02fdf70ef
-  data.tar.gz: 9a9c55ff2ded150edd62fa0e9fe65de96f4e528e
+SHA256:
+  metadata.gz: e97292918ed86b8b4f35528c3ad2af732fce12271b76b13847700fbfc82b8fdf
+  data.tar.gz: 899e0657462da00c685560076368fc988f607d2c7d77e3f1e01cc692803e4f34
 SHA512:
-  metadata.gz: 6319685df9f33bb57a64b3e99f13575c23e427caf4427f249f6ed9c25a795cd6bfe045e7a260541f8d84424b3f0452b51f67d465f603e4cc761092ebf04d4cb5
-  data.tar.gz: '04388c30e998ca73cbeca70c729862207c4d21983fa22054887582571d4420d43ddfb1c0be7b99a5086af3bdeae58510cef6d8bd23179f9f1d8f2e0b0eacfbd4'
+  metadata.gz: 821a04f9468ecdde47b33485745b44229b3fde119765e35cbb5520db3170e67e7cdf31d600f7c62367de0476d2201bb991632a571f9a6685387d80366884ffd5
+  data.tar.gz: a223244a92a8dddc3525e1b763dbbafe07b122ea9d63e713ff80c6d02d2a2b4fe03e825704068bad3b1796fcd70410dfae40bb5de286a0940108f80b8735f798

data/README.md

@@ -32,12 +32,8 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/hardpixel/active-permalink. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/hardpixel/active-permalink.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the ActivePermalink project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/hardpixel/active-permalink/blob/master/CODE_OF_CONDUCT.md).

data/lib/active_permalink.rb

@@ -1,15 +1,14 @@
+require 'stringex'
 require 'active_record'
 require 'active_delegate'
-require 'babosa'
 require 'active_permalink/version'
 
 module ActivePermalink
   extend ActiveSupport::Autoload
 
-  # Autoload base modules
   autoload :Permalink
   autoload :Generator
-  autoload :Sluggable
+  autoload :Querying
   autoload :Loader
 end
 

data/lib/active_permalink/generator.rb

@@ -1,12 +1,11 @@
 module ActivePermalink
   class Generator
-    def initialize(record, field, old_value, new_value, options={})
+    def initialize(record, field, old_value, new_value, options = {})
       @record    = record
       @field     = field
       @old_value = old_value
       @new_value = new_value
       @options   = options
-      @translit  = options[:transliterations]
       @scope     = options.fetch :scope, :global
     end
 
@@ -15,7 +14,7 @@ module ActivePermalink
     end
 
     def slug_from_column
-      @column_slug ||= slug_candidates.to_slug.normalize(transliterations: @translit).to_s
+      @column_slug ||= slug_candidates.to_s.to_url
     end
 
     def scope_unique_slug
@@ -30,25 +29,25 @@ module ActivePermalink
     end
 
     def deactivate_old_permalink
-      unless @record.active_permalink.new_record?
-        parameters = { slug: @old_value, active: true }
-        permalink  = @record.old_permalinks.rewhere(parameters).first
+      return if @record.active_permalink.new_record?
 
-        permalink.update_column(:active, false) unless permalink.nil?
-      end
+      parameters = { slug: @old_value, active: true }
+      permalink  = @record.old_permalinks.rewhere(parameters).first
+
+      permalink.update_column(:active, false) unless permalink.nil?
     end
 
     def reassign_old_permalink
       permalink = @record.old_permalinks.find_by(slug: slug_from_column)
+      return if permalink.nil?
 
-      unless permalink.nil?
-        permalink.update(active: true)
-        permalink
-      end
+      permalink.update(active: true)
+      permalink
     end
 
     def build_new_permalink
-      @record.build_active_permalink(slug: scope_unique_slug, scope: @scope, active: true)
+      parameters = { slug: scope_unique_slug, scope: @scope, active: true }
+      @record.build_active_permalink(parameters)
     end
 
     def new_permalink

data/lib/active_permalink/loader.rb

@@ -3,9 +3,9 @@ module ActivePermalink
     extend ActiveSupport::Concern
 
     class_methods do
-      def has_permalink(field, options={})
+      def has_permalink(field, options = {})
         include ActiveDelegate
-        include Sluggable
+        include Querying
 
         assoc_opts = { as: :sluggable, class_name: 'ActivePermalink::Permalink', dependent: :destroy }
         has_many :permalinks, assoc_opts

data/lib/active_permalink/permalink.rb

@@ -1,15 +1,11 @@
 module ActivePermalink
   class Permalink < ActiveRecord::Base
-    # Set table name
     self.table_name = 'permalinks'
 
-    # Set default scope
     default_scope { order created_at: :desc }
 
-    # Set custom scopes
     scope :global, -> { where scope: :global }
 
-    # Belongs associations
     belongs_to :sluggable, polymorphic: true, optional: true
   end
 end

data/lib/active_permalink/{sluggable.rb → querying.rb}

@@ -1,28 +1,28 @@
 module ActivePermalink
-  module Sluggable
+  module Querying
     extend ActiveSupport::Concern
 
     class_methods do
       def find_by_slug(value)
-        _find_by_permalinks_slug(value)
+        _find_by_permalink_slug(value)
       end
 
       def find_by_slug!(value)
-        _find_by_permalinks_slug(value, true)
+        _find_by_permalink_slug(value, true)
       end
 
       private
 
-        def _find_by_permalinks_slug(value, raise_error=false)
-          method = raise_error ? :find_by! : :find_by
-          record = includes(:permalinks).send(method, permalinks: { slug: value })
+      def _find_by_permalink_slug(value, raise_error = false)
+        method = raise_error ? :find_by! : :find_by
+        record = includes(:permalinks).send(method, permalinks: { slug: value })
 
-          unless record.nil?
-            record.found_by_slug = value
-          end
-
-          record
+        unless record.nil?
+          record.found_by_slug = value
         end
+
+        record
+      end
     end
 
     def found_by_slug
@@ -38,7 +38,7 @@ module ActivePermalink
     end
 
     def needs_redirect?
-      found_by_slug? and found_by_slug != slug
+      found_by_slug? && found_by_slug != slug
     end
 
     def old_slugs

data/lib/active_permalink/version.rb

@@ -1,3 +1,3 @@
 module ActivePermalink
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_permalink
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: babosa
+  name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,7 +109,7 @@ files:
 - lib/active_permalink/generator.rb
 - lib/active_permalink/loader.rb
 - lib/active_permalink/permalink.rb
-- lib/active_permalink/sluggable.rb
+- lib/active_permalink/querying.rb
 - lib/active_permalink/version.rb
 - lib/generators/active_permalink/install_generator.rb
 - lib/generators/active_permalink/templates/migration.rb
@@ -134,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Add permalinks to ActiveRecord models

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at jonian@hardpixel.eu. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/