slugged 1.1.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 826ed7e245a1ed41d94a1c222fcf413011e27902
+  data.tar.gz: 6af346bdc4f70b054a8867ff21cc21e176a14dea
+SHA512:
+  metadata.gz: ee0bf448157c8c41a266692ca9a38c4f42d6f38f371fbf29b400ece5c7f1c4be0938c3c4cb9aac1d9ec50d2345b6f674a93da01bb4f7f94c5d50141e1c999c36
+  data.tar.gz: 6abeb15565c5b05c2ba6905e1bf13125ef8dda6ee735ba7d7d9c6d0b4f293e30edbbf26b77c1e4acc75a1eb18816c848ddb6bea4b2eab9ed3b3f83ee3d1bc35b

data/.travis.yml

@@ -1,14 +1,11 @@
 ---
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  # - jruby-18mode
-  # - jruby-19mode
-  - ree
+  - 2.0.0
 env:
   - RAILS_VERSION=""
+  - RAILS_VERSION="~>4.0.0"
   - RAILS_VERSION="~>3.2.0"
   - RAILS_VERSION="~>3.1.0"
   - RAILS_VERSION="~>3.0.0"

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 # Allow testing multiple versions with Travis.
 rails_version = ENV['RAILS_VERSION']
@@ -9,4 +9,4 @@ if rails_version && rails_version.length > 0
   gem 'activerecord',  rails_version
 end
 
