friendly_id 2.0.1 → 2.0.2

data/test/test_helper.rb

@@ -1,35 +1,33 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-$VERBOSE = false
-
-ENV['RAILS_ENV'] = 'test'
-require File.dirname(__FILE__) + '/rails/2.x/config/environment.rb'
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-
+$:.unshift(File.dirname(__FILE__))
+$VERBOSE=false
+require 'rubygems'
 require 'test/unit'
-require 'active_record/fixtures'
-require 'action_controller/test_process'
-require 'sqlite3'
-require 'friendly_id/slug'
-
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.establish_connection
-
-silence_stream(STDOUT) do
-  load(File.dirname(__FILE__) + "/schema.rb")
+require 'shoulda'
+# You can use "rake test AR_VERSION=2.0.5" to test against 2.0.5, for example.
+# The default is to use the latest installed ActiveRecord.
+if ENV["AR_VERSION"]
+  gem 'activerecord', "#{ENV["AR_VERSION"]}"
 end
+require 'active_record'
 
-Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures"
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+require 'friendly_id'
+require 'models/post'
+require 'models/person'
+require 'models/user'
+require 'models/country'
 
-class Test::Unit::TestCase #:nodoc:
-  include ActionController::TestProcess
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
+# Borrowed from ActiveSupport
+def silence_stream(stream)
+  old_stream = stream.dup
+  stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+  stream.sync = true
+  yield
+ensure
+  stream.reopen(old_stream)
 end
+
+ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
+silence_stream(STDOUT) do
+  load(File.dirname(__FILE__) + "/schema.rb")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Norman Clarke
@@ -32,7 +32,7 @@ cert_chain:
   h7fbBRfStxI=
   -----END CERTIFICATE-----
 
-date: 2009-01-19 00:00:00 -02:00
+date: 2009-02-09 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.1"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   type: :development
@@ -55,6 +65,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: Shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -65,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
-description: A comprehensive slugging and pretty-URL plugin for Ruby on Rails.
+description: A comprehensive slugging and pretty-URL plugin for ActiveRecord.
 email: 
 - norman@randomba.org
 - adrian@randomba.org
@@ -95,37 +125,24 @@ files:
 - lib/friendly_id/helpers.rb
 - lib/friendly_id/non_sluggable_class_methods.rb
 - lib/friendly_id/non_sluggable_instance_methods.rb
-- lib/friendly_id/shoulda_macros.rb
 - lib/friendly_id/slug.rb
 - lib/friendly_id/sluggable_class_methods.rb
 - lib/friendly_id/sluggable_instance_methods.rb
 - lib/friendly_id/version.rb
 - lib/tasks/friendly_id.rake
 - lib/tasks/friendly_id.rb
-- test/database.yml
-- test/fixtures/countries.yml
-- test/fixtures/country.rb
-- test/fixtures/people.yml
-- test/fixtures/person.rb
-- test/fixtures/post.rb
-- test/fixtures/posts.yml
-- test/fixtures/slugs.yml
-- test/fixtures/user.rb
-- test/fixtures/users.yml
+- test/models/country.rb
+- test/models/person.rb
+- test/models/post.rb
+- test/models/user.rb
 - test/non_slugged_test.rb
-- test/rails/2.x/app/controllers/application.rb
-- test/rails/2.x/config/boot.rb
-- test/rails/2.x/config/database.yml
-- test/rails/2.x/config/environment.rb
-- test/rails/2.x/config/environments/test.rb
-- test/rails/2.x/config/routes.rb
 - test/schema.rb
 - test/scoped_model_test.rb
 - test/slug_test.rb
-- test/sluggable_test.rb
+- test/slugged_model_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://randomba.org
+homepage: http://friendly-id.rubyforge.org/
 post_install_message: 
 rdoc_options: 
 - --main
@@ -150,9 +167,9 @@ rubyforge_project: friendly-id
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: A comprehensive slugging and pretty-URL plugin for Ruby on Rails.
+summary: A comprehensive slugging and pretty-URL plugin for ActiveRecord.
 test_files: 
 - test/non_slugged_test.rb
 - test/scoped_model_test.rb
 - test/slug_test.rb
-- test/sluggable_test.rb
+- test/slugged_model_test.rb

metadata.gz.sig

