friendly_id 4.0.0.beta13 → 4.0.0.beta14

data/README.md

@@ -43,7 +43,7 @@ The current docs can always be found
 
     cd my_app
 
-    gem "friendly_id", "~> 4.0.0.beta12"
+    gem "friendly_id", "~> 4.0.0.beta14"
 
     rails generate scaffold user name:string slug:string
 

data/lib/friendly_id.rb

@@ -81,7 +81,7 @@ In general, use slugs by default unless you know for sure you don't need them.
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.0.beta13"
+  VERSION = "4.0.0.beta14"
 
   @mutex = Mutex.new
 

data/lib/friendly_id/finder_methods.rb

@@ -27,7 +27,7 @@ module FriendlyId
     #  person = Person.exists?(['name = ?', 'joe'])
     #
     # @see FriendlyId::ObjectUtils
-    def exists?(id = nil)
+    def exists?(id = false)
       return super if id.unfriendly_id?
       super @klass.friendly_id_config.query_field => id
     end

data/lib/friendly_id/history.rb

@@ -87,8 +87,8 @@ method.
       end
 
       # Search for a record in the slugs table using the specified slug.
-      def exists?(id = nil)
-        return super(id) if id.unfriendly_id?
+      def exists?(id = false)
+        return super if id.unfriendly_id?
         exists_without_friendly_id?(@klass.friendly_id_config.query_field => id) or
         with_old_friendly_id(id) {|x| exists_without_friendly_id?(x)} or
         exists_without_friendly_id?(id)

data/lib/friendly_id/object_utils.rb

@@ -27,9 +27,11 @@ module FriendlyId
     #   "123".friendly_id?                #=> nil
     #   "abc123".friendly_id?             #=> true
     def friendly_id?
-      unfriendly_classes = [ActiveRecord::Base, Array, Hash, NilClass, Numeric, Symbol]
       # Considered unfriendly if this is an instance of an unfriendly class or
       # one of its descendants.
+      unfriendly_classes = [ActiveRecord::Base, Array, Hash, NilClass, Numeric,
+                            Symbol, TrueClass, FalseClass]
+
       if unfriendly_classes.detect {|klass| self.class <= klass}
         false
       elsif respond_to?(:to_i) && to_i.to_s != to_s

data/test/slugged_test.rb

@@ -44,18 +44,20 @@ class SluggedTest < MiniTest::Unit::TestCase
 
   test "should not break validates_uniqueness_of" do
     model_class = Class.new(ActiveRecord::Base) do
-      self.table_name = "articles"
+      self.table_name = "journalists"
       extend FriendlyId
       friendly_id :name, :use => :slugged
-      validates_uniqueness_of :name
+      validates_uniqueness_of :slug_en
       def self.name
-        "Article"
+        "Journalist"
       end
     end
-    instance = model_class.create :name => "hello"
-    instance2 = model_class.create :name => "hello"
-    assert instance.valid?
-    refute instance2.valid?
+    transaction do
+      instance = model_class.create! :name => "hello", :slug_en => "hello"
+      instance2 = model_class.create :name => "hello", :slug_en => "hello"
+      assert instance.valid?
+      refute instance2.valid?
+    end
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta13
+  version: 4.0.0.beta14
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70219708818280 !ruby/object:Gem::Requirement
+  requirement: &70302852816780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70219708818280
+  version_requirements: *70302852816780
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70219708817420 !ruby/object:Gem::Requirement
+  requirement: &70302852816240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70219708817420
+  version_requirements: *70302852816240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70219708816820 !ruby/object:Gem::Requirement
+  requirement: &70302852815740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70219708816820
+  version_requirements: *70302852815740
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70219708815960 !ruby/object:Gem::Requirement
+  requirement: &70302852815220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70219708815960
+  version_requirements: *70302852815220
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70219708804840 !ruby/object:Gem::Requirement
+  requirement: &70302852814740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70219708804840
+  version_requirements: *70302852814740
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70219708804320 !ruby/object:Gem::Requirement
+  requirement: &70302852814280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70219708804320
+  version_requirements: *70302852814280
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70219708803840 !ruby/object:Gem::Requirement
+  requirement: &70302852813800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70219708803840
+  version_requirements: *70302852813800
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70219708803380 !ruby/object:Gem::Requirement
+  requirement: &70302852813340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70219708803380
+  version_requirements: *70302852813340
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70219708802920 !ruby/object:Gem::Requirement
+  requirement: &70302852812880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70219708802920
+  version_requirements: *70302852812880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70219708802520 !ruby/object:Gem::Requirement
+  requirement: &70302852812460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219708802520
+  version_requirements: *70302852812460
 description: ! 'FriendlyId is the "Swiss Army bulldozer" of slugging and permalink
   plugins for