friendly_id 3.1.7.pre → 3.1.7

data/Changelog.md

@@ -6,7 +6,7 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
-## 3.1.7 (NOT RELEASED YET)
+## 3.1.7 (2010-09-22)
 
 * Reserved words can now be regular expressions.
 * Fix broken SQL when finding with a nil scope on AR3 (Tony Primerano)

data/Guide.md

@@ -517,6 +517,14 @@ slugs older than 45 days.
 
 # Misc tips
 
+## Allowing Users to Override/Control Slugs
+
+Would you like to mostly use default slugs, but allow the option of a
+custom user-chosen slug in your application? If so, then you're not the first to
+want this. Here's a [demo
+application](http://github.com/norman/friendly_id_manual_slug_demo) showing how
+it can be done.
+
 ## Default Scopes
 
 Whether you're using FriendlyId or not, a good rule of thumb for default scopes

data/Rakefile

@@ -41,6 +41,7 @@ namespace :test do
   Rake::TestTask.new(:friendly_id) { |t| t.pattern = "test/*_test.rb" }
   Rake::TestTask.new(:ar) { |t| t.pattern = "test/active_record_adapter/*_test.rb" }
 
+  desc "Test against lots of versions"
   task :pre_release do
     ["ree-1.8.7-2010.02", "ruby-1.9.2-p0"].each do |ruby|
       ["sqlite3", "mysql", "postgres"].each do |driver|

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/scoped_model_test.rb

@@ -12,6 +12,7 @@ module FriendlyId
         @canada    = Country.create!(:name => "Canada")
         @resident  = Resident.create!(:name => "John Smith", :country => @usa)
         @resident2 = Resident.create!(:name => "John Smith", :country => @canada)
+        @resident3 = Resident.create!(:name => "Jim Beam", :country => @canada)
         @owner     = Company.create!(:name => "Acme Events")
         @site      = Site.create!(:name => "Downtown Venue", :owner => @owner)
       end
@@ -75,7 +76,9 @@ module FriendlyId
       end
 
       test "should find all scoped records without scope" do
-        assert_equal 2, Resident.find(:all, @resident.friendly_id).size
+        name, sequence = @resident.friendly_id.parse_friendly_id
+        assert_equal 2, Resident.find(:all, :joins => :slugs, :conditions => {
+            :slugs => {:name => name, :sequence => sequence}}).size
       end
 
       test "should find a single scoped record with a scope as a string" do

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  hash: 961916000
-  prerelease: true
+  prerelease: false
   segments: 
   - 3
   - 1
   - 7
-  - pre
-  version: 3.1.7.pre
+  version: 3.1.7
 platform: ruby
 authors: 
 - Norman Clarke
@@ -18,25 +16,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -03:00
+date: 2010-09-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: babosa
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 2
         - 0
         version: 0.2.0
-  requirement: *id001
+  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"
 email: 
 - norman@njclarke.com
@@ -120,21 +117,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1691512069096853799
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: -1691512069096853799
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: friendly-id