friendly_id 4.0.10.1 → 4.1.0.beta.1

data/Changelog.md

@@ -6,15 +6,9 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
-## 4.0.10.1 (2013-08-20)
+## 4.1.0.beta.1 (2013-01-09)
 
-* Update dependencies in gemspec to avoid using with Active Record 4.
-* Fixed links in docs.
-
-## 4.0.10 (2013-08-10)
-
-* Fixed table prefixes/suffixes being ignored (Jesse Farless)
-* Fixed sequence generation for slugs containing numbers (Adam Carroll)
+Made the :scoped and :history modules compatible with each other (Andre Duffeck)
 
 ## 4.0.9 (2012-10-31)
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source :rubygems
 
 gemspec
 

data/Guide.rdoc

@@ -114,8 +114,9 @@ store them in a field in your model. By default, this field must be named
 +:slug+, though you may change this using the
 {FriendlyId::Slugged::Configuration#slug_column slug_column} configuration
 option. You should add an index to this column, and in most cases, make it
-unique. You may also wish to constrain it to NOT NULL, but this depends on your
-app's behavior and requirements.
+unique. Do not make the column unique in case you wish to scope the slug
+(more on this later). You may also wish to constrain it to NOT NULL, but this
+depends on your app's behavior and requirements.
 
 === Example Setup
 
@@ -295,8 +296,6 @@ model.
 
 === Considerations
 
-This module is incompatible with the +:scoped+ module.
-
 Because recording slug history requires creating additional database records,
 this module has an impact on the performance of the associated model's +create+
 method.
@@ -356,27 +355,8 @@ 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.
+Please do note that you must drop the uniqueness constraint on the slug's
+column in the database when you're scoping the slug.
 
 === Finding Records by Friendly ID
 
@@ -485,7 +465,7 @@ If you don't pass in a locale argument, FriendlyId::SimpleI18n will just use the
 current locale:
 
   I18n.with_locale(:es) do
-    post.set_friendly_id("La guerra de las galaxas")
+    post.set_friendly_id("la-guerra-de-las-galaxas")
   end
 
 
@@ -517,15 +497,12 @@ Finds will take the current locale into consideration:
   I18n.locale = :en
   Post.find("star-wars")
 
-Additionally, finds will fall back to the default locale:
-
-  I18n.locale = :it
-  Post.find("star-wars")
-
 To find a slug by an explicit locale, perform the find inside a block
 passed to I18n's +with_locale+ method:
 
-  I18n.with_locale(:it) { Post.find("guerre-stellari") }
+  I18n.with_locale(:it) do
+    Post.find("guerre-stellari")
+  end
 
 === Creating Records
 
@@ -533,17 +510,12 @@ When new records are created, the slug is generated for the current locale only.
 
 === Translating Slugs
 
-To translate an existing record's friendly_id, use
-{FriendlyId::Globalize::Model#set_friendly_id}. This will ensure that the slug
-you add is properly escaped, transliterated and sequenced:
-
-  post = Post.create :name => "Star Wars"
-  post.set_friendly_id("Guerre stellari", :it)
+To translate an existing record's friendly_id, simply change the locale and
+assign a value to the +slug+ field:
 
-If you don't pass in a locale argument, FriendlyId::Globalize will just use the
-current locale:
-
-  I18n.with_locale(:it) { post.set_friendly_id("Guerre stellari") }
+  I18n.with_locale(:it) do
+    post.slug = "guerre-stellari"
+  end
 
 
 == Reserved Words
@@ -574,6 +546,6 @@ For example:
     after_validation :move_friendly_id_error_to_name
 
     def move_friendly_id_error_to_name
-      errors.add :name, *errors.delete(:friendly_id) if errors[:friendly_id].present?
+      errors.messages[:name] = errors.messages.delete(:friendly_id)
     end
-  end
+  end

data/README.md

@@ -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/4.0-stable/file/WhatsNew.md) to see what's
+docs](http://rubydoc.info/github/norman/friendly_id/master/file/WhatsNew.md) to see what's
 new.
 
 ## Docs
 
 The current docs can always be found
-[here](http://rubydoc.info/github/norman/friendly_id/4.0-stable/frames).
+[here](http://rubydoc.info/github/norman/friendly_id/master/frames).
 
 The best place to start is with the
-[Guide](http://rubydoc.info/github/norman/friendly_id/4.0-stable/file/Guide.rdoc),
+[Guide](http://rubydoc.info/github/norman/friendly_id/master/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.9" # Note: You MUST use 4.0.9 or greater for Rails 3.2.10+
+    gem "friendly_id", "~> 4.0.1"
 
     rails generate scaffold user name:string slug:string
 

data/friendly_id.gemspec

@@ -1,5 +1,7 @@
 # encoding: utf-8
-require File.expand_path("../lib/friendly_id/version", __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
+
+require "friendly_id"
 
 Gem::Specification.new do |s|
   s.name              = "friendly_id"
@@ -7,17 +9,16 @@ 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_dependency "activerecord", ">= 3.0", "< 4.0"
-  s.add_development_dependency "railties", ">= 3.0", "< 4.0"
-  s.add_development_dependency "minitest", "~> 4.4.0"
-  s.add_development_dependency "mocha", "~> 0.13.1"
+  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 "maruku"
   s.add_development_dependency "yard"
   s.add_development_dependency "i18n"

data/lib/friendly_id.rb

@@ -44,6 +44,9 @@ with numeric ids:
 =end
 module FriendlyId
 
+  # The current version.
+  VERSION = "4.1.0.beta.1"
+
   @mutex = Mutex.new
 
   autoload :History,    "friendly_id/history"
@@ -108,12 +111,4 @@ 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/configuration.rb

@@ -30,6 +30,9 @@ module FriendlyId
     # The default configuration options.
     attr_reader :defaults
 
+    # The modules in use
+    attr_reader :modules
+
     # The model class that this configuration belongs to.
     # @return ActiveRecord::Base
     attr_accessor :model_class
@@ -37,6 +40,7 @@ module FriendlyId
     def initialize(model_class, values = nil)
       @model_class = model_class
       @defaults    = {}
+      @modules     = []
       set values
     end
 
@@ -59,9 +63,15 @@ module FriendlyId
       modules.to_a.flatten.compact.map do |object|
         mod = object.kind_of?(Module) ? object : FriendlyId.const_get(object.to_s.classify)
         model_class.send(:include, mod)
+        @modules << mod.name.split("::").last.downcase.to_sym if mod.name.present?
       end
     end
 
+    # Returns whether the given module is in use
+    def uses?(modul)
+      @modules.include?(modul)
+    end
+
     # The column that FriendlyId will use to find the record when querying by
     # friendly id.
     #

data/lib/friendly_id/history.rb

@@ -59,7 +59,6 @@ method.
     # Configures the model instance to use the History add-on.
     def self.included(model_class)
       model_class.instance_eval do
-        raise "FriendlyId::History is incompatible with FriendlyId::Scoped" if self < Scoped
         @friendly_id_config.use :slugged
         has_many :slugs, :as => :sluggable, :dependent => :destroy,
           :class_name => Slug.to_s, :order => "#{Slug.quoted_table_name}.id DESC"
@@ -80,6 +79,7 @@ method.
       relation.delete_all unless result.empty?
       slugs.create! do |record|
         record.slug = friendly_id
+        record.scope = serialized_scope if friendly_id_config.uses?(:scoped)
       end
     end
 
@@ -90,7 +90,7 @@ method.
       def find_one(id)
         return super(id) if id.unfriendly_id?
         where(@klass.friendly_id_config.query_field => id).first or
-        with_old_friendly_id(id) {|x| find_one_without_friendly_id(x)} or
+        with_old_friendly_id(id) {|x| where(:id => x).first} or
         find_one_without_friendly_id(id)
       end
 
@@ -98,7 +98,7 @@ method.
       def exists?(id = false)
         return super if id.unfriendly_id?
         exists_without_friendly_id?(@klass.friendly_id_config.query_field => id) or
-        with_old_friendly_id(id) {|x| exists_without_friendly_id?(x)} or
+        with_old_friendly_id(id) {|x| exists_without_friendly_id?(:id => x)} or
         exists_without_friendly_id?(id)
       end
 
@@ -108,8 +108,8 @@ method.
       def with_old_friendly_id(slug, &block)
         sql = "SELECT sluggable_id FROM #{Slug.quoted_table_name} WHERE sluggable_type = %s AND slug = %s"
         sql = sql % [@klass.base_class.to_s, slug].map {|x| connection.quote(x)}
-        sluggable_id = connection.select_values(sql).first
-        yield sluggable_id if sluggable_id
+        sluggable_ids = connection.select_values(sql)
+        yield sluggable_ids if sluggable_ids
       end
     end
 
@@ -127,7 +127,9 @@ 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?
-
+        if sluggable.friendly_id_config.uses?(:scoped)
+          scope = scope.where("scope = ?", sluggable.serialized_scope)
+        end
         length_command = "LENGTH"
         length_command = "LEN" if sluggable.connection.adapter_name =~ /sqlserver/i
         scope.order("#{length_command}(slug) DESC, slug DESC")

data/lib/friendly_id/migration.rb

@@ -5,10 +5,12 @@ class CreateFriendlyIdSlugs < ActiveRecord::Migration
       t.string   :slug,           :null => false
       t.integer  :sluggable_id,   :null => false
       t.string   :sluggable_type, :limit => 40
+      t.string   :scope
       t.datetime :created_at
     end
     add_index :friendly_id_slugs, :sluggable_id
-    add_index :friendly_id_slugs, [:slug, :sluggable_type], :unique => true
+    add_index :friendly_id_slugs, [:slug, :sluggable_type]
+    add_index :friendly_id_slugs, [:slug, :sluggable_type, :scope], :unique => true
     add_index :friendly_id_slugs, :sluggable_type
   end
 

data/lib/friendly_id/scoped.rb

@@ -33,28 +33,6 @@ 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
@@ -108,13 +86,16 @@ an example of one way to set this up:
     # feature.
     def self.included(model_class)
       model_class.instance_eval do
-        raise "FriendlyId::Scoped is incompatibe with FriendlyId::History" if self < History
         include Slugged unless self < Slugged
         friendly_id_config.class.send :include, Configuration
         friendly_id_config.slug_generator_class.send :include, SlugGenerator
       end
     end
 
+    def serialized_scope
+      friendly_id_config.scope_columns.sort.map { |column| "#{column}:#{send(column)}" }.join(",")
+    end
+
     # This module adds the +:scope+ configuration option to
     # {FriendlyId::Configuration FriendlyId::Configuration}.
     module Configuration
@@ -159,12 +140,18 @@ an example of one way to set this up:
       private
 
       def conflict
-        columns = friendly_id_config.scope_columns
-        matched = columns.inject(conflicts) do |memo, column|
-           memo.where(column => sluggable.send(column))
+        if friendly_id_config.uses?(:history)
+          # When using the :history module +conflicts+ already returns only real conflicts, so there's no need to check
+          # for the scope columns again
+          conflicts.first
+        else
+          columns = friendly_id_config.scope_columns
+          matched = columns.inject(conflicts) do |memo, column|
+            memo.where(column => sluggable.send(column))
+          end
+
+          matched.first
         end
-
-        matched.first
       end
     end
   end

data/lib/friendly_id/slug.rb

@@ -3,6 +3,7 @@ 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,8 +31,7 @@ module FriendlyId
     end
 
     def extract_sequence_from_slug(slug)
-      split_slug = slug.split("#{normalized}#{separator}")
-      split_slug.length > 1 ? split_slug.last.to_i : 1
+      slug.split("#{normalized}#{separator}").last.to_i
     end
 
     def column

data/test/helper.rb

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

data/test/history_test.rb

@@ -78,17 +78,6 @@ class HistoryTest < MiniTest::Unit::TestCase
     end
   end
 
-
-  test "should raise error if used with scoped" do
-    model_class = Class.new(ActiveRecord::Base) do
-      self.abstract_class = true
-      extend FriendlyId
-    end
-    assert_raises RuntimeError do
-      model_class.friendly_id :name, :use => [:history, :scoped]
-    end
-  end
-
   test "should handle renames" do
     with_instance_of(model_class) do |record|
       record.name = 'x'
@@ -132,20 +121,6 @@ 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
@@ -161,3 +136,67 @@ class HistoryTestWithSti < HistoryTest
     Editorialist
   end
 end
+
+
+
+class City < ActiveRecord::Base
+  has_many :restaurants
+end
+
+class Restaurant < ActiveRecord::Base
+  extend FriendlyId
+  belongs_to :city
+  friendly_id :name, :use => [:history, :scoped], :scope => :city
+end
+
+class ScopedHistoryTest < MiniTest::Unit::TestCase
+  include FriendlyId::Test
+  include FriendlyId::Test::Shared::Core
+
+  def model_class
+    Restaurant
+  end
+
+  test "should find old scoped slugs" do
+    city = City.create!
+    with_instance_of(Restaurant) do |record|
+      record.city = city
+
+      record.name = "x"
+      record.save!
+
+      record.name = "y"
+      record.save!
+
+      assert_equal city.restaurants.find("x"), city.restaurants.find("y")
+    end
+  end
+
+  test "should consider old scoped slugs when creating slugs" do
+    city = City.create!
+    with_instance_of(Restaurant) do |record|
+      record.city = city
+
+      record.name = "x"
+      record.save!
+
+      record.name = "y"
+      record.save!
+
+      second_record = model_class.create! :city => city, :name => 'x'
+      assert_equal "x--2", second_record.friendly_id
+
+      third_record = model_class.create! :city => city, :name => 'y'
+      assert_equal "y--2", third_record.friendly_id
+    end
+  end
+
+  test "should allow equal slugs in different scopes" do
+    city = City.create!
+    second_city = City.create!
+    record = model_class.create! :city => city, :name => 'x'
+    second_record = model_class.create! :city => second_city, :name => 'x'
+
+    assert_equal record.slug, second_record.slug
+  end
+end

data/test/schema.rb

@@ -34,6 +34,10 @@ module FriendlyId
             add_index  table_name, :slug, :unique => true
           end
 
+          scoped_tables.each do |table_name|
+            add_column table_name, :slug, :string
+          end
+
           # This will be used to test scopes
           add_column :novels, :novelist_id, :integer
           add_column :novels, :publisher_id, :integer
@@ -57,6 +61,9 @@ module FriendlyId
           # This will be used to test relationships
           add_column :books, :author_id, :integer
 
+          # Used to test :scoped and :history together
+          add_column :restaurants, :city_id, :integer
+
           @done = true
         end
 
@@ -66,12 +73,16 @@ module FriendlyId
           %w[journalists articles novelists novels manuals translated_articles]
         end
 
+        def scoped_tables
+          ["restaurants"]
+        end
+
         def simple_tables
-          %w[authors books publishers]
+          %w[authors books publishers cities]
         end
 
         def tables
-          simple_tables + slugged_tables
+          simple_tables + slugged_tables + scoped_tables
         end
       end
     end

data/test/scoped_test.rb

@@ -54,17 +54,6 @@ class ScopedTest < MiniTest::Unit::TestCase
     end
   end
 
-  test "should raise error if used with history" do
-    model_class = Class.new(ActiveRecord::Base) do
-      self.abstract_class = true
-      extend FriendlyId
-    end
-
-    assert_raises RuntimeError do
-      model_class.friendly_id :name, :use => [:scoped, :history]
-    end
-  end
-
   test "should apply scope with multiple columns" do
     transaction do
       novelist = Novelist.create! :name => "a"

data/test/slugged_test.rb

@@ -129,12 +129,6 @@ 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,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.10.1
+  version: 4.1.0.beta.1
+  prerelease: 6
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,164 +10,176 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: railties
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: 3.2.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0'
 - !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
@@ -191,7 +204,6 @@ 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
@@ -205,7 +217,6 @@ 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
@@ -229,33 +240,37 @@ files:
 - test/slugged_test.rb
 - test/sti_test.rb
 homepage: http://github.com/norman/friendly_id
-licenses:
-- MIT
-metadata: {}
-post_install_message: |+
-  NOTE: FriendlyId 4.x breaks compatibility with 3.x. If you're upgrading
+licenses: []
+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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: friendly_id
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9fbc5031a53b7d9a5ccd504f5ae0320b438ae54c
-  data.tar.gz: 4762396921c1d48229e84b3a2c3641a0910606e1
-SHA512:
-  metadata.gz: 626640c8d2daadc57079407bed1e692caf7c3e0c7f7768a8cab195cfbe1d274d0f0220cea71c5413f0293174ba769fb6e809f537e34285717aed4fb2f3d171c2
-  data.tar.gz: e27071a087add84317bcc85be519d070e00e9ada3fe77cc123234bbd4ac33cff258cb41bed593d9cca01330ab80f217bde9765720cc5d77187f7aa6e6341cb82

data/lib/friendly_id/.gitattributes

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

data/lib/friendly_id/version.rb

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