friendly_id 2.1.3 → 2.1.4

data.tar.gz.sig

@@ -1,2 +1 @@
-�(-^k�l}�˕���j�l�EG�)=���1������E�`(��"w�tE� �6f�ͱ�AZ�o��D�d?�[�"�Dz*`�;>G�3��)+L��	2+c��Dzk���s��b���Mиܑ�R3���<u #��3!���I�TV�z��^�p������Ҩ������3L�D'ޱ�ް��wq}l��:��(zX_(��Ρ
-��=x.��a�]���V�s�}OA�
�qE���b�E=3y���O�{(B�^iW�m�
+o���Z����u����i(v�U�>��=PA)Fj�1�
�b?9�W^e��B��#+�6�j<g�.�B��.S�*��E�iR�s����#��
�"�x`����������gV�Lyx�H�w!T������Xz�A���qЏ��d�<=R�2圲@�<���X#�I��p�!�QĪ�nK������� �>q���Y���#M�����\������5C<E��4�Bpd�!?����g�#/����6s�#$>ן�

data/History.txt

@@ -1,3 +1,10 @@
+== 2.1.4 2009-09-01
+
+* 1 minor enhancement:
+  * Fixed upgrade generator not installing rake tasks (Harry Love)
+  * Fixed handling of very large id's (Nathan Phelps)
+  * Fixed long index name on migration (Ron Ingram)
+
 == 2.1.3 2009-06-03
 
 * 1 minor enhancement:
@@ -12,9 +19,9 @@
 == 2.1.1 2009-03-25
 
 * 2 minor enhancements:
-  * Fixed bug with find_some; if a record has old slugs, find_some will no longer return 
+  * Fixed bug with find_some; if a record has old slugs, find_some will no longer return
 multiple copies of that record when finding by numerical ID. (Steve Luscher)
-  * Fixed bug with find_some: you can now find_some with an array of numerical IDs without 
+  * Fixed bug with find_some: you can now find_some with an array of numerical IDs without
 an error being thrown. (Steve Luscher)
 
 == 2.1.0 2009-03-25

data/README.rdoc

@@ -270,16 +270,16 @@ an older version of FriendlyId. Here's how to set it up.
 4) If you are using slugs, you can use a Rake task to generate slugs for your
 existing records:
 
-friendly_id:make_slugs MODEL=MyModelName
+rake friendly_id:make_slugs MODEL=MyModelName
 
 If you eventually want to expire old slugs every so often, or perhaps every
 day via cron, you can do:
 
-rake:friendly_id:remove_old_slugs
+rake friendly_id:remove_old_slugs
 
 The default is to remove dead slugs older than 45 days, but is configurable:
 
-rake:friendly_id:remove_old_slugs MODEL=MyModelName DAYS=60
+rake friendly_id:remove_old_slugs MODEL=MyModelName DAYS=60
 
 == Installing an older version
 
@@ -321,7 +321,7 @@ Add this to the bottom of environment.rb:
 
 ====  Generate the upgrade migration and run it
 
-  ./script generate friendly_id_20_upgrade
+  ./script/generate friendly_id_20_upgrade
   rake db:migrate
 
 == Hacking FriendlyId:

data/Rakefile

@@ -31,15 +31,13 @@ def run_coverage(files)
     return
   end
   files = files.join(" ")
-  if PLATFORM =~ /darwin/
-    exclude = '--exclude "gems/"'
-  else
-    exclude = '--exclude "rubygems"'
-  end
-  rcov = "rcov -Ilib:test --sort coverage --text-report #{exclude} --no-validator-links"
-  cmd = "#{rcov} #{files}"
-  puts cmd
-  sh cmd
+  # if RUBY_PLATFORM =~ /darwin/
+  #   exclude = '--exclude "gems/"'
+  # else
+  #   exclude = '--exclude "rubygems"'
+  # end
+  rcov = ENV["RCOV"] ? ENV["RCOV"] : "rcov"
+  sh "#{rcov} -Ilib:test --sort coverage --text-report #{files}"
 end
 
 desc 'Publish RDoc to RubyForge.'

data/friendly_id.gemspec

@@ -2,10 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendly_id}
-  s.version = "2.1.3"
+  s.version = "2.1.4"
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Norman Clarke", "Adrian Mugnolo", "Emilio Tagua"]
-  s.date = %q{2009-06-03}
+  s.date = %q{2009-09-01}
   s.description = %q{A comprehensive slugging and pretty-URL plugin for ActiveRecord.}
   s.email = ["norman@rubysouth.com", "adrian@rubysouth.com", "miloops@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
@@ -14,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{friendly-id}
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{A comprehensive slugging and pretty-URL plugin for ActiveRecord.}
   s.test_files = ["test/custom_slug_normalizer_test.rb", "test/non_slugged_test.rb", "test/scoped_model_test.rb", "test/slug_test.rb", "test/slugged_model_test.rb", "test/sti_test.rb"]
 

data/generators/friendly_id/templates/create_slugs.rb

@@ -8,11 +8,11 @@ class CreateSlugs < ActiveRecord::Migration
       t.string :scope, :limit => 40
       t.datetime :created_at
     end
-    add_index :slugs, [:name, :sluggable_type, :scope, :sequence], :unique => true
+    add_index :slugs, [:name, :sluggable_type, :scope, :sequence], :name => "index_slugs_on_n_s_s_and_s", :unique => true
     add_index :slugs, :sluggable_id
   end
 
   def self.down
     drop_table :slugs
   end
-end
+end

data/generators/friendly_id_20_upgrade/friendly_id_20_upgrade_generator.rb

@@ -5,6 +5,7 @@ class FriendlyId20UpgradeGenerator < Rails::Generator::Base
         m.migration_template(
           'upgrade_friendly_id_to_20.rb', 'db/migrate', :migration_file_name => 'upgrade_friendly_id_to_20'
         )
+        m.file "/../../../lib/tasks/friendly_id.rake", "lib/tasks/friendly_id.rake"
       end
     end
   end

data/generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb

@@ -16,4 +16,4 @@ class UpgradeFriendlyIdTo20 < ActiveRecord::Migration
     add_index :slugs, [:name, :sluggable_type], :unique => true
   end
 
-end
+end

data/init.rb

@@ -1 +1,3 @@
+# encoding: utf-8
+
 require 'friendly_id'

data/lib/friendly_id.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'friendly_id/helpers'
 require 'friendly_id/slug'
 

data/lib/friendly_id/helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module FriendlyId
   
   module Helpers

data/lib/friendly_id/non_sluggable_class_methods.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module FriendlyId::NonSluggableClassMethods
 
   include FriendlyId::Helpers

data/lib/friendly_id/non_sluggable_instance_methods.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module FriendlyId::NonSluggableInstanceMethods
 
   attr :found_using_friendly_id

data/lib/friendly_id/slug.rb

@@ -35,9 +35,7 @@ class Slug < ActiveRecord::Base
     def normalize(slug_text)
       return "" if slug_text.nil? || slug_text == ""
       ActiveSupport::Multibyte.proxy_class.new(slug_text.to_s).normalize(:kc).
-        # For some reason Spanish ¡ and ¿ are not detected as non-word
-        # characters. Bug in Ruby?
-        gsub(/[\W|¡|¿]/u, ' ').
+        gsub(/[\W]/u, ' ').
         strip.
         gsub(/\s+/u, '-').
         gsub(/-\z/u, '').
@@ -45,10 +43,6 @@ class Slug < ActiveRecord::Base
         to_s
     end
     
-    def postnormalize(string)
-      string.gs
-    end
-
     def parse(friendly_id)
       name, sequence = friendly_id.split('--')
       sequence ||= "1"
@@ -77,10 +71,6 @@ class Slug < ActiveRecord::Base
 
     private
 
-    def chars_func
-      "".respond_to?(:mb_chars) ? :mb_chars : :chars
-    end
-
   end
 
   # Whether or not this slug is the most recent of its owner's slugs.

data/lib/friendly_id/sluggable_class_methods.rb

@@ -1,7 +1,9 @@
+# encoding: utf-8
+
 module FriendlyId::SluggableClassMethods
 
   include FriendlyId::Helpers
-  
+
   def self.extended(base) #:nodoc:#
 
     class << base
@@ -16,7 +18,7 @@ module FriendlyId::SluggableClassMethods
   def find_one_with_friendly(id_or_name, options) #:nodoc:#
 
     scope = options.delete(:scope)
-    return find_one_without_friendly(id_or_name, options) if id_or_name.is_a?(Fixnum)
+    return find_one_without_friendly(id_or_name, options) if id_or_name.is_a?(Integer)
 
     find_options = {:select => "#{self.table_name}.*"}
     find_options[:joins] = :slugs unless options[:include] && [*options[:include]].flatten.include?(:slugs)
@@ -111,4 +113,4 @@ module FriendlyId::SluggableClassMethods
     return slugs, ids
   end
 
-end
+end

data/lib/friendly_id/sluggable_instance_methods.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module FriendlyId::SluggableInstanceMethods
 
   NUM_CHARS_RESERVED_FOR_FRIENDLY_ID_EXTENSION = 2

data/lib/friendly_id/version.rb

@@ -1,8 +1,10 @@
+# encoding: utf-8
+
 module FriendlyId #:nodoc:
   module Version #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY = 3
+    TINY = 4
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
-end
+end

data/lib/tasks/friendly_id.rake

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 namespace :friendly_id do
   desc "Make slugs for a model."
   task :make_slugs => :environment do

data/test/models/post.rb

@@ -1,3 +1,6 @@
 class Post < ActiveRecord::Base
   has_friendly_id :title, :use_slug => true
+  
+  named_scope :published, :conditions => { :published => true }
+  
 end

data/test/non_slugged_test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/test_helper'
 
 class NonSluggedTest < Test::Unit::TestCase

data/test/schema.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 ActiveRecord::Schema.define(:version => 1) do
 
   create_table "books", :force => true do |t|
@@ -12,6 +14,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table "posts", :force => true do |t|
     t.column "title", "string"
     t.column "content", "text"
+    t.column "published", "boolean", :default => false
     t.column "created_at", "datetime"
     t.column "updated_at", "datetime"
   end

data/test/scoped_model_test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) + '/test_helper'
 
 class ScopedModelTest < Test::Unit::TestCase

