friendly_id 3.0.0.beta3 → 3.0.0

data/Changelog.md

@@ -6,15 +6,12 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
-## 3.0.0 (NOT RELEASED YET)
+## 3.0.0 (2010-03-30)
 
 * Rails 3 support.
 * Removed features deprecated in FriendlyId 2.3.
-
-## 2.3.5 (NOT RELEASED YET)
-
 * Fixed searching by numeric friendly_id in non-slugged models.
-* Added allow_nil option (Andre Duffeck and Norman Clarke)
+* Added :allow_nil config option (Andre Duffeck and Norman Clarke)
 
 ## 2.3.4 (2010-03-22)
 

data/Rakefile

@@ -44,7 +44,7 @@ namespace :test do
     sh "cd fid; rake test"
   end
   Rake::TestTask.new(:friendly_id) { |t| t.pattern = "test/*_test.rb" }
-  Rake::TestTask.new(:ar) { |t| t.pattern = "test/acktive_record/*_test.rb" }
+  Rake::TestTask.new(:ar) { |t| t.pattern = "test/active_record_adapter/*_test.rb" }
   
   namespace :rails do
     task :plugin do

data/extras/extras.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -KU
 require File.dirname(__FILE__) + '/../test/test_helper'
-require File.dirname(__FILE__) + '/../test/acktive_record/test_helper'
+require File.dirname(__FILE__) + '/../test/active_record_adapter/test_helper'
 require 'ffaker'
 
 TIMES = (ENV['N'] || 100).to_i

data/lib/friendly_id.rb

@@ -1,3 +1,4 @@
+require "forwardable"
 require "active_support/core_ext/class/attribute_accessors"
 require "active_support/core_ext/object/blank"
 

data/lib/friendly_id/active_record.rb

@@ -1,6 +1,6 @@
 module FriendlyId
 
-  module AcktiveRecord
+  module ActiveRecordAdapter
 
     module Compat
       def self.scope_method
@@ -41,12 +41,12 @@ module FriendlyId
 end
 
 class ActiveRecord::Base
-  extend FriendlyId::AcktiveRecord
+  extend FriendlyId::ActiveRecordAdapter
 end
 
-require File.join(File.dirname(__FILE__), "acktive_record", "configuration")
-require File.join(File.dirname(__FILE__), "acktive_record", "finders")
-require File.join(File.dirname(__FILE__), "acktive_record", "simple_model")
-require File.join(File.dirname(__FILE__), "acktive_record", "slugged_model")
-require File.join(File.dirname(__FILE__), "acktive_record", "slug")
-require File.join(File.dirname(__FILE__), "acktive_record", "tasks")
+require File.join(File.dirname(__FILE__), "active_record_adapter", "configuration")
+require File.join(File.dirname(__FILE__), "active_record_adapter", "finders")
+require File.join(File.dirname(__FILE__), "active_record_adapter", "simple_model")
+require File.join(File.dirname(__FILE__), "active_record_adapter", "slugged_model")
+require File.join(File.dirname(__FILE__), "active_record_adapter", "slug")
+require File.join(File.dirname(__FILE__), "active_record_adapter", "tasks")

data/lib/friendly_id/{acktive_record → active_record_adapter}/configuration.rb

@@ -1,13 +1,16 @@
 module FriendlyId
-  module AcktiveRecord
 
+  module ActiveRecordAdapter
+
+    # Extends FriendlyId::Configuration with some implementation details and
+    # features specific to ActiveRecord.
     class Configuration < FriendlyId::Configuration
 
       # The column used to cache the friendly_id string. If no column is specified,
       # FriendlyId will look for a column named +cached_slug+ and use it automatically
       # if it exists. If for some reason you have a column named +cached_slug+
       # but don't want FriendlyId to modify it, pass the option
-      # +:cache_column => false+ to {FriendlyId::AcktiveRecord#has_friendly_id has_friendly_id}.
+      # +:cache_column => false+ to {FriendlyId::ActiveRecordAdapter#has_friendly_id has_friendly_id}.
       attr_accessor :cache_column
 
       # An array of classes for which the configured class serves as a

data/lib/friendly_id/{acktive_record → active_record_adapter}/finders.rb

@@ -2,7 +2,7 @@ module FriendlyId
 
   # The adapter for Ruby on Rails's ActiveRecord. Compatible with AR 2.2.x -
   # 2.3.x.
-  module AcktiveRecord
+  module ActiveRecordAdapter
 
     # The classes in this module are used internally by FriendlyId, and exist
     # largely to avoid polluting the ActiveRecord models with too many
@@ -16,22 +16,22 @@ module FriendlyId
       # a cached or uncached finder.
       class FinderProxy
 
+        extend Forwardable
+
         attr_reader :finder
         attr :finder_class
         attr :ids
         attr :model_class
         attr :options
 
+        def_delegators :finder, :find, :unfriendly?
+
         def initialize(model_class, *args, &block)
           @model_class = model_class
           @ids = args.shift
           @options = args.first.kind_of?(Hash) ? args.first : {}
         end
 
