friendly_id 4.0.9 → 4.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e6d39c9619477767af3dc4196211c9499b9dce57
+  data.tar.gz: 28b29864ab0e26ec97277cb0c3fb76c76b9d0673
+SHA512:
+  metadata.gz: be63c3d6212865cac1859b47b2ba2156850a746deeaa07c2dd4c0e464aeb90c611a3cd6e30194ca1a57578bff56bdaaab3619ab7b1f99d4f5539152e4d760464
+  data.tar.gz: 71b8d5387468ecf5fe792eacbe9ce234e796a63ed37695eeb5863018eb50833ea7ed5af5af56ecc42f0808cd09688d28bcb723f1cfd1ee7e7cfda1a79b5fd6ff

data/Changelog.md

@@ -6,6 +6,11 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 4.0.10 (2013-08-10)
+
+* Fixed table prefixes/suffixes being ignored (Jesse Farless)
+* Fixed sequence generation for slugs containing numbers (Adam Carroll)
+
 ## 4.0.9 (2012-10-31)
 
 * Fixed support for Rails 3.2.9.rc1

data/README.md

@@ -1,6 +1,6 @@
 # FriendlyId
 
-[![Build Status](http://travis-ci.org/norman/friendly_id.png)](http://travis-ci.org/norman/friendly_id)
+[![Build Status](https://travis-ci.org/norman/friendly_id.png)](https://travis-ci.org/norman/friendly_id)
 
 FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for
 Ruby on Rails. It allows you to create pretty URLs and work with human-friendly
@@ -27,16 +27,16 @@ FriendlyId is compatible with Active Record **3.0** and higher.
 
 FriendlyId 4.x introduces many changes incompatible with 3.x. If you're
 upgrading, please [read the
-docs](http://rubydoc.info/github/norman/friendly_id/master/file/WhatsNew.md) to see what's
+docs](http://rubydoc.info/github/FriendlyId/friendly_id/4.0-stable/file/WhatsNew.md) to see what's
 new.
 
 ## Docs
 
 The current docs can always be found
-[here](http://rubydoc.info/github/norman/friendly_id/master/frames).
+[here](http://rubydoc.info/github/FriendlyId/friendly_id/4.0-stable/frames).
 
 The best place to start is with the
-[Guide](http://rubydoc.info/github/norman/friendly_id/master/file/Guide.rdoc),
+[Guide](http://rubydoc.info/github/FriendlyId/friendly_id/4.0-stable/file/Guide.rdoc),
 which compiles the top-level RDocs into one outlined document.
 
 You might also want to watch Ryan Bates's [Railscast on FriendlyId](http://railscasts.com/episodes/314-pretty-urls-with-friendlyid).
@@ -49,7 +49,7 @@ You might also want to watch Ryan Bates's [Railscast on FriendlyId](http://rails
 
     cd my_app
 
-    gem "friendly_id", "~> 4.0.1"
+    gem "friendly_id", "~> 4.0.9" # Note: You MUST use 4.0.9 or greater for Rails 3.2.10+
 
     rails generate scaffold user name:string slug:string
 
@@ -103,7 +103,7 @@ article](http://yourbugreportneedsmore.info/).
 ## Thanks and Credits
 
 FriendlyId was originally created by Norman Clarke and Adrian Mugnolo, with
-significant help early in its life by Emilio Tagua. I'm deeply gratful for the
+significant help early in its life by Emilio Tagua. I'm deeply grateful for the
 generous contributions over the years from [many
 volunteers](https://github.com/norman/friendly_id/contributors).
 

data/friendly_id.gemspec

@@ -1,7 +1,5 @@
 # encoding: utf-8
-$:.push File.expand_path("../lib", __FILE__)
-
-require "friendly_id"
+require File.expand_path("../lib/friendly_id/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name              = "friendly_id"
@@ -9,16 +7,17 @@ Gem::Specification.new do |s|
   s.authors           = ["Norman Clarke", "Philip Arndt"]
   s.email             = ["norman@njclarke.com", "parndt@gmail.com"]
   s.homepage          = "http://github.com/norman/friendly_id"
+  s.license           = 'MIT'
   s.summary           = "A comprehensive slugging and pretty-URL plugin."
   s.rubyforge_project = "friendly_id"
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- {test}/*`.split("\n")
   s.require_paths     = ["lib"]
 
-  s.add_development_dependency "railties", "~> 3.2.0"
-  s.add_development_dependency "activerecord", "~> 3.2.0"
-  s.add_development_dependency "minitest", "3.2.0"
-  s.add_development_dependency "mocha"
+  s.add_development_dependency "railties", ">= 3.0"
+  s.add_development_dependency "activerecord", ">= 3.0"
+  s.add_development_dependency "minitest", "~> 4.4.0"
+  s.add_development_dependency "mocha", "~> 0.13.1"
   s.add_development_dependency "maruku"
   s.add_development_dependency "yard"
   s.add_development_dependency "i18n"

data/lib/friendly_id.rb

@@ -44,9 +44,6 @@ with numeric ids:
 =end
 module FriendlyId
 
-  # The current version.
-  VERSION = "4.0.9"
-
   @mutex = Mutex.new
 
   autoload :History,    "friendly_id/history"
@@ -111,4 +108,12 @@ module FriendlyId
       @defaults ||= lambda {|config| config.use :reserved}
     end
   end
+
+  # Set the ActiveRecord table name prefix to friendly_id_
+  #
+  # This makes 'slugs' into 'friendly_id_slugs' and also respects any
+  # 'global' table_name_prefix set on ActiveRecord::Base.
+  def self.table_name_prefix
+    "#{ActiveRecord::Base.table_name_prefix}friendly_id_"
+  end
 end

data/lib/friendly_id/.gitattributes

@@ -0,0 +1 @@
+version.rb merge=ours

data/lib/friendly_id/history.rb

@@ -127,7 +127,10 @@ method.
         scope = Slug.where("slug = ? OR slug LIKE ?", normalized, wildcard)
         scope = scope.where(:sluggable_type => sluggable_class.to_s)
         scope = scope.where("sluggable_id <> ?", value) unless sluggable.new_record?
-        scope.order("LENGTH(slug) DESC, slug DESC")
+
+        length_command = "LENGTH"
+        length_command = "LEN" if sluggable.connection.adapter_name =~ /sqlserver/i
+        scope.order("#{length_command}(slug) DESC, slug DESC")
       end
     end
   end

data/lib/friendly_id/scoped.rb

@@ -33,6 +33,28 @@ Without :scoped in this case, one of the restaurants would have the slug
 The value for the +:scope+ option can be the name of a +belongs_to+ relation, or
 a column.
 
+Additionally, the +:scope+ option can receive an array of scope values:
+
+    class Cuisine < ActiveRecord::Base
+      extend FriendlyId
+      has_many :restaurants
+      friendly_id :name, :use => :slugged
+    end
+
+    class City < ActiveRecord::Base
+      extend FriendlyId
+      has_many :restaurants
+      friendly_id :name, :use => :slugged
+    end
+
+    class Restaurant < ActiveRecord::Base
+      extend FriendlyId
+      belongs_to :city
+      friendly_id :name, :use => :scoped, :scope => [:city, :cuisine]
+    end
+
+All supplied values will be used to determine scope.
+
 === Finding Records by Friendly ID
 
 If you are using scopes your friendly ids may not be unique, so a simple find

data/lib/friendly_id/slug.rb

@@ -3,7 +3,6 @@ module FriendlyId
   #
   # @see FriendlyId::History
   class Slug < ActiveRecord::Base
-    self.table_name = "friendly_id_slugs"
     belongs_to :sluggable, :polymorphic => true
 
     def to_param

data/lib/friendly_id/slug_generator.rb

@@ -31,7 +31,8 @@ module FriendlyId
     end
 
     def extract_sequence_from_slug(slug)
-      slug.split("#{normalized}#{separator}").last.to_i
+      split_slug = slug.split("#{normalized}#{separator}")
+      split_slug.length > 1 ? split_slug.last.to_i : 1
     end
 
     def column
@@ -59,7 +60,10 @@ module FriendlyId
       base << "ESCAPE '\\'" if sluggable.connection.adapter_name =~ /sqlite/i
       scope = sluggable_class.unscoped.where(base, normalized, wildcard)
       scope = scope.where("#{pkey} <> ?", value) unless sluggable.new_record?
-      scope = scope.order("LENGTH(#{column}) DESC, #{column} DESC")
+      
+      length_command = "LENGTH"
+      length_command = "LEN" if sluggable.connection.adapter_name =~ /sqlserver/i
+      scope = scope.order("#{length_command}(#{column}) DESC, #{column} DESC")
     end
 
     def friendly_id_config

data/lib/friendly_id/version.rb

@@ -0,0 +1,3 @@
+module FriendlyId
+  VERSION = "4.0.10"
+end

data/test/helper.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 require "bundler/setup"
 require "minitest/unit"
-require "mocha"
+require "mocha/setup"
 require "active_record"
 require 'active_support/core_ext/time/conversions'
 

data/test/history_test.rb

@@ -132,6 +132,20 @@ class HistoryTest < MiniTest::Unit::TestCase
     end
   end
 
+  test 'should name table according to prefix and suffix' do
+    transaction do
+      begin
+        prefix = "prefix_"
+        without_prefix = FriendlyId::Slug.table_name
+        ActiveRecord::Base.table_name_prefix = prefix
+        FriendlyId::Slug.reset_table_name
+        assert_equal prefix + without_prefix, FriendlyId::Slug.table_name
+      ensure
+        ActiveRecord::Base.table_name_prefix = ""
+        FriendlyId::Slug.table_name = without_prefix
+      end
+    end
+  end
 end
 
 class HistoryTestWithSti < HistoryTest
@@ -146,4 +160,4 @@ class HistoryTestWithSti < HistoryTest
   def model_class
     Editorialist
   end
-end
+end

data/test/slugged_test.rb

@@ -129,6 +129,12 @@ class SlugGeneratorTest < MiniTest::Unit::TestCase
     end
   end
 
+  test "should correctly sequence slugs that start with numbers" do
+    record1 = model_class.create! :name => '24-hour-testing'
+    assert_equal '24-hour-testing', record1.slug
+    record2 = model_class.create! :name => '24-hour-testing'
+    assert_equal '24-hour-testing--2', record2.slug
+  end
 end
 
 class SlugSeparatorTest < MiniTest::Unit::TestCase

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.9
-  prerelease: 
+  version: 4.0.10
 platform: ruby
 authors:
 - Norman Clarke
@@ -10,176 +9,152 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: maruku
   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: yard
   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: i18n
   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: ffaker
   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: 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'
 - !ruby/object:Gem::Dependency
   name: globalize3
   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: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
-  plugins for
-
+description: |
+  FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for
   Ruby on Rails. It allows you to create pretty URLs and work with human-friendly
-
   strings as if they were numeric ids for Active Record models.
-
-'
 email:
 - norman@njclarke.com
 - parndt@gmail.com
@@ -204,6 +179,7 @@ files:
 - gemfiles/Gemfile.rails-3.1.rb
 - gemfiles/Gemfile.rails-3.2.rb
 - lib/friendly_id.rb
+- lib/friendly_id/.gitattributes
 - lib/friendly_id/base.rb
 - lib/friendly_id/configuration.rb
 - lib/friendly_id/finder_methods.rb
@@ -217,6 +193,7 @@ files:
 - lib/friendly_id/slug.rb
 - lib/friendly_id/slug_generator.rb
 - lib/friendly_id/slugged.rb
+- lib/friendly_id/version.rb
 - lib/generators/friendly_id_generator.rb
 - test/base_test.rb
 - test/compatibility/ancestry/Gemfile
@@ -240,37 +217,33 @@ files:
 - test/slugged_test.rb
 - test/sti_test.rb
 homepage: http://github.com/norman/friendly_id
-licenses: []
-post_install_message: ! 'NOTE: FriendlyId 4.x breaks compatibility with 3.x. If you''re
-  upgrading
-
+licenses:
+- MIT
+metadata: {}
+post_install_message: |+
+  NOTE: FriendlyId 4.x breaks compatibility with 3.x. If you're upgrading
   from 3.x, please see this document:
 
-
   http://rubydoc.info/github/norman/friendly_id/master/file/WhatsNew.md
 
-
-'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: []
 has_rdoc: