friendly_id 3.2.0.beta1 → 3.2.0.rc1

data/Changelog.md

@@ -8,8 +8,10 @@ suggestions, ideas and improvements to FriendlyId.
 
 ## 3.2.0 (NOT RELEASED YET)
 
+* Fixed deprecation on Rails edge. Thanks [slbug](http://github.com/slbug)
 * Removes `:scope` as a find parameter, allowing more flexible finds with
   scoped records.
+* Improve logic of `friendly_id:redo_slugs` to support models with non-numeric ids. (thanks Oleksandr Petrov)
 
 ## 3.1.8 (2010-11-22)
 

data/Guide.md

@@ -425,12 +425,16 @@ Note that this method is **not** used by slugged models.
 
 ## Scoped Slugs
 
+_Note that in FriendlyId prior to 3.2.0, you could specify a non-standard
+`:scope` argument on finds. This feature has been removed in 3.2.0 in favor of
+the query stategies described below._
+
 FriendlyId can generate unique slugs within a given scope. For example, assume
-you have an application that displays restaurants. Without scoped slugs, if
-two restaurants are named "Joe's Diner," the second one will end up with
-"joes-diner--2" as its friendly_id. Using scoped allows you to keep the
-slug names unique for each city, so that the second "Joe's Diner" could have
-the slug "joes-diner" if it's located in a different city:
+you have an application that displays restaurants. Without scoped slugs, if two
+restaurants are named "Joe's Diner," the second one will end up with
+"joes-diner--2" as its friendly_id. Using scoped allows you to keep the slug
+names unique for each city, so that the second "Joe's Diner" can also have the
+slug "joes-diner", as long as it's located in a different city:
 
     class Restaurant < ActiveRecord::Base
       belongs_to :city
@@ -442,11 +446,9 @@ the slug "joes-diner" if it's located in a different city:
       has_friendly_id :name, :use_slug => true
     end
 
-    http://example.org/cities/seattle/restaurants/joes-diner
-    http://example.org/cities/chicago/restaurants/joes-diner
+    City.find("seattle").restaurants.find("joes-diner")
+    City.find("chicago").restaurants.find("joes-diner")
 
-    City.find("seattle").restaurants.find("joes-diner")  # returns 1 record
-    City.find("chicago").restaurants.find("joes-diner")  # returns 1 record
 
 The value for the `:scope` key in your model can be a custom method you
 define, or the name of a relation. If it's the name of a relation, then the
@@ -456,6 +458,12 @@ its `to_param` method returns its friendly_id: "chicago" or "seattle".
 
 ### Complications with Scoped Slugs
 
+#### Scoped Models and Cached Slugs
+
+If you want to use cached slugs with scoped models, be sure not to create a unique index on the
+`cached_slug` column.
+
+
 #### Finding Records by friendly\_id
 
 If you are using scopes your friendly ids may not be unique, so a simple find like
@@ -475,12 +483,10 @@ either query as a relation, or specify the scope in your query conditions:
 
 #### Finding All Records That Match a Scoped ID
 
-If you want to find all records with a partular friendly\_id regardless of scope,
+If you want to find all records with a particular friendly\_id regardless of scope,
 the easiest way is to use cached slugs and query this column directly:
 
     Restaurant.find_all_by_cached_slug("joes-diner")
-    # Another option, with Active Record 3.x
-    Restaurant.where(:cached_slug => "joes-diner")
 
 
 If you're not using cached slugs, then this is slightly more complicated, but
@@ -494,38 +500,31 @@ still doable:
 
 #### Updating a Relation's Scoped Slugs
 
-When using a relation as the scope, updating the relation will update the
-slugs, but only if both models have specified the relationship. In the above
-example, updates to City will update the slugs for Restaurant because City
-specifies that it `has_many :restaurants`.
+When using a relation as the scope, updating the relation will update the slugs,
+but only if both models have specified the relationship. In the above example,
+updates to City will update the slugs for Restaurant because City specifies that
+it `has_many :restaurants`.
 
 ### Routes for Scoped Models
 
-Note that FriendlyId does not set up any routes for scoped models; you must
-do this yourself in your application. Here's an example of one way to set
-this up:
+Note that FriendlyId does not set up any routes for scoped models; you must do
+this yourself in your application. Here's an example of one way to set this up:
 
     # in routes.rb
-    map.resources :restaurants
-    map.restaurant "/restaurants/:city_id/:id", :controller => "restaurants"
+    resources :cities do
+      resources :restaurants
+    end
 
     # in views
-    link_to 'Show', restaurant_path(restaurant.city, restaurant)
+    <%= link_to 'Show', [@city, @restaurant] %>
 
     # in controllers
     @city = City.find(params[:city_id])
-    @restaurant = @city.resaturants.find(params[:id])
-
-### Scoped Models and Cached Slugs
-
-If you want to use cached slugs with scoped models, be sure not to create a unique index on the
-`cached_slug` column.
-
-### Scoped Models in FriendyId Before 3.2.0
+    @restaurant = @city.restaurants.find(params[:id])
 
-In older versions of FriendlyId, you could specify a non-standard `:scope`
-argument to finds. This feature has been removed in 3.2.0 in favor of the query
-stategies described above.
+    # URL's:
+    http://example.org/cities/seattle/restaurants/joes-diner
+    http://example.org/cities/chicago/restaurants/joes-diner
 
 
 ## FriendlyId Rake Tasks

data/lib/friendly_id/active_record.rb

@@ -10,8 +10,14 @@ module FriendlyId
     include FriendlyId::Base
 
     def has_friendly_id(method, options = {})
-      class_inheritable_accessor :friendly_id_config
-      write_inheritable_attribute :friendly_id_config, Configuration.new(self, method, options)
+      if FriendlyId.on_ar3?
+        class_attribute :friendly_id_config
+        self.friendly_id_config = Configuration.new(self, method, options)
+      else
+        class_inheritable_accessor :friendly_id_config
+        write_inheritable_attribute :friendly_id_config, Configuration.new(self, method, options)
+      end
+
       if friendly_id_config.use_slug?
         include SluggedModel
       else

data/lib/friendly_id/active_record_adapter/finders.rb

@@ -20,6 +20,10 @@ module FriendlyId
           @klass     = klass
           @id        = id
           @options   = options
+          if options[:scope]
+            raise "The :scope finder option has been removed from FriendlyId 3.2.0 " +
+              "https://github.com/norman/friendly_id/issues#issue/88"
+          end
         end
 
         def find_one

data/lib/friendly_id/active_record_adapter/relation.rb

@@ -133,6 +133,14 @@ module FriendlyId
         end
       end
 
+      def apply_finder_options(options)
+        if options[:scope]
+          raise "The :scope finder option has been removed from FriendlyId 3.2.0 " +
+            "https://github.com/norman/friendly_id/issues#issue/88"
+        end
+        super
+      end
+
       protected
 
       def find_one(id)
@@ -154,4 +162,4 @@ module FriendlyId
       end
     end
   end
-end
+end

data/lib/friendly_id/active_record_adapter/tasks.rb

@@ -26,15 +26,20 @@ module FriendlyId
 
     def make_slugs
       validate_uses_slugs
-      cond = "slugs.id IS NULL"
-      options = {:limit => 100, :include => :slugs, :conditions => cond, :order => "#{klass.table_name}.id ASC"}.merge(task_options || {})
+      options = {
+        :include => :slug,
+        :limit   => (ENV["LIMIT"] || 100).to_i,
+        :offset  => 0,
+        :order   => ENV["ORDER"] || "#{klass.table_name}.id ASC",
+      }.merge(task_options || {})
+
       while records = find(:all, options) do
         break if records.size == 0
         records.each do |record|
-          record.save(:validate => false)
+          record.save(:validate => false) unless record.slug?
           yield(record) if block_given?
         end
-        options[:conditions] = cond + " and #{klass.table_name}.id > #{records.last.id}"
+        options[:offset] += options[:limit]
       end
     end
 

data/lib/friendly_id/slug_string.rb

@@ -17,7 +17,7 @@ module FriendlyId
     # @raise FriendlyId::ReservedError
     def validate_for!(config)
       truncate_bytes!(config.max_length)
-      raise FriendlyId::BlankError if blank?
+      raise FriendlyId::BlankError if empty?
       raise FriendlyId::ReservedError if config.reserved?(self)
       self
     end

data/lib/friendly_id/version.rb

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

data/lib/tasks/friendly_id.rake

@@ -2,7 +2,7 @@ namespace :friendly_id do
   desc "Make slugs for a model."
   task :make_slugs => :environment do
     FriendlyId::TaskRunner.new.make_slugs do |record|
-      puts "%s(%d): friendly_id set to '%s'" % [record.class.to_s, record.id, record.slug.name] if record.slug
+      puts "#{record.class}(#{record.id}): friendly_id set to '#{record.slug.name}'" if record.slug
     end
   end
 
@@ -16,4 +16,4 @@ namespace :friendly_id do
   task :remove_old_slugs => :environment do
     FriendlyId::TaskRunner.new.delete_old_slugs
   end
-end
+end

data/test/active_record_adapter/scoped_model_test.rb

@@ -26,6 +26,12 @@ module FriendlyId
         Tourist.delete_all
       end
 
+      test "As of 3.2.0, should raise error if :scope option is passed" do
+        assert_raise(RuntimeError) do
+          Tourist.find("hello", :scope => "usa")
+        end
+      end
+
       test "should not use cached slug column with scopes" do
         @tourist  = Tourist.create!(:name => "John Smith", :country => @usa)
         @tourist2 = Tourist.create!(:name => "John Smith", :country => @canada)

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 2
   - 0
-  - beta1
-  version: 3.2.0.beta1
+  - rc1
+  version: 3.2.0.rc1
 platform: ruby
 authors: 
 - Norman Clarke
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 -03:00
+date: 2011-01-12 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2292774950521045189
+      hash: -1225128914130125951
       segments: 
       - 0
       version: "0"