-        def method_missing(symbol, *args)
-          finder.send(symbol, *args)
-        end
-
         # Perform the find query.
         def finder
           @finder ||= finder_class.new(ids, model_class, options)
@@ -85,6 +85,8 @@ module FriendlyId
       # @abstract
       module Multiple
 
+        include FriendlyId::Finders::Base
+
         attr_reader :friendly_ids, :results, :unfriendly_ids
 
         def initialize(ids, model_class, options={})

data/lib/friendly_id/{acktive_record → active_record_adapter}/simple_model.rb

@@ -1,5 +1,5 @@
 module FriendlyId
-  module AcktiveRecord
+  module ActiveRecordAdapter
 
     module SimpleModel
 
@@ -20,8 +20,7 @@ module FriendlyId
 
       class MultipleFinder
 
-        include FriendlyId::Finders::Base
-        include FriendlyId::AcktiveRecord::Finders::Multiple
+        include FriendlyId::ActiveRecordAdapter::Finders::Multiple
         include SimpleFinder
 
         def find
@@ -71,7 +70,7 @@ module FriendlyId
           validates_presence_of column, :unless => :skip_friendly_id_validations
           validates_length_of column, :maximum => friendly_id_config.max_length, :unless => :skip_friendly_id_validations
           after_update :update_scopes
-          extend FriendlyId::AcktiveRecord::FinderMethods
+          extend FriendlyId::ActiveRecordAdapter::FinderMethods
         end
       end
 
@@ -109,7 +108,7 @@ module FriendlyId
       end
 
       def skip_friendly_id_validations
-        friendly_id.nil? && self.class.friendly_id_config.allow_nil?
+        friendly_id.nil? && friendly_id_config.allow_nil?
       end
 
       def validate_friendly_id

data/lib/friendly_id/{acktive_record → active_record_adapter}/slug.rb

@@ -5,7 +5,7 @@ class Slug < ::ActiveRecord::Base
   belongs_to :sluggable, :polymorphic => true
   before_save :enable_name_reversion, :set_sequence
   validate :validate_name
