friendly_id 3.0.0.beta2 → 3.0.0.beta3

data/lib/friendly_id/railtie.rb

@@ -4,11 +4,7 @@ module FriendlyId
     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
+        require "friendly_id/sequel"
       else
         # Only Sequel and ActiveRecord are currently supported; AR is the default.
         # Want Datamapper support? http://github.com/norman/friendly_id/issues#issue/24
@@ -19,5 +15,6 @@ module FriendlyId
     rake_tasks do
       load "tasks/friendly_id.rake"
     end
+
   end
 end

data/lib/friendly_id/sequel.rb

@@ -0,0 +1,5 @@
+begin
+  require "friendly_id_sequel"
+rescue LoadError
+  raise "To use FriendlyId's Sequel adapter, please `gem install friendly_id_sequel`"
+end

data/lib/friendly_id/test.rb

@@ -172,9 +172,10 @@ module FriendlyId
 
       test "should remain findable by previous slugs" do
         old_friendly_id = instance.friendly_id
-        instance.update_attributes :name => "#{old_friendly_id} updated"
+        instance.name = "#{old_friendly_id} updated"
+        instance.send(save_method)
         assert_not_equal old_friendly_id, instance.friendly_id
-        assert_equal instance, klass.find(old_friendly_id)
+        assert_equal instance, klass.send(find_method, old_friendly_id)
       end
 
       test "should not create a slug when allow_nil is true and friendy_id text is blank" do

data/lib/friendly_id/version.rb

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

data/lib/friendly_id.rb

@@ -1,4 +1,5 @@
 require "active_support/core_ext/class/attribute_accessors"
+require "active_support/core_ext/object/blank"
 
 require File.join(File.dirname(__FILE__), "friendly_id", "slug_string")
 require File.join(File.dirname(__FILE__), "friendly_id", "configuration")

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta2
-  version: 3.0.0.beta2
+  - beta3
+  version: 3.0.0.beta3
 platform: ruby
 authors: 
 - Norman Clarke
@@ -68,6 +68,7 @@ files:
 - lib/friendly_id/configuration.rb
 - lib/friendly_id/finders.rb
 - lib/friendly_id/railtie.rb
+- lib/friendly_id/sequel.rb
 - lib/friendly_id/slug_string.rb
 - lib/friendly_id/slugged.rb
 - lib/friendly_id/status.rb