friendly_id 5.0.0.rc2 → 5.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b8e4a5f27bb5857aa5761f04a7300d96df81078
-  data.tar.gz: 85674fed68afdc2ba0122cff6edb0424eeb3dcaa
+  metadata.gz: 2cc160c133d04de411d380863dcb8f5f6bf3d3eb
+  data.tar.gz: 69989b70207313b3895dcb250dd28b9a5dd52503
 SHA512:
-  metadata.gz: 39e09066a6e62b4243e19f53c8640e15bfb05ed0c70fd4dbbfdfaf3cbb8aab162392e875ec79545e460ecdb716d2f8fd007c97a356963ccde9852b273216828c
-  data.tar.gz: c1b52cbedd571df3644ce78a94b22df6a747b9b22d5d40bede443dcedd9f69c7ad6771f18e3183b1761f6ace0d512590767c349bafe75f9d5c209c537777cd7c
+  metadata.gz: 1de2c9b0aa51dca261d977bc4004d0f1d64e6f5f304e8e575ae2dc2c3e1fa1c24b780548729bd39685243f8190fa7fcf46de328f2d421b699c9e7fff75994d08
+  data.tar.gz: e5d920ae4b3eed5a1d93c747dc1d1ef5ff91e930cb85d93b22197bcbc1274c43d4f882b3f57d91c7afc11186e737eac8183643fbc9e31a6c10eb3ca5243202b2

data/.travis.yml

@@ -1,15 +1,13 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 1.9.3
-#  - jruby-19mode
-#  - rbx-19mode
 env:
   - DB=postgres
   - DB=mysql
   - DB=sqlite3
 gemfile:
   - gemfiles/Gemfile.rails-4.0.rb
+  - gemfiles/Gemfile.rails-stable.rb
 
 before_script: 'bundle exec rake db:create db:up'
 script: 'bundle exec rake test'

data/Changelog.md

@@ -3,6 +3,19 @@
 We would like to think our many {file:Contributors contributors} for
 suggestions, ideas and improvements to FriendlyId.
 
+## 5.0.0.rc.3 (2013-10-04)
+
+* Support friendly finds on associations in Rails 4.0.1 and up. They will
+  currently work on Rails 4.0 associations only if `:inverse_of` is not used.
+  In Rails 4-0-stable, associations have been modified to use a special
+  relation class, giving FriendlyId a consistent extension point. Since the
+  behavior in 4.0.0 is considered defective and fixed in 4-0-stable, FriendlyId
+  5.0 will not support friendly finds on inverse relelations in 4.0.0. For a
+  reliable workaround, use the `friendly` scope for friendly finds on
+  associations; this works on all Rails 4.0.x versions and will continue to be
+  supported.
+* Documentation fixes.
+
 ## 5.0.0.rc2 (2013-09-29)
 
 * When the :finders addon has been included, use it in FriendlyId's internal

data/bench.rb

@@ -27,8 +27,7 @@ end
 
 class Restaurant < ActiveRecord::Base
   extend FriendlyId
-  relation.class.send(:include, FriendlyId::FinderMethods)
-  friendly_id :name
+  friendly_id :name, :use => :finders
 end
 
 
@@ -56,7 +55,7 @@ Benchmark.bmbm do |x|
     N.times {Journalist.friendly.find JOURNALISTS.rand}
   end
 
-  x.report 'find (in-table slug; included FinderMethods)' do
+  x.report 'find (in-table slug; using finders module)' do
     N.times {Restaurant.find RESTAURANTS.rand}
   end
 
@@ -72,7 +71,7 @@ Benchmark.bmbm do |x|
     N.times {transaction {Journalist.create :name => Faker::Name.name}}
   end
 
-  x.report 'insert (in-table-slug; included FinderMethods)' do
+  x.report 'insert (in-table-slug; using finders module)' do
     N.times {transaction {Restaurant.create :name => Faker::Name.name}}
   end
 

data/gemfiles/Gemfile.rails-stable.rb

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'rails', github: 'rails/rails', branch: '4-0-stable' do
+  gem 'activerecord'
+  gem 'railties'
+end
+
+# Database Configuration
+group :development, :test do
+  platforms :jruby do
+    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta2'
+    gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0.beta2'
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0.beta2'
+    gem 'jruby-openssl'
+  end
+
+  platforms :ruby do
+    gem 'sqlite3'
+    gem 'mysql2'
+    gem 'pg'
+  end
+end

data/lib/friendly_id/base.rb

@@ -203,7 +203,7 @@ often better and easier to use {FriendlyId::Slugged slugs}.
       # and maintainability. If you'd like to improve the performance, your
       # efforts would be best directed at improving it at the root cause
       # of the problem - in Rails - because it would benefit more people.
-      all.extending(FinderMethods)
+      all.extending(friendly_id_config.finder_methods)
     end
 
     # Returns the model class's {FriendlyId::Configuration friendly_id_config}.

data/lib/friendly_id/configuration.rb

@@ -15,10 +15,14 @@ module FriendlyId
     # @return ActiveRecord::Base
     attr_accessor :model_class
 
+    # The module to use for finders
+    attr_accessor :finder_methods
+
     def initialize(model_class, values = nil)
-      @model_class = model_class
-      @defaults    = {}
-      @modules     = []
+      @model_class    = model_class
+      @defaults       = {}
+      @modules        = []
+      @finder_methods = FriendlyId::FinderMethods
       set values
     end
 

data/lib/friendly_id/finders.rb

@@ -52,10 +52,16 @@ in your controllers to use the `friendly` scope. For example:
 =end
   module Finders
     def self.included(model_class)
-      model_class.send(:relation).class.send(:include, FriendlyId::FinderMethods)
+      model_class.instance_eval do
+        relation.class.send(:include, friendly_id_config.finder_methods)
+      end
 
-      if model_class.friendly_id_config.uses? :history
-        model_class.send(:relation).class.send(:include, FriendlyId::History::HistoryFinderMethods)
+      # Support for friendly finds on associations for Rails 4.0.1 and above.
+      # As of 1 October 2013 this works on Rails 4-0-stable, but may change.
+      if ::ActiveRecord.const_defined?('AssociationRelation')
+        assocation_relation_class_name = :"ActiveRecord_AssociationRelation_#{model_class.to_s.gsub('::', '_')}"
+        association_relation_class = ::ActiveRecord::AssociationRelation.const_get(assocation_relation_class_name)
+        association_relation_class.send(:include, model_class.friendly_id_config.finder_methods)
       end
     end
   end

data/lib/friendly_id/history.rb

@@ -55,7 +55,13 @@ method.
   module History
 
     def self.setup(model_class)
-      model_class.friendly_id_config.use :slugged
+      model_class.instance_eval do
+        friendly_id_config.use :slugged
+        friendly_id_config.finder_methods = FriendlyId::History::FinderMethods
+        if friendly_id_config.uses? :finders
+          relation.class.send(:include, friendly_id_config.finder_methods)
+        end
+      end
     end
 
     # Configures the model instance to use the History add-on.
@@ -67,20 +73,12 @@ method.
           :class_name => Slug.to_s
         }
 
-        if model_class.friendly_id_config.uses? :finders
-          model_class.send(:relation).class.send(:include, HistoryFinderMethods)
-        end
-
         after_save :create_slug
-
-        def self.friendly
-          all.extending(HistoryFinderMethods)
-        end
       end
     end
 
-    module HistoryFinderMethods
-      include FinderMethods
+    module FinderMethods
+      include ::FriendlyId::FinderMethods
 
       def exists_by_friendly_id?(id)
         joins(:slugs).where(arel_table[friendly_id_config.query_field].eq(id).or(slug_history_clause(id))).exists?
@@ -89,7 +87,7 @@ method.
       private
 
       def first_by_friendly_id(id)
-        joins(:slugs).where(slug_history_clause(id)).readonly(false).first
+        select(quoted_table_name + '.*').joins(:slugs).where(slug_history_clause(id)).first
       end
 
       def slug_history_clause(id)

data/lib/friendly_id/scoped.rb

@@ -69,7 +69,7 @@ relation:
 
 Alternatively, you could pass the scope value as a query parameter:
 
-    Restaurant.friendly.find("joes-diner").where(:city_id => @city.id)
+    Restaurant.where(:city_id => @city.id).friendly.find("joes-diner")
 
 
 ### Finding All Records That Match a Scoped ID

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.0.0.rc2"
+  VERSION = "5.0.0.rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc2
+  version: 5.0.0.rc3
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -161,6 +161,7 @@ files:
 - bench.rb
 - friendly_id.gemspec
 - gemfiles/Gemfile.rails-4.0.rb
+- gemfiles/Gemfile.rails-stable.rb
 - guide.rb
 - lib/friendly_id.rb
 - lib/friendly_id/.gitattributes