friendly_id 2.3.4 → 3.0.0.beta1

data/lib/friendly_id/version.rb

@@ -1,8 +1,9 @@
 module FriendlyId
   module Version
-    MAJOR = 2
-    MINOR = 3
-    TINY = 4
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    MAJOR = 3
+    MINOR = 0
+    TINY = 0
+    BUILD = "beta1"
+    STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 end

data/lib/generators/friendly_id_generator.rb

@@ -0,0 +1,32 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class FriendlyIdGenerator < Rails::Generators::Base
+
+  include Rails::Generators::Migration
+
+  RAKE_FILE = File.join(File.dirname(__FILE__), "..", "friendly_id", "acktive_record", "tasks", "friendly_id.rake")
+  MIGRATIONS_FILE = File.join(File.dirname(__FILE__), "..", "..", "generators", "friendly_id", "templates", "create_slugs.rb")
+
+  class_option :"skip-migration", :type => :boolean, :desc => "Don't generate a migration for the slugs table"
+  class_option :"skip-tasks", :type => :boolean, :desc => "Don't add friendly_id Rake tasks to lib/tasks"
+  class_option :"skip-initializer", :type => :boolean, :desc => "Don't add friendly_id initializer to config/initializers"
+
+  def copy_files(*args)
+    migration_template MIGRATIONS_FILE, "db/migrate/create_slugs.rb" unless options["skip-migration"]
+    rakefile "friendly_id.rake", File.read(RAKE_FILE) unless options["skip-tasks"]
+    initializer "friendly_id.rb" do
+      'require "friendly_id/active_record"'
+    end unless options["skip-initializer"]
+  end
+
+  # Taken from ActiveRecord's migration generator
+  def self.next_migration_number(dirname) #:nodoc:
+    if ActiveRecord::Base.timestamped_migrations
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    else
+      "%.3d" % (current_migration_number(dirname) + 1)
+    end
+  end
+
+end

data/rails/init.rb

@@ -1,2 +1,2 @@
 require "friendly_id"
-require "friendly_id/active_record2"
+require "friendly_id/active_record"

data/test/{active_record2 → acktive_record}/basic_slugged_model_test.rb

@@ -2,12 +2,12 @@ require File.dirname(__FILE__) + '/test_helper'
 
 module FriendlyId
   module Test
-    module ActiveRecord2
+    module AcktiveRecord
       class BasicSluggedModelTest < ::Test::Unit::TestCase
         include FriendlyId::Test::Generic
         include FriendlyId::Test::Slugged
-        include FriendlyId::Test::ActiveRecord2::Slugged
-        include FriendlyId::Test::ActiveRecord2::Core
+        include FriendlyId::Test::AcktiveRecord::Slugged
+        include FriendlyId::Test::AcktiveRecord::Core
       end
     end
   end

data/test/{active_record2 → acktive_record}/cached_slug_test.rb

@@ -2,14 +2,14 @@ require File.dirname(__FILE__) + '/test_helper'
 
 module FriendlyId
   module Test
-    module ActiveRecord2
+    module AcktiveRecord
 
       class CachedSlugTest < ::Test::Unit::TestCase
 
         include FriendlyId::Test::Generic
         include FriendlyId::Test::Slugged
-        include FriendlyId::Test::ActiveRecord2::Slugged
-        include FriendlyId::Test::ActiveRecord2::Core
+        include FriendlyId::Test::AcktiveRecord::Slugged
+        include FriendlyId::Test::AcktiveRecord::Core
 
         def klass
           District

data/test/{active_record2 → acktive_record}/core.rb

@@ -4,7 +4,7 @@ module FriendlyId
 
   module Test
 
-    module ActiveRecord2
+    module AcktiveRecord
 
       module Core
 

data/test/{active_record2 → acktive_record}/custom_normalizer_test.rb

@@ -2,12 +2,12 @@ require File.dirname(__FILE__) + '/test_helper'
 
 module FriendlyId
   module Test
-    module ActiveRecord2
+    module AcktiveRecord
 
       class CustomNormalizerTest < ::Test::Unit::TestCase
 
