friendly_id 3.3.0.alpha1 → 3.3.0.alpha2

data/Changelog.md

@@ -10,6 +10,9 @@ suggestions, ideas and improvements to FriendlyId.
 
 * 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))
+* Rake task fix for models with primary keys not named "id" ([Danny Hawkins](https://github.com/danhawkins))
+
 
 ## 3.2.1 (2011-02-03)
 

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -46,8 +46,9 @@ module FriendlyId
       # Build the new slug using the generated friendly id.
       def build_a_slug
         return unless new_slug_needed?
-        self.slug = slugs.build(:name => slug_text.to_s, :scope => friendly_id_config.scope_for(self), :sluggable => self)
-        @new_friendly_id = slug.to_friendly_id
+        self.slug = slugs.build :name => slug_text.to_s, :scope => friendly_id_config.scope_for(self),
+          :sluggable => self
+        @new_friendly_id = self.slug.to_friendly_id
       end
 
       # Reset the cached friendly_id?
@@ -107,4 +108,4 @@ module FriendlyId
       end
     end
   end
-end
+end

data/lib/friendly_id/active_record_adapter/tasks.rb

@@ -30,7 +30,7 @@ module FriendlyId
         :include => :slug,
         :limit   => (ENV["LIMIT"] || 100).to_i,
         :offset  => 0,
-        :order   => ENV["ORDER"] || "#{klass.table_name}.id ASC",
+        :order   => ENV["ORDER"] || "#{klass.table_name}.#{klass.primary_key} ASC",
       }.merge(task_options || {})
 
       while records = find(:all, options) do

data/lib/friendly_id/version.rb

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

data/lib/generators/friendly_id_generator.rb

@@ -5,12 +5,12 @@ class FriendlyIdGenerator < Rails::Generators::Base
 
   include Rails::Generators::Migration
 
-  MIGRATIONS_FILE = File.join(File.dirname(__FILE__), "..", "..", "generators", "friendly_id", "templates", "create_slugs.rb")
+  source_root File.expand_path('../../../generators/friendly_id/templates', __FILE__)
 
   class_option :"skip-migration", :type => :boolean, :desc => "Don't generate a migration for the slugs table"
 
   def copy_files(*args)
-    migration_template MIGRATIONS_FILE, "db/migrate/create_slugs.rb" unless options["skip-migration"]
+    migration_template 'create_slugs.rb', "db/migrate/create_slugs.rb" unless options["skip-migration"]
   end
 
   # Taken from ActiveRecord's migration generator

metadata

@@ -2,7 +2,7 @@
 name: friendly_id
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.3.0.alpha1
+  version: 3.3.0.alpha2
 platform: ruby
 authors: 
 - Norman Clarke
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 -03:00
+date: 2011-05-31 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1894634640096086793
+      hash: -2814415105810569687
       segments: 
       - 0
       version: "0"