slugs 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9df30988555a045bd418b90aa72fa57b6a87549f
-  data.tar.gz: 5d02fbdec96cab05fb92f14a7092072c69435155
+  metadata.gz: aecbeea315d4b4db2d895b00469e2a38182fdd6a
+  data.tar.gz: 70ba94e82740be45d7e55ee9d1446fafc5cd06b3
 SHA512:
-  metadata.gz: 8aea2da8d1ac5cd6b659d14e7752d8ca1ebfcece335ae492f924675de281660c24794dd4f2901a945a92fecc3b270f95d2226afc619b68bf767fa9a0d9cd8d58
-  data.tar.gz: 94d95f8c93a02e70d9b13010e89cbe8398660bc877d69f1f8ca5b73902ac7f5da1c7aea595d574f274df0029a0178484a8bceb3f02aadf3cc002e1fae226eef1
+  metadata.gz: 2ee46e927cab1a0caaafb8f3d50f9b849d9967a8e021aa433eea986df07380cfac89126b786976a210079f02a2d7f3e0f898d6885d35d73dc117f9322bbaeb86
+  data.tar.gz: 566f8b8a896fd6bc4741e698c03b59149aee1eba08638159e57db08c7e580e9a9cf4d22a276de8003fdc063e6e7aa36ee57d7e8b0facae64d66f5638ef5bf067

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 Museways
+Copyright 2015 Museways
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -49,15 +49,12 @@ If you need a very custom slug you can use a lambda, proc or block:
 has_slug proc { |record| "#{record.prop}-custom" }
 ```
 
-Then the find method of your models will accept slugs and ids transparently:
+To find a record by slug:
 ```ruby
-Model.find 'slug'
+Model.slugged.find 'slug'
 ```
 
-All the path and url helpers will start using the slug by default if you want to force the id:
-```ruby
-model_path(instance.id)
-```
+NOTE: All the path and url helpers will start using the slug by default.
 
 ## Credits
 

data/lib/slugs/active_record/base.rb

@@ -4,7 +4,15 @@ module Slugs
       extend ActiveSupport::Concern
 
       def to_param
-        self.class.sluggable? ? (slug_changed? ? slug_was : slug) : super
+        if self.class.sluggable?
+          if slug_changed?
+            slug_was
+          else
+            slug
+          end
+        else
+          super
+        end
       end
 
       protected
@@ -51,7 +59,7 @@ module Slugs
 
         def has_slug(*args, &block)
           unless sluggable?
-            if respond_to? :translatable? and translatable?
+            if try(:translatable?)
               include Slugs::ActiveRecord::Translatable
               attr_translatable :slug
               before_validation :generate_slugs
@@ -59,6 +67,7 @@ module Slugs
               include Slugs::ActiveRecord::NonTranslatable
               before_validation :generate_slug
             end
+            include Slugs::ActiveRecord::Finders
             if block_given?
               self.slug = block
             else

data/lib/slugs/active_record/finders.rb

@@ -0,0 +1,24 @@
+module Slugs
+  module ActiveRecord
+    module Finders
+      extend ActiveSupport::Concern
+      module ClassMethods
+
+        def slugged
+          all.extending do
+
+            def find(*args)
+              find_by_slug args.first
+            end
+
+            def exists?(*args)
+              exists_by_slug? args.first
+            end
+
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/slugs/active_record/non_translatable.rb

@@ -4,10 +4,6 @@ module Slugs
       extend ActiveSupport::Concern
       module ClassMethods
 
-        def exists_by_slug(id)
-          exists? slug: id
-        end
-
         def find_previous_slug(slug)
           where(
             'slug LIKE ? OR slug = ?', "#{slug}-%", slug
@@ -16,6 +12,14 @@ module Slugs
           ).map(&:slug).select{ |r| r =~ /^#{slug}(-\d+)?$/ }.first
         end
 
+        def find_by_slug(id)
+          find_by slug: id
+        end
+
+        def exists_by_slug?(id)
+          exists? slug: id
+        end
+
       end
     end
   end

data/lib/slugs/active_record/translatable.rb

@@ -38,7 +38,7 @@ module Slugs
           ).readonly(false).first
         end
 
-        def exists_by_slug(id)
+        def exists_by_slug?(id)
           t = reflect_on_association(:translations)
           joins(:translations).exists? t.table_name.to_sym => { slug: id, locale: I18n.locale }
         end

data/lib/slugs/railtie.rb

@@ -3,7 +3,6 @@ module Slugs
 
     initializer 'slugs' do
       ::ActiveRecord::Base.send :include, Slugs::ActiveRecord::Base
-      ::ActiveRecord::Relation.send :include, Slugs::ActiveRecord::Relation
     end
 
   end

data/lib/slugs/version.rb

@@ -1,5 +1,5 @@
 module Slugs
 
-  VERSION = '1.2.5'
+  VERSION = '1.3.0'
 
 end

data/lib/slugs.rb

@@ -1,7 +1,7 @@
 require 'slugs/active_record/base'
 require 'slugs/active_record/non_translatable'
 require 'slugs/active_record/translatable'
-require 'slugs/active_record/relation'
+require 'slugs/active_record/finders'
 require 'slugs/railtie'
 
 module Slugs

data/test/dummy/config/environments/production.rb

@@ -20,7 +20,11 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/test/dummy/config/environments/test.rb

@@ -13,7 +13,11 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.
@@ -33,4 +37,8 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2
+    config.active_support.test_order = :random
+  end
 end