-        include FriendlyId::Test::ActiveRecord2::Core
-        include FriendlyId::Test::ActiveRecord2::Slugged
+        include FriendlyId::Test::AcktiveRecord::Core
+        include FriendlyId::Test::AcktiveRecord::Slugged
         include FriendlyId::Test::CustomNormalizer
 
         def klass

data/test/{active_record2 → acktive_record}/custom_table_name_test.rb

@@ -2,14 +2,14 @@ require File.dirname(__FILE__) + '/test_helper'
 
 module FriendlyId
   module Test
-    module ActiveRecord2
+    module AcktiveRecord
 
       class CustomTableNameTest < ::Test::Unit::TestCase
 
         include FriendlyId::Test::Generic
         include FriendlyId::Test::Slugged
-        include FriendlyId::Test::ActiveRecord2::Slugged
-        include FriendlyId::Test::ActiveRecord2::Core
+        include FriendlyId::Test::AcktiveRecord::Slugged
+        include FriendlyId::Test::AcktiveRecord::Core
 
         def klass
           Place

data/test/{active_record2 → acktive_record}/scoped_model_test.rb

@@ -7,8 +7,8 @@ module FriendlyId
 
       include FriendlyId::Test::Generic
       include FriendlyId::Test::Slugged
-      include FriendlyId::Test::ActiveRecord2::Slugged
-      include FriendlyId::Test::ActiveRecord2::Core
+      include FriendlyId::Test::AcktiveRecord::Slugged
+      include FriendlyId::Test::AcktiveRecord::Core
 
       def setup
         @user = User.create!(:name => "john")

data/test/{active_record2 → acktive_record}/simple_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper'
 
 module FriendlyId
   module Test
-    module ActiveRecord2
+    module AcktiveRecord
       module Simple
 
         module SimpleTest
@@ -21,6 +21,9 @@ module FriendlyId
 
         class StatusTest < ::Test::Unit::TestCase
 
+          include FriendlyId::Test::Generic
+          include FriendlyId::Test::Simple
+          include FriendlyId::Test::AcktiveRecord::Core
           include SimpleTest
 
           test "should default to not friendly" do

data/test/{active_record2 → acktive_record}/slugged.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper'
 
 module FriendlyId
   module Test
-    module ActiveRecord2
+    module AcktiveRecord
       module Slugged
 
         test "should allow eager loading of slugs" do

data/test/{active_record2 → acktive_record}/slugged_status_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/test_helper'
 
 module FriendlyId
   module Test
-    module ActiveRecord2
+    module AcktiveRecord
 
       class StatusTest < ::Test::Unit::TestCase
 

data/test/{active_record2 → acktive_record}/sti_test.rb

@@ -2,14 +2,14 @@ require File.dirname(__FILE__) + '/test_helper'
 
 module FriendlyId
   module Test
-    module ActiveRecord2
+    module AcktiveRecord
 
       class StiTest < ::Test::Unit::TestCase
 
         include FriendlyId::Test::Generic
         include FriendlyId::Test::Slugged
-        include FriendlyId::Test::ActiveRecord2::Slugged
-        include FriendlyId::Test::ActiveRecord2::Core
+        include FriendlyId::Test::AcktiveRecord::Slugged
+        include FriendlyId::Test::AcktiveRecord::Core
 
         def klass
           Novel

data/test/{active_record2 → acktive_record}/support/models.rb

@@ -5,6 +5,11 @@ class CreateSupportModels < ActiveRecord::Migration
       t.string :name
     end
 
+    create_table :blocks do |t|
+      t.string :name
+      t.string :note
+    end
+
     create_table :books do |t|
       t.string :name
       t.string :type
@@ -65,14 +70,8 @@ class CreateSupportModels < ActiveRecord::Migration
       t.index :name, :unique => true
     end
 
-    create_table :blocks do |t|
-      t.string :name
-      t.string :note
-    end
-
   end
 
   def self.down
   end
 end
-

data/test/{active_record2 → acktive_record}/tasks_test.rb

@@ -1,5 +1,5 @@
 require(File.dirname(__FILE__) + '/test_helper')
-require File.dirname(__FILE__) + '/../../lib/friendly_id/active_record2/tasks'
+require File.dirname(__FILE__) + '/../../lib/friendly_id/acktive_record/tasks'
 
 class TasksTest < Test::Unit::TestCase
 

data/test/acktive_record/temp_test.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+
+#   scope :hello, :conditions => {"books.name" => "hello world"}
+#   scope :friendly, lambda { |name| {:conditions => {"slugs.name" => name }, :include => :slugs}}
+#
+#   def self.find(*args, &block)
+#     if FriendlyId::Finders::Base.friendly?(args.first)
+#       puts "doing friendly find with #{args.first}"
+#       self.friendly(args.shift).first(*args)
+#     else
+#       super
+#     end
+#   end
+#
+# end
+
+module FriendlyId
+  module Test
+    module AcktiveRecord
+
+      class StiTest < ::Test::Unit::TestCase
+
+      #   def test_temp
+      #     instance = Post.create(:name => "hello world")
+      #     p instance.class.find(instance.friendly_id)
+      #   end
+      end
+
+    end
+  end
+end

data/test/{active_record2 → acktive_record}/test_helper.rb

@@ -2,7 +2,8 @@ require File.dirname(__FILE__) + "/../test_helper"
 
 require "active_record"
 require "active_support"
-require File.dirname(__FILE__) + "/../../lib/friendly_id/active_record2.rb"
+
+require File.dirname(__FILE__) + "/../../lib/friendly_id/active_record.rb"
 require File.dirname(__FILE__) + "/../../generators/friendly_id/templates/create_slugs"
 require File.dirname(__FILE__) + "/support/models"
 require File.dirname(__FILE__) + '/core'
@@ -79,7 +80,7 @@ end
 # A model that uses default slug settings and has a named scope
 class Post < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true
-  named_scope :published, :conditions => { :published => true }
+  send FriendlyId::AcktiveRecord::Compat.scope_method, :published, :conditions => { :published => true }
 end
 
 # Model that uses a custom table name
@@ -104,11 +105,4 @@ end
 # A model with no table
 class Question < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true
-end
-
-# A model using the deprecated block syntax
-class Block < ActiveRecord::Base
-  has_friendly_id :name, :use_slug => true do |text|
-    FriendlyId::SlugString.new(text).clean.with_dashes
-  end
-end
+end

data/test/slug_string_test.rb

@@ -73,6 +73,10 @@ module FriendlyId
           assert_equal "検-索", SlugString.new("検 索").with_dashes
         end
 
+        test "to_ascii should work with invalid UTF-8 strings" do
+          assert_equal "abc", SlugString.new("\x93abc").to_ascii.to_s
+        end
+
     end
   end
-end
+end

data/test/test_helper.rb

@@ -1,9 +1,15 @@
 $KCODE = "UTF8" if RUBY_VERSION < "1.9"
 $VERBOSE = false
-
-require "rubygems"
+begin
+  require File.join(File.dirname(__FILE__), '../.bundle/environment')
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
 require "test/unit"
 require "mocha"
 require "active_support"
 require File.dirname(__FILE__) + "/../lib/friendly_id"
-require File.dirname(__FILE__) + "/../lib/friendly_id/test"
+require File.dirname(__FILE__) + "/../lib/friendly_id/test"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 2
   - 3
-  - 4
-  version: 2.3.4
+  - 0
+  - 0
+  - beta1
+  version: 3.0.0.beta1
 platform: ruby
 authors: 
 - Norman Clarke
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -03:00
+date: 2010-03-26 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,13 +58,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/friendly_id/active_record2/configuration.rb
-- lib/friendly_id/active_record2/finders.rb
-- lib/friendly_id/active_record2/simple_model.rb
-- lib/friendly_id/active_record2/slug.rb
-- lib/friendly_id/active_record2/slugged_model.rb
-- lib/friendly_id/active_record2/tasks.rb
-- lib/friendly_id/active_record2.rb
+- lib/friendly_id/acktive_record/configuration.rb
+- lib/friendly_id/acktive_record/finders.rb
+- lib/friendly_id/acktive_record/simple_model.rb
+- lib/friendly_id/acktive_record/slug.rb
+- lib/friendly_id/acktive_record/slugged_model.rb
+- lib/friendly_id/acktive_record/tasks.rb
+- lib/friendly_id/active_record.rb
 - lib/friendly_id/configuration.rb
 - lib/friendly_id/finders.rb
 - lib/friendly_id/slug_string.rb
@@ -72,7 +73,8 @@ files:
 - lib/friendly_id/test.rb
 - lib/friendly_id/version.rb
 - lib/friendly_id.rb
-- lib/friendly_id/active_record2/tasks/friendly_id.rake
+- lib/generators/friendly_id_generator.rb
+- lib/friendly_id/acktive_record/tasks/friendly_id.rake
 - Changelog.md
 - Contributors.md
 - Guide.md
@@ -82,24 +84,24 @@ files:
 - rails/init.rb
 - generators/friendly_id/friendly_id_generator.rb
 - generators/friendly_id/templates/create_slugs.rb
-- test/active_record2/basic_slugged_model_test.rb
-- test/active_record2/cached_slug_test.rb
-- test/active_record2/core.rb
-- test/active_record2/custom_normalizer_test.rb
-- test/active_record2/custom_table_name_test.rb
-- test/active_record2/deprecated_test.rb
-- test/active_record2/scoped_model_test.rb
-- test/active_record2/simple_test.rb
-- test/active_record2/slug_test.rb
-- test/active_record2/slugged.rb
-- test/active_record2/slugged_status_test.rb
-- test/active_record2/sti_test.rb
-- test/active_record2/support/database.mysql.yml
-- test/active_record2/support/database.postgres.yml
-- test/active_record2/support/database.sqlite3.yml
-- test/active_record2/support/models.rb
-- test/active_record2/tasks_test.rb
-- test/active_record2/test_helper.rb
+- test/acktive_record/basic_slugged_model_test.rb
+- test/acktive_record/cached_slug_test.rb
+- test/acktive_record/core.rb
+- test/acktive_record/custom_normalizer_test.rb
+- test/acktive_record/custom_table_name_test.rb
+- test/acktive_record/scoped_model_test.rb
+- test/acktive_record/simple_test.rb
+- test/acktive_record/slug_test.rb
+- test/acktive_record/slugged.rb
+- test/acktive_record/slugged_status_test.rb
+- test/acktive_record/sti_test.rb
+- test/acktive_record/support/database.mysql.yml
+- test/acktive_record/support/database.postgres.yml
+- test/acktive_record/support/database.sqlite3.yml
+- test/acktive_record/support/models.rb
+- test/acktive_record/tasks_test.rb
+- test/acktive_record/temp_test.rb
+- test/acktive_record/test_helper.rb
 - test/friendly_id_test.rb
 - test/slug_string_test.rb
 - test/test_helper.rb
@@ -142,8 +144,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: friendly-id
@@ -152,16 +156,16 @@ signing_key:
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: 
-- test/active_record2/basic_slugged_model_test.rb
-- test/active_record2/cached_slug_test.rb
-- test/active_record2/custom_normalizer_test.rb
-- test/active_record2/custom_table_name_test.rb
-- test/active_record2/deprecated_test.rb
-- test/active_record2/scoped_model_test.rb
-- test/active_record2/simple_test.rb
-- test/active_record2/slug_test.rb
-- test/active_record2/slugged_status_test.rb
-- test/active_record2/sti_test.rb
-- test/active_record2/tasks_test.rb
+- test/acktive_record/basic_slugged_model_test.rb
+- test/acktive_record/cached_slug_test.rb
+- test/acktive_record/custom_normalizer_test.rb
+- test/acktive_record/custom_table_name_test.rb
+- test/acktive_record/scoped_model_test.rb
+- test/acktive_record/simple_test.rb
+- test/acktive_record/slug_test.rb
+- test/acktive_record/slugged_status_test.rb
+- test/acktive_record/sti_test.rb
+- test/acktive_record/tasks_test.rb
+- test/acktive_record/temp_test.rb
 - test/friendly_id_test.rb
 - test/slug_string_test.rb