@@ -1,2 +1 @@
-�A�����7
�P(d�
-Wj�H��zq�ɸiP�>g������,A��t�΍��z�7�v����SΆ\{�����S�Ɉ�_x�ﳷ��}*����v�0��]��)��?8��i��w�rJ!n- �_�$k6D���#������1d�����ʝ&��)�ۖ>ٱ���O#@\W��)��NAB�vWW�
+q��d7��r�Hf�C��G�\Nw{v��-��.7�l�t���6�D�[�<4����]�kr��3-Kx�iY�'��V6�&��8��ɐn�x�(5��x��>_���.q9*&SjO����`
=&�ibD�ϱ����1Ce"9���=��P!��"��LJ9Pa10��o�/��1w_�E�:^Dg(�����<&iM ve1���m�M""
b%\��,���6���jI��U"y�j�F@3.�~D_�,

data/lib/friendly_id/shoulda_macros.rb

@@ -1,36 +0,0 @@
-module FriendlyId
-
-  # A Shoulda[http://www.thoughtbot.com/projects/shoulda/] macros for testing
-  # models using FriendlyId.
-  module ShouldaMacros
-
-    # Ensure that a model is using FriendlyId.
-    def self.should_have_friendly_id(column, options = {})
-
-      options.assert_valid_keys(:use_slug)
-      klass = self.model_class
-
-      should "have friendly id for #{method}" do
-        assert_respond_to klass, :friendly_id_options,
-          "#{klass} does not respond to friendly_id_options"
-        assert_equal column, klass.friendly_id_options[:method]
-      end
-
-      if options[:use_slug]
-        should "include/extend friendly_id's sluggable modules" do
-          assert klass.extended_by.include?(FriendlyId::SluggableClassMethods),
-            "#{klass} does not extend FriendlyId::SluggableClassMethods"
-          assert klass.include?(FriendlyId::SluggableInstanceMethods),
-            "#{klass} not include FriendlyId::SluggableInstanceMethods"
-        end
-      else
-        should "include/extend friendly_id's non-sluggable modules" do
-          assert klass.extended_by.include?(FriendlyId::NonSluggableClassMethods),
-            "#{klass} does not extend FriendlyId::NonSluggableClassMethods"
-          assert klass.include?(FriendlyId::NonSluggableInstanceMethods),
-            "#{klass} not include FriendlyId::NonSluggableInstanceMethods"
-        end
-      end
-    end
-  end
-end

data/test/database.yml

@@ -1,3 +0,0 @@
-sqlite3:
-  adapter: sqlite3
-  database: ":memory:"

data/test/fixtures/countries.yml

@@ -1,4 +0,0 @@
-argentina:
-  name: Argentina
-usa:
-  name: USA

data/test/fixtures/people.yml

@@ -1,7 +0,0 @@
-john_smith:
-  name: John Smith
-  country: argentina
-
-john_smith2:
-  name: John Smith
-  country: usa

data/test/fixtures/post.rb

@@ -1,3 +0,0 @@
-class Post < ActiveRecord::Base
-  has_friendly_id :name, :use_slug => true, :reserved => ['new', 'edit']
-end

data/test/fixtures/posts.yml

@@ -1,23 +0,0 @@
-without_slug:
-  name: Without a slug
-  content: Content without a slug
-
-with_one_slug:
-  name: With one slug
-  content: Content with one slug
-
-with_two_slugs:
-  name: With two slugs
-  content: Content with two slugs
-
-common_title:
-  name: Common Title
-  content: A post with a very common title
-
-common_title2:
-  name: Common Title
-  content: A second post with a very common title
-
-john_smith:
-  name: John Smith
-  content: Should allow for identical slug names between sluggable types

data/test/fixtures/slugs.yml

@@ -1,53 +0,0 @@
-post_with_same_friendly_id_as_person:
-  name: john-smith
-  sluggable: john_smith (Post)
-
-person_with_same_friendly_id_as_post:
-  name: john-smith
-  sluggable: john_smith (Person)
-
-one:
-  name: with-one-slug
-  sluggable: with_one_slug
-  sluggable_type: Post
-  sequence: 1
-
-two_old:
-  name: with-two-slugs
-  sluggable: with_two_slugs (Post)
-  sequence: 1
-  
-two_new:
-  name: with-two-slugs-new
-  sluggable: with_two_slugs (Post)
-  sequence: 1
-
-common_title:
-  name: common-title
-  sluggable: common_title (Post)
-  sequence: 1
-
-common_title2:
-  name: common-title
-  sluggable: common_title2 (Post)
-  sequence: 2
-
-john_smith:
-  name: john-smith
-  sluggable: john_smith (Person)
-  sequence: 1
-  scope: argentina
-
-john_smith2:
-  name: john-smith
-  sluggable: john_smith2 (Person)
-  sequence: 1
-  scope: usa
-
-argentina:
-  name: argentina
-  sluggable: argentina (Country)
-    
-usa:
-  name: usa
-  sluggable: usa (Country)

data/test/fixtures/users.yml

@@ -1,7 +0,0 @@
-joe:
-  login: joe
-  email: joe@example.org
-
-jane:
-  login: jane
-  email: jane@example.org

data/test/rails/2.x/config/boot.rb

@@ -1,109 +0,0 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion rescue nil
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        require 'rubygems'
-        min_version = '1.3.1'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!