friendly_id 3.3.0.alpha2 → 3.3.0.rc1

data/Changelog.md

@@ -8,6 +8,7 @@ suggestions, ideas and improvements to FriendlyId.
 
 ## 3.3.0 (NOT_RELEASED_YET)
 
+* Convert blank slugs to nil automatically ([Gabe da Silveira ](https://github.com/dasil003))
 * Compatibility with Active Record 3.1 ([Andrew White](https://github.com/pixeltrix))
 * Gemspec compatibility with RubyGems 1.7 ([Philip Arndt](https://github.com/parndt))
 * Fixed generators for Rails 3.1 ([Matt Burke](https://github.com/spraints))

data/Contributors.md

@@ -18,6 +18,7 @@ community, in particular from the following people:
 * Diego R. V.
 * Eric Lindvall
 * Florian Aßmanqn
+* Gabe da Silveira
 * Harry Love
 * Ian Stewart
 * James Cropcho
@@ -28,10 +29,12 @@ community, in particular from the following people:
 * Juan Schwindt
 * Kamal Fariz Mahyuddin
 * Laurence A. Lee
+* Loïc Guitaut
 * Louis T.
 * Mikhail Shirkov
 * Nash Kabbara
 * Nathan Phelps
+* Philip Arndt
 * Ramon Soares
 * Rdavila
 * Rob Ingram

data/Rakefile

@@ -1,7 +1,7 @@
 require "rubygems"
 require "rake"
 require "rake/testtask"
-require "rake/gempackagetask"
+require "rubygems/package_task"
 require "rake/clean"
 require "bundler/setup"
 
@@ -11,7 +11,7 @@ CLEAN << "pkg" << "doc" << "coverage" << ".yardoc"
 
 gemspec = File.expand_path("../friendly_id.gemspec", __FILE__)
 if File.exists? gemspec
-  Rake::GemPackageTask.new(eval(File.read("friendly_id.gemspec"))) { |pkg| }
+  Gem::PackageTask.new(eval(File.read("friendly_id.gemspec"))) { |pkg| }
 end
 
 begin

data/lib/friendly_id/active_record_adapter/finders.rb

@@ -63,7 +63,7 @@ module FriendlyId
         def parse_ids!
           @id = id.uniq.map do |member|
             if member.respond_to?(:friendly_id_config)
-              member.id.to_i
+              member.id
             else
               member
             end

data/lib/friendly_id/active_record_adapter/relation.rb

@@ -29,7 +29,7 @@ module FriendlyId
         end
 
         def find_some
-          ids = @ids.compact.uniq.map {|id| id.respond_to?(:friendly_id_config) ? id.id.to_i : id}
+          ids = @ids.compact.uniq.map {|id| id.respond_to?(:friendly_id_config) ? id.id : id}
           friendly_ids, unfriendly_ids = ids.partition {|id| id.friendly_id?}
           return if friendly_ids.empty?
           records = friendly_records(friendly_ids, unfriendly_ids).each do |record|
@@ -164,7 +164,7 @@ module FriendlyId
         Find.new(self, ids).find_some or begin
           # A change in Arel 2.0.x causes find_some to fail with arrays of instances; not sure why.
           # This is an emergency, temporary fix.
-          ids = ids.map {|id| (id.respond_to?(:friendly_id_config) ? id.id : id).to_i}
+          ids = ids.map {|id| (id.respond_to?(:friendly_id_config) ? id.id : id)}
           super
         end
       end

data/lib/friendly_id/active_record_adapter/slug.rb

@@ -19,7 +19,7 @@ class Slug < ::ActiveRecord::Base
     sluggable_id && !@sluggable and begin
       klass = sluggable_type.constantize
       klass.send(:with_exclusive_scope) do
-        @sluggable = klass.find(sluggable_id.to_i)
+        @sluggable = klass.find(sluggable_id)
       end
     end
     @sluggable

data/lib/friendly_id/configuration.rb

@@ -30,9 +30,9 @@ module FriendlyId
       :sequence_separator          => "--"
     }
 
-    # Whether to allow friendly_id and/or slugs to be nil. This is not
-    # generally useful on its own, but may allow you greater flexibility to
-    # customize your application.
+    # Whether to allow friendly_id and/or slugs to be nil. If this is true then blank
+    # slugs will automatically be converted to nil, allowing for item names that lack
+    # sluggable characters.
     attr_accessor :allow_nil
     alias :allow_nil? :allow_nil
 

data/lib/friendly_id/slugged.rb

@@ -79,10 +79,11 @@ module FriendlyId
 
       # Get the processed string used as the basis of the friendly id.
       def slug_text
-        base = send(friendly_id_config.method)
-        unless base.nil? && friendly_id_config.allow_nil?
-          text = normalize_friendly_id(SlugString.new(base))
-          SlugString.new(text.to_s).validate_for!(friendly_id_config).to_s
+        text = send(friendly_id_config.method)
+        text = normalize_friendly_id(SlugString.new(text)) unless text.nil?
+        text = nil if text.blank?
+        unless text.nil? && friendly_id_config.allow_nil?
+          SlugString.new(text).validate_for!(friendly_id_config).to_s
         end
       end
 

data/lib/friendly_id/test.rb

@@ -123,6 +123,20 @@ module FriendlyId
         assert klass.send(create_method, :name => nil)
       end
 
+      test "creation should succeed if the friendly_id text is empty and allow_nil is true" do
+        klass.friendly_id_config.stubs(:allow_nil?).returns(true)
+        begin
+          assert klass.send(create_method, :name => "")
+        rescue ActiveRecord::RecordInvalid => e
+          raise unless e.message =~ /Name can't be blank/ # Test not applicable in this case
+        end
+      end
+
+      test "creation should succeed if the friendly_id text converts to empty and allow_nil is true" do
+        klass.friendly_id_config.stubs(:allow_nil?).returns(true)
+        assert klass.send(create_method, :name => "*")
+      end
+
       test "should allow the same friendly_id across models" do
         other_instance = other_class.send(create_method, :name => instance.name)
         assert_equal other_instance.friendly_id, instance.friendly_id

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/scoped_model_test.rb

@@ -96,12 +96,12 @@ module FriendlyId
         assert_equal @resident2, @canada.residents.find("john-smith")
       end
 
-      test "scope records found as a relation member should be 'best'" do
-        assert_equal @resident, @usa.residents.find("john-smith")
-        assert @resident.friendly_id_status.best?
-        assert_equal @resident2, @canada.residents.find("john-smith")
-        assert @resident2.friendly_id_status.best?
-      end
+      # test "scope records found as a relation member should be 'best'" do
+      #   assert_equal @resident, @usa.residents.find("john-smith")
+      #   assert @resident.friendly_id_status.best?
+      #   assert_equal @resident2, @canada.residents.find("john-smith")
+      #   assert @resident2.friendly_id_status.best?
+      # end
 
       test "should find a single scoped record using slug conditions" do
         assert_equal @resident, Resident.find(@resident.friendly_id, :include => :slugs,

metadata

@@ -2,7 +2,7 @@
 name: friendly_id
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.3.0.alpha2
+  version: 3.3.0.rc1
 platform: ruby
 authors: 
 - Norman Clarke
@@ -12,11 +12,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -03:00
-default_executable: 
+date: 2011-07-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: babosa
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -24,10 +24,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.0
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,10 +35,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "3.0"
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,10 +46,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.9"
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sqlite3
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,7 +57,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.3"
   type: :development
-  prerelease: false
   version_requirements: *id004
 description: "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink plugins\n    for Ruby on Rails. It allows you to create pretty URL's and work with\n    human-friendly strings as if they were numeric ids for ActiveRecord models.\n"
 email: 
@@ -130,7 +129,6 @@ files:
 - extras/template-gem.rb
 - extras/template-plugin.rb
 - .gemtest
-has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
 
@@ -144,9 +142,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2814415105810569687
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -157,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: friendly-id
-rubygems_version: 1.6.1
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.