friendly_id 2.3.3 → 2.3.4

data/Changelog.md

@@ -6,6 +6,13 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 2.3.4 (2010-03-22)
+
+* Made slugged status use the slug sequence. This fixes problems with #best?
+  returning false when finding with a sequenced slug.
+* Doc fixes. (Juan Schiwndt)
+* Misc cleanups.
+
 ## 2.3.3 (2010-03-10)
 
 * Fixed sequence regexp to grab all trailing digits. (Nash Kabbara)

data/Contributors.md

@@ -13,15 +13,21 @@ community, in particular from the following people:
 * David Ramalho
 * Diego Carrion
 * Diego R. V.
-* Florian Aßmann
+* Eric Lindvall
+* Florian Aßmanqn
 * Harry Love
 * Ian Stewart
 * Jesse Crouch
 * Joe Van Dyk
 * Johan Kok
 * Josh Nichols
+* Juan Schwindt
+* Kamal Fariz Mahyuddin
+* Louis T.
 * Mikhail Shirkov
 * Nathan Phelps
+* Nash Kabbara
+* Ramon Soares
 * Rdavila
 * Rob Ingram
 * Sean Abrahams

data/Guide.md

@@ -22,7 +22,7 @@ column with no spaces or special characters, and that is seldom or never
 updated. The most common example of this is a user name or login column:
 
     class User < ActiveRecord::Base
-      :validates_format_of :login, :with => /\A[a-z0-9]\z/i
+      validates_format_of :login, :with => /\A[a-z0-9]+\z/i
       has_friendly_id :login
     end
 
@@ -506,4 +506,4 @@ enabled. But if it is, then your patches would be very welcome!
     find unslugged model using friendly id, then to_param               x10000 |   4.608 |     55% |
     find slugged model using friendly id, then to_param                 x10000 |  12.589 |    323% |
     find cached slugged model using friendly id, then to_param          x10000 |   5.037 |     69% |
-    ------------------------------------------------------------------------------------------------
+    ------------------------------------------------------------------------------------------------

data/lib/friendly_id.rb

@@ -61,7 +61,7 @@ end
 class String
   def parse_friendly_id(separator = nil)
     separator ||= FriendlyId::Configuration::DEFAULTS[:sequence_separator]
-    name, sequence = split(/#{Regexp.escape(separator)}(\d+)*\z/)
+    name, sequence = split(/#{Regexp.escape(separator)}(\d+)?\z/)
     return name, sequence ||= "1"
   end
 end

data/lib/friendly_id/active_record2/slugged_model.rb

@@ -7,6 +7,12 @@ module FriendlyId
         def slugs_included?
           [*(options[:include] or [])].flatten.include?(:slugs)
         end
+
+        def handle_friendly_result
+          raise ::ActiveRecord::RecordNotFound.new unless @result
+          @result.friendly_id_status.friendly_id = id
+        end
+
       end
 
       class MultipleFinder
@@ -26,14 +32,10 @@ module FriendlyId
         private
 
         def find_conditions
-          slugs
-          # [unfriendly_find_conditions, friendly_find_conditions].compact.join(" OR ")
-          ids = (unfriendly_ids + sluggable_ids).join(",")
-          "%s IN (%s)" % ["#{quoted_table_name}.#{primary_key}", ids]
-        end
-
-        def friendly_find_conditions
-          "slugs.id IN (%s)" % slugs.compact.to_s(:db) if slugs?
+          "%s IN (%s)" % [
+            "#{quoted_table_name}.#{primary_key}",
+            (unfriendly_ids + sluggable_ids).join(",")
+          ]
         end
 
         def find_options
@@ -42,38 +44,23 @@ module FriendlyId
         end
 
         def sluggable_ids
-          if !@sluggable_ids
-            @sluggable_ids ||= []
-            slugs
-          end
-          @sluggable_ids
+          @sluggable_ids ||= slugs.map(&:sluggable_id)
         end
 
         def slugs
-          @sluggable_ids ||= []
           @slugs ||= friendly_ids.map do |friendly_id|
             name, sequence = friendly_id.parse_friendly_id(friendly_id_config.sequence_separator)
-            slug = Slug.first :conditions => {
+            Slug.first :conditions => {
               :name           => name,
               :scope          => scope,
               :sequence       => sequence,
               :sluggable_type => base_class.name
             }
-            sluggable_ids << slug.sluggable_id if slug
-            slug
-          end
-        end
-
-        def slugs?
-          !slugs.empty?
+          end.compact
         end
 
         def slug_for(result)
-          slugs.select {|slug| result.id == slug.sluggable_id}.first
-        end
-
-        def unfriendly_find_conditions
-          "%s IN (%s)" % ["#{quoted_table_name}.#{primary_key}", unfriendly_ids.join(",")] if unfriendly_ids?
+          slugs.detect {|slug| result.id == slug.sluggable_id}
         end
 
         def unfriendly_ids?
@@ -99,10 +86,9 @@ module FriendlyId
         include SluggedFinder
 
         def find
-          result = with_scope({:find => find_options}) { find_initial options }
-          raise ::ActiveRecord::RecordNotFound.new if friendly? and !result
-          result.friendly_id_status.name = name if result
-          result
+          @result = with_scope({:find => find_options}) { find_initial options }
+          handle_friendly_result if friendly?
+          @result
         rescue ::ActiveRecord::RecordNotFound => @error
           friendly_id_config.scope? ? raise_scoped_error : (raise @error)
         end
@@ -135,8 +121,12 @@ module FriendlyId
       # circumstances unless the +:scope+ argument is present.
       class CachedSingleFinder < SimpleModel::SingleFinder
 
+        include SluggedFinder
+
         def find
-          super
+          @result = with_scope({:find => find_options}) { find_initial options }
+          handle_friendly_result if friendly?
+          @result
         rescue ActiveRecord::RecordNotFound
           SingleFinder.new(id, model_class, options).find
         end
@@ -238,9 +228,8 @@ module FriendlyId
       include FriendlyId::Slugged::Model
       include DeprecatedMethods
 
-      def find_slug(name)
-        separator = friendly_id_config.sequence_separator
-        slugs.find_by_name_and_sequence(*name.to_s.parse_friendly_id(separator))
+      def find_slug(name, sequence)
+        slugs.find_by_name_and_sequence(name, sequence)
       end
 
       # The model instance's current {FriendlyId::ActiveRecord2::Slug slug}.

data/lib/friendly_id/slugged.rb

@@ -3,11 +3,17 @@ module FriendlyId
 
     class Status < FriendlyId::Status
 
-      attr_accessor :slug
+      attr_accessor :sequence, :slug
 
-      # The slug that was used to find the model.
-      def slug
-        @slug ||= record.find_slug(name)
+      # Did the find operation use the best possible id? True if +id+ is
+      # numeric, but the model has no slug, or +id+ is friendly and current
+      def best?
+        current? || (numeric? && !record.slug)
+      end
+
+      # Did the find operation use the current slug?
+      def current?
+        !! slug && slug.current?
       end
 
       # Did the find operation use a friendly id?
@@ -15,9 +21,8 @@ module FriendlyId
         !! (name or slug)
       end
 
-      # Did the find operation use the current slug?
-      def current?
-        !! slug && slug.current?
+      def friendly_id=(friendly_id)
+        @name, @sequence = friendly_id.parse_friendly_id(record.friendly_id_config.sequence_separator)
       end
 
       # Did the find operation use an outdated slug?
@@ -25,10 +30,9 @@ module FriendlyId
         !current?
       end
 
-      # Did the find operation use the best possible id? True if +id+ is
-      # numeric, but the model has no slug, or +id+ is friendly and current
-      def best?
-        current? || (numeric? && !record.slug)
+      # The slug that was used to find the model.
+      def slug
+        @slug ||= record.find_slug(name, sequence)
       end
 
     end
@@ -88,4 +92,4 @@ module FriendlyId
 
     end
   end
-end
+end

data/lib/friendly_id/status.rb

@@ -32,4 +32,4 @@ module FriendlyId
 
   end
 
-end
+end

data/lib/friendly_id/test.rb

@@ -139,6 +139,12 @@ module FriendlyId
         assert_equal instance2, klass.send(find_method, instance2.friendly_id)
       end
 
+      test "should indicate correct status when found with a sequence" do
+        instance2 = klass.send(create_method, :name => instance.name)
+        instance2 = klass.send(find_method, instance2.friendly_id)
+        assert instance2.friendly_id_status.best?
+      end
+
       test "should remain findable by previous slugs" do
         old_friendly_id = instance.friendly_id
         instance.update_attributes :name => "#{old_friendly_id} updated"
@@ -148,6 +154,72 @@ module FriendlyId
 
     end
 
+    # Tests for FriendlyId::Status.
+    module Status
+      test "should default to not friendly" do
+        assert !status.friendly?
+      end
+
+      test "should default to numeric" do
+        assert status.numeric?
+      end
+    end
+    
+    # Tests for FriendlyId::Status for a model that uses slugs.
+    module SluggedStatus
+
+      test "should be friendly if slug is set" do
+        status.slug = Slug.new
+        assert status.friendly?
+      end
+
+      test "should be friendly if name is set" do
+        status.name = "name"
+        assert status.friendly?
+      end
+
+      test "should be current if current slug is set" do
+        status.slug = instance.slug
+        assert status.current?
+      end
+
+      test "should not be current if non-current slug is set" do
+        status.slug = Slug.new(:sluggable => instance)
+        assert !status.current?
+      end
+
+      test "should be best if it is current" do
+        status.slug = instance.slug
+        assert status.best?
+      end
+
+      test "should be best if it is numeric, but record has no slug" do
+        instance.slugs = []
+        instance.slug = nil
+        assert status.best?
+      end
+
+      [:record, :name].each do |symbol|
+        test "should have #{symbol} after find using friendly_id" do
+          instance2 = klass.find(instance.friendly_id)
+          assert_not_nil instance2.friendly_id_status.send(symbol)
+        end
+      end
+
+      def status
+        @status ||= instance.friendly_id_status
+      end
+
+      def klass
+        raise NotImplementedError
+      end
+
+      def instance
+        raise NotImplementedError
+      end
+
+    end
+
     # Tests for models to ensure that they properly implement using the
     # +normalize_friendly_id+ method to allow developers to hook into the
     # slug string generation.
@@ -172,4 +244,4 @@ module FriendlyId
 
     end
   end
-end
+end

data/lib/friendly_id/version.rb

@@ -2,7 +2,7 @@ module FriendlyId
   module Version
     MAJOR = 2
     MINOR = 3
-    TINY = 3
+    TINY = 4
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/active_record2/slugged_status_test.rb

@@ -7,51 +7,15 @@ module FriendlyId
 
       class StatusTest < ::Test::Unit::TestCase
 
-        test "should default to not friendly" do
-          assert !status.friendly?
-        end
-
-        test "should default to numeric" do
-          assert status.numeric?
-        end
-
-        test "should be friendly if slug is set" do
-          status.slug = Slug.new
-          assert status.friendly?
-        end
-
-        test "should be friendly if name is set" do
-          status.name = "name"
-          assert status.friendly?
-        end
+        include FriendlyId::Test::Status
+        include FriendlyId::Test::SluggedStatus
 
-        test "should be current if current slug is set" do
-          status.slug = instance.slug
-          assert status.current?
-        end
-
-        test "should not be current if non-current slug is set" do
-          status.slug = Slug.new(:sluggable => instance)
-          assert !status.current?
-        end
-
-        test "should be best if it is current" do
-          status.slug = instance.slug
-          assert status.best?
-        end
-
-        test "should be best if it is numeric, but record has not slug" do
-          instance.slugs = []
-          instance.slug = nil
-          assert status.best?
+        def klass
+          Post
         end
 
         def instance
-          @instance ||= Post.create! :name => "hello world"
-        end
-
-        def status
-          @status ||= instance.friendly_id_status
+          @instance ||= klass.create! :name => "hello world"
         end
 
       end

data/test/friendly_id_test.rb

@@ -10,16 +10,8 @@ module FriendlyId
         assert_equal ["test", "2"], "test--2".parse_friendly_id
       end
 
-      test "should parse a friendly_id name and 10 as a sequence" do
-        assert_equal ["test", "10"], "test--10".parse_friendly_id
-      end
-
-      test "should parse a friendly_id name and 11 as a sequence" do
-        assert_equal ["test", "11"], "test--11".parse_friendly_id
-      end
-
-      test "should parse a friendly_id name and 29 as a sequence" do
-        assert_equal ["test", "29"], "test--29".parse_friendly_id
+      test "should parse a friendly_id name and a double digit sequence" do
+        assert_equal ["test", "12"], "test--12".parse_friendly_id
       end
 
       test "should parse with a default sequence of 1" do
@@ -54,6 +46,9 @@ module FriendlyId
         assert_equal ["test--2--test", "12"], "test--2--test--12".parse_friendly_id
       end
 
+      test "should parse with a separator and no sequence" do
+        assert_equal ["test", "1"], "test--".parse_friendly_id
+      end
 
     end
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.3.3
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 4
+  version: 2.3.4
 platform: ruby
 authors: 
 - Norman Clarke
@@ -11,29 +16,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -03:00
+date: 2010-03-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
         version: "2.2"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
         version: "2.2"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink plugins\n    for Ruby on Rails. It allows you to create pretty URL\xE2\x80\x99s and work with\n    human-friendly strings as if they were numeric ids for ActiveRecord models.\n"
 email: 
 - norman@njclarke.com
@@ -46,58 +57,58 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/friendly_id/test.rb
-- lib/friendly_id/finders.rb
+- 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/configuration.rb
+- lib/friendly_id/finders.rb
 - lib/friendly_id/slug_string.rb
+- lib/friendly_id/slugged.rb
 - lib/friendly_id/status.rb
+- lib/friendly_id/test.rb
 - lib/friendly_id/version.rb
-- lib/friendly_id/slugged.rb
-- lib/friendly_id/active_record2.rb
-- lib/friendly_id/active_record2/finders.rb
-- lib/friendly_id/active_record2/configuration.rb
-- lib/friendly_id/active_record2/tasks.rb
-- lib/friendly_id/active_record2/slugged_model.rb
-- lib/friendly_id/active_record2/slug.rb
-- lib/friendly_id/active_record2/simple_model.rb
 - lib/friendly_id.rb
 - lib/friendly_id/active_record2/tasks/friendly_id.rake
-- Guide.md
-- README.md
 - Changelog.md
 - Contributors.md
+- Guide.md
+- README.md
 - LICENSE
 - Rakefile
 - rails/init.rb
 - generators/friendly_id/friendly_id_generator.rb
 - generators/friendly_id/templates/create_slugs.rb
-- test/slug_string_test.rb
-- test/test_helper.rb
-- test/active_record2/deprecated_test.rb
-- test/active_record2/cached_slug_test.rb
-- test/active_record2/tasks_test.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/support/database.sqlite3.yml
-- test/active_record2/support/database.mysql.yml
-- test/active_record2/support/models.rb
-- test/active_record2/support/database.postgres.yml
-- test/active_record2/slug_test.rb
+- test/active_record2/deprecated_test.rb
 - test/active_record2/scoped_model_test.rb
-- test/active_record2/custom_normalizer_test.rb
+- test/active_record2/simple_test.rb
+- test/active_record2/slug_test.rb
 - test/active_record2/slugged.rb
-- test/active_record2/test_helper.rb
-- test/active_record2/core.rb
-- test/active_record2/sti_test.rb
 - test/active_record2/slugged_status_test.rb
-- test/active_record2/simple_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/friendly_id_test.rb
+- test/slug_string_test.rb
+- test/test_helper.rb
+- extras/bench.rb
 - extras/extras.rb
 - extras/prof.rb
-- extras/template-plugin.rb
-- extras/template-gem.rb
-- extras/bench.rb
 - extras/README.txt
+- extras/template-gem.rb
+- extras/template-plugin.rb
 has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
@@ -123,32 +134,34 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: friendly-id
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.
 test_files: 
-- test/slug_string_test.rb
-- test/active_record2/deprecated_test.rb
-- test/active_record2/cached_slug_test.rb
-- test/active_record2/tasks_test.rb
 - 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/slug_test.rb
+- test/active_record2/deprecated_test.rb
 - test/active_record2/scoped_model_test.rb
-- test/active_record2/custom_normalizer_test.rb
-- test/active_record2/sti_test.rb
-- test/active_record2/slugged_status_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/friendly_id_test.rb
+- test/slug_string_test.rb