friendly_id 3.1.7 → 3.1.8

data/Changelog.md

@@ -6,6 +6,10 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.1.8 (2010-11-22)
+
+* Fix compatibility with Active Record 3.0.3.
+
 ## 3.1.7 (2010-09-22)
 
 * Reserved words can now be regular expressions.

data/Guide.md

@@ -447,7 +447,6 @@ the slug "joes-diner" if it's located in a different city:
 
     Restaurant.find("joes-diner", :scope => "seattle")  # returns 1 record
     Restaurant.find("joes-diner", :scope => "chicago")  # returns 1 record
-    Restaurant.find(:all, "joes-diner")                 # returns both records
 
 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
@@ -455,6 +454,14 @@ scope's text value will be the result of calling `to_param` on the related
 model record. In the example above, the city model also uses FriendlyId and so
 its `to_param` method returns its friendly_id: "chicago" or "seattle".
 
+If you want to find all records with a partular friendly\_id regardless of scope,
+this is a slightly more complicated, but doable:
+
+    name, sequence = params[:id].parse_friendly_id
+    Restaurant.find(:all, :joins => :slugs, :conditions => {
+      :slugs => {:name => name, :sequence => sequence}
+    })
+
 ### Updating a Relation's Scoped Slugs
 
 When using a relation as the scope, updating the relation will update the

data/Rakefile

@@ -1,5 +1,4 @@
 require "rubygems"
-require "bundler/setup"
 require "rake"
 require "rake/testtask"
 require "rake/gempackagetask"

data/lib/friendly_id/active_record_adapter/relation.rb

@@ -84,7 +84,7 @@ module FriendlyId
           return find_some_using_slug(friendly_ids, unfriendly_ids) if use_slugs_table
           column     = fc.cache_column || fc.column
           friendly   = arel_table[column].in(friendly_ids)
-          unfriendly = arel_table[relation.primary_key].in unfriendly_ids
+          unfriendly = arel_table[relation.primary_key.name].in unfriendly_ids
           if friendly_ids.present? && unfriendly_ids.present?
             where(friendly.or(unfriendly))
           else
@@ -94,7 +94,7 @@ module FriendlyId
 
         def find_some_using_slug(friendly_ids, unfriendly_ids)
           ids = [unfriendly_ids + sluggable_ids_for(friendly_ids)].flatten.uniq
-          where(arel_table[relation.primary_key].in(ids))
+          where(arel_table[relation.primary_key.name].in(ids))
         end
 
         def sluggable_ids_for(ids)
@@ -166,7 +166,12 @@ module FriendlyId
 
       def find_some(ids)
         return super unless klass.uses_friendly_id?
-        Find.new(self, ids).find_some or super
+        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}
+          super
+        end
       rescue ActiveRecord::RecordNotFound => error
         find ? find.raise_error(error) : raise(error)
       end

data/lib/friendly_id/version.rb

@@ -2,7 +2,7 @@ module FriendlyId
   module Version
     MAJOR = 3
     MINOR = 1
-    TINY = 7
+    TINY = 8
     BUILD = nil
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 7
-  version: 3.1.7
+  - 8
+  version: 3.1.8
 platform: ruby
 authors: 
 - Norman Clarke
@@ -16,11 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -03:00
+date: 2010-11-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: babosa
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,9 +33,50 @@ dependencies:
         - 0
         version: 0.2.0
   type: :runtime
-  prerelease: false
   version_requirements: *id001
-description: "    FriendlyId is the \"Swiss Army bulldozer\" of slugging and permalink plugins\n    for Ruby on Rails. It allows you to create pretty URL\xE2\x80\x99s and work with\n    human-friendly strings as if they were numeric ids for ActiveRecord models.\n"
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        version: "1"
+  type: :development
+  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: 
 - norman@njclarke.com
 - adrian@mugnolo.com
@@ -117,7 +159,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1691512069096853799
       segments: 
       - 0
       version: "0"
@@ -126,7 +167,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1691512069096853799
       segments: 
       - 0
       version: "0"