data/test/slugged_model_test.rb

@@ -11,7 +11,8 @@ class SluggedModelTest < Test::Unit::TestCase
       Post.delete_all
       Person.delete_all
       Slug.delete_all
-      @post = Post.new :title => "Test post", :content => "Test content"
+      Thing.delete_all
+      @post = Post.new :title => "Test post", :content => "Test content", :published => true
       @post.save!
     end
 
@@ -126,6 +127,12 @@ class SluggedModelTest < Test::Unit::TestCase
       end
     end
 
+    # This emulates a fairly common issue where id's generated by fixtures are very high.
+    should "continue to admit very large ids" do
+      Thing.connection.execute("INSERT INTO things (id, name) VALUES (2147483647, 'big')")
+      assert Thing.find(2147483647)
+    end
+
     context "and configured to strip diacritics" do
       setup do
         Post.friendly_id_options = Post.friendly_id_options.merge(:strip_diacritics => true)
@@ -236,7 +243,7 @@ class SluggedModelTest < Test::Unit::TestCase
     context "when using an array as the find argument" do
 
       setup do
-        @post2 = Post.create!(:title => "another post", :content => "more content")
+        @post2 = Post.create!(:title => "another post", :content => "more content", :published => true)
       end
 
       should "return results when passed an array of non-friendly ids" do