-  send FriendlyId::AcktiveRecord::Compat.scope_method, :similar_to, lambda {|slug| {:conditions => {
+  send FriendlyId::ActiveRecordAdapter::Compat.scope_method, :similar_to, lambda {|slug| {:conditions => {
         :name           => slug.name,
         :scope          => slug.scope,
         :sluggable_type => slug.sluggable_type

data/lib/friendly_id/{acktive_record → active_record_adapter}/slugged_model.rb

@@ -1,5 +1,5 @@
 module FriendlyId
-  module AcktiveRecord
+  module ActiveRecordAdapter
     module SluggedModel
 
       module SluggedFinder
@@ -17,14 +17,13 @@ module FriendlyId
 
       class MultipleFinder
 
-        include FriendlyId::Finders::Base
-        include FriendlyId::AcktiveRecord::Finders::Multiple
+        include FriendlyId::ActiveRecordAdapter::Finders::Multiple
         include SluggedFinder
 
         attr_reader :slugs
 
         def find
-          @results = with_scope(:find => find_options) { all options }.uniq
+          @results = model_class.scoped(find_options).all(options).uniq
           raise ::ActiveRecord::RecordNotFound, error_message if @results.size != expected_size
           @results.each {|result| result.friendly_id_status.name = slug_for(result)}
         end
@@ -146,7 +145,7 @@ module FriendlyId
           after_update :update_scope
           after_update :update_dependent_scopes
           protect_friendly_id_attributes
-          extend FriendlyId::AcktiveRecord::FinderMethods
+          extend FriendlyId::ActiveRecordAdapter::FinderMethods
         end
       end
 
@@ -156,7 +155,7 @@ module FriendlyId
         slugs.find_by_name_and_sequence(name, sequence)
       end
 
-      # The model instance's current {FriendlyId::AcktiveRecord::Slug slug}.
+      # The model instance's current {FriendlyId::ActiveRecordAdapter::Slug slug}.
       def slug
         return @slug if new_record?
         @slug ||= slugs.first(:order => "id DESC")

data/lib/friendly_id/{acktive_record → active_record_adapter}/tasks.rb

@@ -1,10 +1,14 @@
 module FriendlyId
   class TaskRunner
 
+    extend Forwardable
+
     attr_accessor :days
     attr_accessor :klass
     attr_accessor :task_options
 
+    def_delegators :klass, :find, :friendly_id_config, :update_all
+
     OLD_SLUG_DAYS = 45
 
     def initialize(&block)
@@ -12,16 +16,12 @@ module FriendlyId
       self.days  = ENV["DAYS"]
     end
 
-    def method_missing(*args)
-      klass.send(*args)
-    end
-
     def days=(days)
-      @days = days.blank? ? OLD_SLUG_DAYS : days.to_i
+      @days ||= days.blank? ? OLD_SLUG_DAYS : days.to_i
     end
 
     def klass=(klass)
-      @klass = klass.to_s.classify.constantize unless klass.blank?
+      @klass ||= klass.to_s.classify.constantize unless klass.blank?
     end
 
     def make_slugs

data/lib/friendly_id/finders.rb

@@ -4,6 +4,11 @@ module FriendlyId
 
     module Base
 
+      extend Forwardable
+
+      def_delegators :model_class, :base_class, :friendly_id_config,
+        :primary_key, :quoted_table_name, :sanitize_sql, :table_name
+
       # Is the id friendly or numeric? Not that the return value here is
       # +false+ if the +id+ is definitely not friendly, and +nil+ if it can
       # not be determined.
@@ -38,10 +43,6 @@ module FriendlyId
         self.scope = options.delete :scope
       end
 
-      def method_missing(*args, &block)
-        model_class.send(*args, &block)
-      end
-
       # An array of ids; can be both friendly and unfriendly.
       attr_accessor :ids
 
@@ -105,4 +106,4 @@ module FriendlyId
     end
 
   end
-end
+end

data/lib/friendly_id/version.rb

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper'
 
 module FriendlyId
   module Test
-    module AcktiveRecord
+    module ActiveRecordAdapter
       module Simple
 
         module SimpleTest
@@ -23,7 +23,7 @@ module FriendlyId
 
           include FriendlyId::Test::Generic
           include FriendlyId::Test::Simple
-          include FriendlyId::Test::AcktiveRecord::Core
+          include FriendlyId::Test::ActiveRecordAdapter::Core
           include SimpleTest
 
           test "should default to not friendly" do

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

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

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

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

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

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

data/test/active_record_adapter/support/database.jdbcsqlite3.yml

@@ -0,0 +1,2 @@
+adapter: jdbcsqlite3
+database: ":memory:"

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

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

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

@@ -80,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
-  send FriendlyId::AcktiveRecord::Compat.scope_method, :published, :conditions => { :published => true }
+  send FriendlyId::ActiveRecordAdapter::Compat.scope_method, :published, :conditions => { :published => true }
 end
 
 # Model that uses a custom table name

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 3
   - 0
   - 0
-  - beta3
-  version: 3.0.0.beta3
+  version: 3.0.0
 platform: ruby
 authors: 
 - Norman Clarke
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -03:00
+date: 2010-03-30 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,13 +57,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- 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/active_record_adapter/configuration.rb
+- lib/friendly_id/active_record_adapter/finders.rb
+- lib/friendly_id/active_record_adapter/simple_model.rb
+- lib/friendly_id/active_record_adapter/slug.rb
+- lib/friendly_id/active_record_adapter/slugged_model.rb
+- lib/friendly_id/active_record_adapter/tasks.rb
 - lib/friendly_id/configuration.rb
 - lib/friendly_id/finders.rb
 - lib/friendly_id/railtie.rb
@@ -86,24 +85,24 @@ files:
 - rails/init.rb
 - generators/friendly_id/friendly_id_generator.rb
 - generators/friendly_id/templates/create_slugs.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/active_record_adapter/basic_slugged_model_test.rb
+- test/active_record_adapter/cached_slug_test.rb
+- test/active_record_adapter/core.rb
+- test/active_record_adapter/custom_normalizer_test.rb
+- test/active_record_adapter/custom_table_name_test.rb
+- test/active_record_adapter/scoped_model_test.rb
+- test/active_record_adapter/simple_test.rb
+- test/active_record_adapter/slug_test.rb
+- test/active_record_adapter/slugged.rb
+- test/active_record_adapter/slugged_status_test.rb
+- test/active_record_adapter/sti_test.rb
+- test/active_record_adapter/support/database.jdbcsqlite3.yml
+- test/active_record_adapter/support/database.mysql.yml
+- test/active_record_adapter/support/database.postgres.yml
+- test/active_record_adapter/support/database.sqlite3.yml
+- test/active_record_adapter/support/models.rb
+- test/active_record_adapter/tasks_test.rb
+- test/active_record_adapter/test_helper.rb
 - test/friendly_id_test.rb
 - test/slug_string_test.rb
 - test/test_helper.rb
@@ -146,16 +145,15 @@ signing_key:
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: 
-- 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/active_record_adapter/basic_slugged_model_test.rb
+- test/active_record_adapter/cached_slug_test.rb
+- test/active_record_adapter/custom_normalizer_test.rb
+- test/active_record_adapter/custom_table_name_test.rb
+- test/active_record_adapter/scoped_model_test.rb
+- test/active_record_adapter/simple_test.rb
+- test/active_record_adapter/slug_test.rb
+- test/active_record_adapter/slugged_status_test.rb
+- test/active_record_adapter/sti_test.rb
+- test/active_record_adapter/tasks_test.rb
 - test/friendly_id_test.rb
 - test/slug_string_test.rb

data/test/acktive_record/temp_test.rb

@@ -1,32 +0,0 @@
-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