friendly_id 3.0.0.beta1 → 3.0.0.beta2

data/generators/friendly_id/friendly_id_generator.rb

@@ -1,5 +1,7 @@
 class FriendlyIdGenerator < Rails::Generator::Base
 
+  RAKE_TASKS = File.join(File.dirname(__FILE__), "..", "..", "lib", "tasks", "friendly_id.rake")
+
   def manifest
     record do |m|
       unless options[:skip_migration]
@@ -7,7 +9,7 @@ class FriendlyIdGenerator < Rails::Generator::Base
       end
       unless options[:skip_tasks]
         m.directory "lib/tasks"
-        m.file "/../../../lib/friendly_id/acktive_record/tasks/friendly_id.rake", "lib/tasks/friendly_id.rake"
+        m.file RAKE_TASKS, "lib/tasks/friendly_id.rake"
       end
     end
   end
@@ -25,4 +27,4 @@ class FriendlyIdGenerator < Rails::Generator::Base
     end
   end
 
-end
+end

data/lib/friendly_id.rb

@@ -1,12 +1,11 @@
 require "active_support/core_ext/class/attribute_accessors"
+
 require File.join(File.dirname(__FILE__), "friendly_id", "slug_string")
 require File.join(File.dirname(__FILE__), "friendly_id", "configuration")
 require File.join(File.dirname(__FILE__), "friendly_id", "status")
 require File.join(File.dirname(__FILE__), "friendly_id", "finders")
 require File.join(File.dirname(__FILE__), "friendly_id", "slugged")
 
-
-
 # FriendlyId is a comprehensive Ruby library for slugging and permalinks with
 # ActiveRecord.
 # @author Norman Clarke
@@ -63,3 +62,5 @@ class String
     return name, sequence ||= "1"
   end
 end
+
+require File.join(File.dirname(__FILE__), "friendly_id", "railtie") if defined?(Rails) && Rails.version >= "3"

data/lib/friendly_id/railtie.rb

@@ -0,0 +1,23 @@
+module FriendlyId
+  class Railtie < Rails::Railtie
+    
+    initializer "friendly_id.configure_rails_initialization" do |app|
+      # Experimental Sequel support. See: http://github.com/norman/friendly_id_sequel
+      if app.config.generators.rails[:orm] == :sequel
+        begin
+          require "friendly_id/sequel"
+        rescue LoadError
+          raise "To use FriendlyId's Sequel adapter, please 'gem install friendly_id_sequel'"
+        end
+      else
+        # Only Sequel and ActiveRecord are currently supported; AR is the default.
+        # Want Datamapper support? http://github.com/norman/friendly_id/issues#issue/24
+        require "friendly_id/active_record"
+      end
+    end
+    
+    rake_tasks do
+      load "tasks/friendly_id.rake"
+    end
+  end
+end

data/lib/friendly_id/version.rb

@@ -3,7 +3,7 @@ module FriendlyId
     MAJOR = 3
     MINOR = 0
     TINY = 0
-    BUILD = "beta1"
+    BUILD = "beta2"
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 end

data/lib/generators/friendly_id_generator.rb

@@ -5,19 +5,12 @@ 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

data/lib/{friendly_id/acktive_record/tasks → tasks}/friendly_id.rake

@@ -12,7 +12,7 @@ namespace :friendly_id do
     Rake::Task["friendly_id:make_slugs"].invoke
   end
 
-  desc "Kill obsolete slugs older than DAYS=45 days."
+  desc "Destroy obsolete slugs older than DAYS=45 days."
   task :remove_old_slugs => :environment do
     FriendlyId::TaskRunner.new.delete_old_slugs
   end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta1
-  version: 3.0.0.beta1
+  - beta2
+  version: 3.0.0.beta2
 platform: ruby
 authors: 
 - Norman Clarke
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -03:00
+date: 2010-03-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - lib/friendly_id/active_record.rb
 - lib/friendly_id/configuration.rb
 - lib/friendly_id/finders.rb
+- lib/friendly_id/railtie.rb
 - lib/friendly_id/slug_string.rb
 - lib/friendly_id/slugged.rb
 - lib/friendly_id/status.rb
@@ -74,7 +75,7 @@ files:
 - lib/friendly_id/version.rb
 - lib/friendly_id.rb
 - lib/generators/friendly_id_generator.rb
-- lib/friendly_id/acktive_record/tasks/friendly_id.rake
+- lib/tasks/friendly_id.rake
 - Changelog.md
 - Contributors.md
 - Guide.md
@@ -115,19 +116,7 @@ has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
 
-post_install_message: |+
-  
-      ***********************************************************
-  
-        If you are upgrading friendly_id, please run
-  
-            ./script/generate friendly_id --skip-migration
-  
-        in your Rails application to ensure that you have the
-        latest friendly_id Rake tasks.
-  
-      ***********************************************************
-  
+post_install_message: 
 rdoc_options: []
 
 require_paths: