rakutenusa-friendly_id 2.0.8 → 2.0.9

data/.gitignore

@@ -0,0 +1,5 @@
+*.log
+.DS_Store
+doc
+pkg
+coverage

data/History.txt

@@ -1,3 +1,10 @@
+== 2.1.4 2009-09-01
+
+* 3 minor enhancements:
+  * Fixed upgrade generator not installing rake tasks (Harry Love)
+  * Fixed handling of very large id's (Nathan Phelps)
+  * Fixed long index name on migration (Rob Ingram)
+
 == 2.1.3 2009-06-03
 
 * 1 minor enhancement:

data/MIT-LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2008 Norman Clarke and Adrian Mugnolo.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Rakefile

@@ -0,0 +1,45 @@
+require 'lib/friendly_id/version'
+
+desc "Run RCov"
+task :rcov do
+  run_coverage Dir["test/**/*_test.rb"]
+end
+
+def run_coverage(files)
+  rm_f "coverage"
+  rm_f "coverage.data"
+  if files.length == 0
+    puts "No files were specified for testing"
+    return
+  end
+  files = files.join(" ")
+  # 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.'
+task :publish_docs => [:clean, :docs] do
+  host = "compay@rubyforge.org"
+  remote_dir = "/var/www/gforge-projects/friendly-id"
+  local_dir = 'doc'
+  sh %{rsync -av --delete #{local_dir}/ #{host}:#{remote_dir}}
+end
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "friendly_id"
+    gemspec.summary = "TODO"
+    gemspec.email = "dev@rakutenusa.com"
+    gemspec.homepage = "http://github.com/rakutenusa/friendly_id"
+    gemspec.description = "TODO"
+    gemspec.authors = ["RakutenUSA"]
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 8
-:major: 2
 :minor: 0
+:patch: 9
+:major: 2

data/config/website.yml

@@ -0,0 +1,2 @@
+host: compay@rubyforge.org
+remote_dir: /var/www/gforge-projects/friendly-id

data/friendly_id.gemspec

@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{friendly_id}
+  s.version = "2.0.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["RakutenUSA"]
+  s.date = %q{2009-09-06}
+  s.description = %q{TODO}
+  s.email = %q{dev@rakutenusa.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "MIT-LICENSE",
+     "Manifest.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "config/website.yml",
+     "friendly_id.gemspec",
+     "generators/friendly_id/friendly_id_generator.rb",
+     "generators/friendly_id/templates/create_slugs.rb",
+     "generators/friendly_id_20_upgrade/friendly_id_20_upgrade_generator.rb",
+     "generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb",
+     "init.rb",
+     "lib/friendly_id.rb",
+     "lib/friendly_id/helpers.rb",
+     "lib/friendly_id/non_sluggable_class_methods.rb",
+     "lib/friendly_id/non_sluggable_instance_methods.rb",
+     "lib/friendly_id/slug.rb",
+     "lib/friendly_id/sluggable_class_methods.rb",
+     "lib/friendly_id/sluggable_instance_methods.rb",
+     "lib/friendly_id/version.rb",
+     "lib/tasks/friendly_id.rake",
+     "lib/tasks/friendly_id.rb",
+     "test/contest.rb",
+     "test/custom_slug_normalizer_test.rb",
+     "test/models/book.rb",
+     "test/models/country.rb",
+     "test/models/event.rb",
+     "test/models/novel.rb",
+     "test/models/person.rb",
+     "test/models/post.rb",
+     "test/models/thing.rb",
+     "test/models/user.rb",
+     "test/non_slugged_test.rb",
+     "test/schema.rb",
+     "test/scoped_model_test.rb",
+     "test/slug_test.rb",
+     "test/slugged_model_test.rb",
+     "test/sti_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/rakutenusa/friendly_id}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.2}
+  s.summary = %q{TODO}
+  s.test_files = [
+    "test/contest.rb",
+     "test/custom_slug_normalizer_test.rb",
+     "test/models/book.rb",
+     "test/models/country.rb",
+     "test/models/event.rb",
+     "test/models/novel.rb",
+     "test/models/person.rb",
+     "test/models/post.rb",
+     "test/models/thing.rb",
+     "test/models/user.rb",
+     "test/non_slugged_test.rb",
+     "test/schema.rb",
+     "test/scoped_model_test.rb",
+     "test/slug_test.rb",
+     "test/slugged_model_test.rb",
+     "test/sti_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

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

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

data/lib/friendly_id/sluggable_class_methods.rb

@@ -3,7 +3,7 @@
 module FriendlyId::SluggableClassMethods
 
   include FriendlyId::Helpers
-  
+
   def self.extended(base) #:nodoc:#
 
     class << base
@@ -18,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)
@@ -35,6 +35,8 @@ module FriendlyId::SluggableClassMethods
 
     if result
       result.finder_slug_name = id_or_name
+    elsif id_or_name.to_i.to_s != id_or_name
+      raise ActiveRecord::RecordNotFound
     else
       result = find_one_without_friendly id_or_name, options
     end
@@ -113,4 +115,4 @@ module FriendlyId::SluggableClassMethods
     return slugs, ids
   end
 
-end
+end

data/test/slugged_model_test.rb

@@ -11,6 +11,7 @@ class SluggedModelTest < Test::Unit::TestCase
       Post.delete_all
       Person.delete_all
       Slug.delete_all
+      Thing.delete_all
       @post = Post.new :title => "Test post", :content => "Test content", :published => true
       @post.save!
     end
@@ -31,6 +32,12 @@ class SluggedModelTest < Test::Unit::TestCase
       assert Post.find(@post.id)
     end
 
+    should "not be findable by its id if looking for something else" do
+      assert_raises ActiveRecord::RecordNotFound do
+        Post.find("#{@post.id}-i-dont-exists")
+      end
+    end
+
     should "generate slug text" do
       post = Post.new :title => "Test post", :content => "Test content"
       assert_not_nil @post.slug_text
@@ -131,6 +138,12 @@ class SluggedModelTest < Test::Unit::TestCase
       assert_equal true, @post.new_slug_needed?
     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)
@@ -251,7 +264,7 @@ class SluggedModelTest < Test::Unit::TestCase
       should "return results when passed an array of friendly ids" do
         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
@@ -305,4 +318,4 @@ class SluggedModelTest < Test::Unit::TestCase
     
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rakutenusa-friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors: 
 - RakutenUSA
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-08 00:00:00 -07:00
+date: 2009-09-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -19,22 +19,24 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
+- .gitignore
 - History.txt
+- MIT-LICENSE
 - Manifest.txt
 - README.rdoc
+- Rakefile
 - VERSION.yml
-- generators/friendly_id
+- config/website.yml
+- friendly_id.gemspec
 - generators/friendly_id/friendly_id_generator.rb
-- generators/friendly_id/templates
 - generators/friendly_id/templates/create_slugs.rb
-- generators/friendly_id_20_upgrade
 - generators/friendly_id_20_upgrade/friendly_id_20_upgrade_generator.rb
-- generators/friendly_id_20_upgrade/templates
 - generators/friendly_id_20_upgrade/templates/upgrade_friendly_id_to_20.rb
-- lib/friendly_id
+- init.rb
+- lib/friendly_id.rb
 - lib/friendly_id/helpers.rb
 - lib/friendly_id/non_sluggable_class_methods.rb
 - lib/friendly_id/non_sluggable_instance_methods.rb
@@ -42,13 +44,10 @@ files:
 - lib/friendly_id/sluggable_class_methods.rb
 - lib/friendly_id/sluggable_instance_methods.rb
 - lib/friendly_id/version.rb
-- lib/friendly_id.rb
-- lib/tasks
 - lib/tasks/friendly_id.rake
 - lib/tasks/friendly_id.rb
 - test/contest.rb
 - test/custom_slug_normalizer_test.rb
-- test/models
 - test/models/book.rb
 - test/models/country.rb
 - test/models/event.rb
@@ -66,9 +65,9 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/rakutenusa/friendly_id
+licenses: 
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -87,9 +86,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: TODO
-test_files: []
-
+test_files: 
+- test/contest.rb
+- test/custom_slug_normalizer_test.rb
+- test/models/book.rb
+- test/models/country.rb
+- test/models/event.rb
+- test/models/novel.rb
+- test/models/person.rb
+- test/models/post.rb
+- test/models/thing.rb
+- test/models/user.rb
+- test/non_slugged_test.rb
+- test/schema.rb
+- test/scoped_model_test.rb
+- test/slug_test.rb
+- test/slugged_model_test.rb
+- test/sti_test.rb
+- test/test_helper.rb