-gemspec
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Slugged [![Build Status](https://secure.travis-ci.org/sutto/slugged.png?branch=master)](http://travis-ci.org/sutto/slugged)
+# Slugged [![Build Status](https://secure.travis-ci.org/Sutto/slugged.png?branch=master)](http://travis-ci.org/Sutto/slugged)
 
 ## About ###
 
@@ -30,7 +30,7 @@ and built to work on Rails 3 from the start.
 
 Using Slugged is simple. In Rails, simply drop this in your Gemfile:
 
-    gem 'slugged'
+    gem 'slugged', '~> 2.0'
     
 Optionally restricting the version.
 
@@ -121,6 +121,10 @@ Thanks to the following who contributed functionality / bug fixes:
 * Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+## Changes
+
+* __2.0.0__ - Support Rails 4.
+
 ## Copyright
 
 Copyright (c) 2010 Darcy Laycock. See LICENSE for details.

data/lib/slugged/active_record_methods.rb

@@ -85,7 +85,7 @@ module Slugged
       end
       
       def slug_scope_relation(record)
-        has_slug_scope? ? where(slug_scope => record.send(slug_scope)) : scoped
+        has_slug_scope? ? where(slug_scope => record.send(slug_scope)) : where(nil)
       end
       
       def slug_value_for(value)
@@ -125,4 +125,4 @@ module Slugged
       end
     end    
   end
-end
+end

data/lib/slugged/caching.rb

@@ -37,10 +37,10 @@ module Slugged
     module ClassMethods
       
       # Wraps find_using_slug to look in the cache.
-      def find_using_slug(slug, options = {})
+      def find_using_slug(slug)
         # First, attempt to load an id and then record from the cache.
         if (cached_id = lookup_cached_id_from_slug(slug)).present?
-          return find(cached_id, options).tap { |r| r.found_via_slug = slug }
+          return find(cached_id).tap { |r| r.found_via_slug = slug }
         end
         # Otherwise, fallback to the normal approach.
         super.tap do |record|

data/lib/slugged/finders.rb

@@ -1,19 +1,19 @@
 module Slugged
   module Finders
     
-    def find_using_slug(slug, options = {})
+    def find_using_slug(slug)
       slug = slug.to_s
       value = nil
-      value ||= find_by_id(slug.to_i, options) if slug =~ /\A\d+\Z/
-      value ||= with_cached_slug(slug).first(options)
-      value ||= find_using_slug_history(slug, options) if use_slug_history
+      value ||= find_by_id(slug.to_i) if slug =~ /\A\d+\Z/
+      value ||= with_cached_slug(slug).first
+      value ||= find_using_slug_history(slug) if use_slug_history
       value.found_via_slug = slug if value.present?
       value
     end
     
-    def find_using_slug!(slug, options = {})
-      find_using_slug(slug, options) or raise ActiveRecord::RecordNotFound
+    def find_using_slug!(slug)
+      find_using_slug(slug) or raise ActiveRecord::RecordNotFound
     end
     
   end
-end
+end

data/lib/slugged/scopes.rb

@@ -6,8 +6,8 @@ module Slugged
     end
     
     def other_than(record)
-      record.new_record? ? scoped : where("#{quoted_table_name}.#{connection.quote_column_name(:id)} != ?", record.id)
+      record.new_record? ? where(nil) : where("#{quoted_table_name}.#{connection.quote_column_name(:id)} != ?", record.id)
     end
     
   end
-end
+end

data/lib/slugged/slug.rb

@@ -4,8 +4,8 @@ module Slugged
   
     validates_presence_of :record_id, :slug, :scope
   
-    scope :ordered,    order('created_at DESC')
-    scope :only_slug,  select(:slug)
+    scope :ordered,    lambda { order('created_at DESC') }
+    scope :only_slug,  lambda { select(:slug) }
     scope :for_record, lambda { |r| where(:record_id => r.id, :scope => Slugged.key_for_scope(r)) }
     scope :for_slug,   lambda { |scope, slug| where(:scope=> scope.to_s, :slug => slug.to_s)}
   
@@ -48,4 +48,4 @@ module Slugged
     end
   
   end
-end
+end

data/lib/slugged/slug_history.rb

@@ -26,12 +26,12 @@ module Slugged
     
     module ClassMethods
       
-      def find_using_slug_history(slug, options = {})
+      def find_using_slug_history(slug)
         id = Slugged.last_known_slug_id(self, slug)
-        id.present? ? find_by_id(id, options) : nil
+        id.present? ? find_by_id(id) : nil
       end
       
     end
     
   end
-end
+end

data/lib/slugged/version.rb

@@ -1,7 +1,7 @@
 module Slugged
   module Version
-    MAJOR  = 1
-    MINOR  = 1
+    MAJOR  = 2
+    MINOR  = 0
     PATCH  = 0
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end

data/slugged.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
   s.rdoc_options              = ["--charset=UTF-8"]
   s.summary                   = %q{Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history}
 
-  s.add_runtime_dependency "activerecord",  "~> 3.0"
-  s.add_runtime_dependency "activesupport", "~> 3.0"
+  s.add_runtime_dependency "activerecord",  ">= 3.0"
+  s.add_runtime_dependency "activesupport", ">= 3.0"
   s.add_runtime_dependency "uuid"
 
   s.add_development_dependency "shoulda"
   s.add_development_dependency "reversible_data"
-  s.add_development_dependency "sqlite3-ruby"
+  s.add_development_dependency "sqlite3"
   s.add_development_dependency "redgreen"
   s.add_development_dependency "rake"
   s.add_development_dependency "rdoc"

data/test/helper.rb

@@ -1,4 +1,5 @@
-$KCODE = 'UTF8'
+# encoding: utf-8
+$KCODE = 'UTF8' if RUBY_VERSION < '1.9'
 
 require 'rubygems'
 require 'bundler'
@@ -27,13 +28,13 @@ class Test::Unit::TestCase
     User.is_sluggable field, options
   end
   
-  def assert_same_as_slug(user, slug, options = {})
-    found_user = User.find_using_slug(slug, options)
+  def assert_same_as_slug(user, slug)
+    found_user = User.find_using_slug(slug)
     assert_equal user, found_user, "#{slug.inspect} should return #{user.inspect}, got #{found_user.inspect}"
   end
   
-  def assert_different_to_slug(user, slug, options = {})
-    found_user = User.find_using_slug(slug, options)
+  def assert_different_to_slug(user, slug)
+    found_user = User.find_using_slug(slug)
     assert_not_equal user, found_user, "#{slug.inspect} should not return #{user.inspect}, got same record."
   end
   

metadata

@@ -1,160 +1,150 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slugged
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 2.0.0
 platform: ruby
-authors: 
+authors:
 - Darcy Laycock
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-01-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: uuid
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: reversible_data
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: reversible_data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: redgreen
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redgreen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-description: Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Super simple slugs for ActiveRecord 3.0 and higher, with support for
+  slug history
 email: sutto@sutto.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .document
 - .gitignore
 - .rvmrc
@@ -188,38 +178,30 @@ files:
 - test/slugged_test.rb
 homepage: http://github.com/Sutto/slugged
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Super simple slugs for ActiveRecord 3.0 and higher, with support for slug history
-test_files: 
+specification_version: 4
+summary: Super simple slugs for ActiveRecord 3.0 and higher, with support for slug
+  history
+test_files:
 - test/caching_test.rb
 - test/editable_test.rb
 - test/helper.rb