@@ -247,6 +254,10 @@ class SluggedModelTest < Test::Unit::TestCase
         assert_equal 2, Post.find([@post.friendly_id, @post2.friendly_id]).size
       end
 
+      should "return results when searching using a named scope" do
+        assert_equal 2, Post.published.find([@post.id, @post2.id]).size
+      end
+
       should "return results when passed a mixed array of friendly and non-friendly ids" do
         assert_equal 2, Post.find([@post.friendly_id, @post2.id]).size
       end
@@ -277,4 +288,4 @@ class SluggedModelTest < Test::Unit::TestCase
 
   end
 
-end
+end

data/test/test_helper.rb

@@ -1,8 +1,9 @@
+# encoding: utf-8
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__))
 $KCODE = 'UTF8' if RUBY_VERSION < '1.9'
 $VERBOSE = false
-require 'rubygems'
 require 'test/unit'
 require 'contest'
 # You can use "rake test AR_VERSION=2.0.5" to test against 2.0.5, for example.
@@ -13,7 +14,6 @@ if ENV["AR_VERSION"]
 end
 require 'active_record'
 require 'active_support'
-
 require 'friendly_id'
 require 'models/post'
 require 'models/person'
@@ -24,16 +24,6 @@ require 'models/novel'
 require 'models/thing'
 require 'models/event'
 
-# Borrowed from ActiveSupport
-def silence_stream(stream)
-  old_stream = stream.dup
-  stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
-  stream.sync = true
-  yield
-ensure
-  stream.reopen(old_stream)
-end
-
 ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
 silence_stream(STDOUT) do
   load(File.dirname(__FILE__) + "/schema.rb")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors: 
 - Norman Clarke
@@ -32,7 +32,7 @@ cert_chain:
   h7fbBRfStxI=
   -----END CERTIFICATE-----
 
-date: 2009-06-03 00:00:00 -03:00
+date: 2009-09-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: friendly-id
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin for ActiveRecord.