friendly_id 3.1.2 → 3.1.3

data/Changelog.md

@@ -6,6 +6,12 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
+## 3.1.3 (2010-08-11)
+
+* Reverted approach to read-only fix from previous release.
+  See [this commit](http://github.com/norman/friendly_id/commit/e263f74e446c1e4d95901e9e8d7d6713c078c38e)
+  for details.
+
 ## 3.1.2 (2010-08-11)
 
 * Fixed records being returned read-only. (Thanks Luis Lavena)

data/Rakefile

@@ -51,10 +51,11 @@ end
 
 task :pushdocs do
   branch = `git branch | grep "*"`.chomp.gsub("* ", "")
+  sh "git stash"
   sh "git checkout gh-pages"
-  sh "rm -rf FriendlyId ActiveRecord css js *.html"
   sh "cp -rp doc/* ."
   sh 'git commit -a -m "Regenerated docs"'
   sh "git push origin gh-pages"
   sh "git checkout #{branch}"
+  sh "git stash apply"
 end

data/lib/friendly_id/active_record_adapter/finders.rb

@@ -36,11 +36,12 @@ module FriendlyId
           parse_ids!
           scope = some_friendly_scope
           if use_slugs? && @friendly_ids.present?
-            scope = scope.scoped(:include => :slugs)
+            scope = scope.scoped(:joins => :slugs)
             if fc.scope?
               scope = scope.scoped(:conditions => {:slugs => {:scope => scope_val}})
             end
           end
+          options[:readonly] = false unless options[:readonly]
           @result = scope.all(options).uniq
           validate_expected_size!
           @result.each { |record| record.friendly_id_status.name = id }
@@ -62,8 +63,9 @@ module FriendlyId
 
         def find_one_using_slug
           name, seq = id.to_s.parse_friendly_id
-          scope = scoped(:include => :slugs, :conditions => {:slugs => {:name => name, :sequence => seq}})
+          scope = scoped(:joins => :slugs, :conditions => {:slugs => {:name => name, :sequence => seq}})
           scope = scope.scoped(:conditions => {:slugs => {:scope => scope_val}}) if fc.scope?
+          options[:readonly] = false unless options[:readonly]
           @result = scope.first(options)
           assign_status
         end

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/support/database.yml

@@ -0,0 +1,6 @@
+adapter: postgresql
+host: localhost
+port: 5432
+username: postgres
+database: friendly_id_test
+encoding: utf8

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - Norman Clarke
@@ -92,6 +92,7 @@ files:
 - test/active_record_adapter/support/database.mysql.yml
 - test/active_record_adapter/support/database.postgres.yml
 - test/active_record_adapter/support/database.sqlite3.yml
+- test/active_record_adapter/support/database.yml
 - test/active_record_adapter/support/models.rb
 - test/active_record_adapter/tasks_test.rb
 - test/friendly_id_test.rb