friendly_id 3.3.0.rc2 → 3.3.0.1

data/Changelog.md

@@ -6,7 +6,7 @@ suggestions, ideas and improvements to FriendlyId.
 * Table of Contents
 {:toc}
 
-## 3.3.0 (NOT_RELEASED_YET)
+## 3.3.0 (2011-08-31)
 
 * Support for Active Record 2.3 dropped
 * Convert blank slugs to nil automatically ([Gabe da Silveira ](https://github.com/dasil003))

data/README.md

@@ -38,7 +38,6 @@ released by September, 2011.
 
 * [FriendlyId Guide](http://norman.github.com/friendly_id/file.Guide.html)
 * [API Docs](http://norman.github.com/friendly_id)
-* [Google Group](http://groups.google.com/group/friendly_id)
 * [Source Code](http://github.com/norman/friendly_id/)
 * [Issue Tracker](http://github.com/norman/friendly_id/issues)
 

data/lib/friendly_id/active_record_adapter/relation.rb

@@ -124,8 +124,8 @@ module FriendlyId
           if result.size == expected_size
             result
           else
-            conditions = arel.send(:where_clauses).join(', ')
-            conditions = " [WHERE #{conditions}]" if conditions.present?
+            conditions = arel.where_sql
+            conditions = " [#{conditions}]" if conditions
             error = "Couldn't find all #{klass.name.pluralize} with IDs "
             error << "(#{ids.join(", ")})#{conditions} (found #{result.size} results, but was looking for #{expected_size})"
             raise ActiveRecord::RecordNotFound, error
@@ -141,14 +141,6 @@ 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)

data/lib/friendly_id/active_record_adapter/slugged_model.rb

@@ -98,7 +98,7 @@ module FriendlyId
       end
 
       # This method was removed in ActiveRecord 3.0.
-      if !ActiveRecord::Base.private_method_defined? :update_without_callbacks
+      if !::ActiveRecord::Base.private_method_defined? :update_without_callbacks
         def update_without_callbacks
           attributes_with_values = arel_attributes_values(false, false, attribute_names)
           return false if attributes_with_values.empty?

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/scoped_model_test.rb

@@ -26,12 +26,6 @@ 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)

data/test/compatibility/ancestry/Gemfile.lock

@@ -0,0 +1,34 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.10)
+    ancestry (1.2.4)
+      activerecord (>= 2.2.2)
+    arel (2.0.10)
+    builder (2.1.2)
+    i18n (0.5.0)
+    minitest (2.4.0)
+    mocha (0.9.12)
+    rake (0.9.2)
+    sqlite3 (1.3.4)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 3.0.10)
+  ancestry
+  minitest (~> 2.4.0)
+  mocha (~> 0.9.12)
+  rake
+  sqlite3 (~> 1.3.4)

metadata

@@ -1,75 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: friendly_id
-version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 3.3.0.rc2
+version: !ruby/object:Gem::Version
+  version: 3.3.0.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Norman Clarke
 - Adrian Mugnolo
 - Emilio Tagua
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-31 00:00:00.000000000 -03:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70155981374180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70155981374180
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70155981373480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70155981373480
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70155981372860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70155981372860
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70155981372000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
   prerelease: false
-  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: 
+  version_requirements: *70155981372000
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70155981371220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *70155981371220
+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
 - miloops@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/friendly_id/active_record.rb
 - lib/friendly_id/active_record_adapter/configuration.rb
 - lib/friendly_id/active_record_adapter/relation.rb
@@ -119,6 +129,7 @@ files:
 - test/active_record_adapter/support/database.sqlite3.yml
 - test/active_record_adapter/support/models.rb
 - test/active_record_adapter/tasks_test.rb
+- test/compatibility/ancestry/Gemfile.lock
 - test/friendly_id_test.rb
 - test/test_helper.rb
 - extras/bench.rb
@@ -128,37 +139,37 @@ files:
 - extras/template-gem.rb
 - extras/template-plugin.rb
 - .gemtest
+has_rdoc: true
 homepage: http://norman.github.com/friendly_id
 licenses: []
-
-post_install_message: "    FriendlyId 3.3.x is now in long-term maintanence. For new projects with\n    Rails 3.1.x please consider using 4.0, which is under active development:\n\n    https://github.com/norman/friendly_id/tree/4.0.0\n"
+post_install_message: ! "    FriendlyId 3.3.x is now in long-term maintanence. For
+  new projects with\n    Rails 3.1.x please consider using 4.0, which is under active
+  development:\n\n    https://github.com/norman/friendly_id\n"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1068692454411674602
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -124065484793691993
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: friendly-id
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A comprehensive slugging and pretty-URL plugin.
-test_files: 
+test_files:
 - test/active_record_adapter/basic_slugged_model_test.rb
 - test/active_record_adapter/cached_slug_test.rb
 - test/active_record_adapter/custom_normalizer_test.rb