friendly_id 3.0.6 → 3.1.0.pre

data/lib/friendly_id/version.rb

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

data/test/active_record_adapter/ar_test_helper.rb

@@ -1,12 +1,15 @@
 require File.expand_path('../../test_helper', __FILE__)
-
 require "logger"
 require "active_record"
-require "active_support"
+begin
+  require "active_support/log_subscriber"
+rescue MissingSourceFile
+end
 
-# ActiveRecord::Base.logger = Logger.new($stdout)
+# If you want to see the ActiveRecord log, invoke the tests using `rake test LOG=true`
+ActiveRecord::Base.logger = Logger.new($stdout) if ENV["LOG"]
 
-require File.expand_path("../../../lib/friendly_id/active_record", __FILE__)
+require "friendly_id/active_record"
 require File.expand_path("../../../generators/friendly_id/templates/create_slugs", __FILE__)
 require File.expand_path("../support/models", __FILE__)
 require File.expand_path('../core', __FILE__)
@@ -58,6 +61,10 @@ class Person < ActiveRecord::Base
 
 end
 
+# A model that doesn't use FriendlyId
+class Unfriendly < ActiveRecord::Base
+end
+
 # A slugged model that uses a scope
 class Resident < ActiveRecord::Base
   belongs_to :country
@@ -71,7 +78,7 @@ class Country < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true
 end
 
-# A model that doesn"t use slugs
+# A model that doesn't use slugs
 class User < ActiveRecord::Base
   has_friendly_id :name
   has_many :houses
@@ -92,7 +99,8 @@ end
 # A model that uses default slug settings and has a named scope
 class Post < ActiveRecord::Base
   has_friendly_id :name, :use_slug => true
-  send FriendlyId::ActiveRecordAdapter::Compat.scope_method, :published, :conditions => { :published => true }
+  def self.named_scope(*args) scope(*args) end if FriendlyId.on_ar3?
+  named_scope :published, :conditions => { :published => true }
 end
 
 # Model that uses a custom table name

data/test/active_record_adapter/cached_slug_test.rb

@@ -54,6 +54,16 @@ module FriendlyId
           assert_match(/2\z/, instance_2.send(cache_column))
         end
 
+        test "#friendly_id should check the cached value by default" do
+          instance.expects(:slug).never
+          instance.friendly_id
+        end
+
+        test "#friendly_id should skip the cache if invoked with true" do
+          instance.expects(:slug)
+          instance.friendly_id(true)
+        end
+
       end
     end
   end

data/test/active_record_adapter/core.rb

@@ -30,6 +30,10 @@ module FriendlyId
           :save!
         end
 
+        def unfriendly_class
+          Unfriendly
+        end
+
         def validation_exceptions
           [ActiveRecord::RecordInvalid, FriendlyId::ReservedError, FriendlyId::BlankError]
         end
@@ -72,6 +76,12 @@ module FriendlyId
           assert_equal 2, klass.find([instance.friendly_id, second]).size
         end
 
+        test "should not raise error when finding with empty array" do
+          assert_nothing_raised do
+            klass.find []
+          end
+        end
+
         test "models should raise an error when not all records are found" do
           assert_raises(ActiveRecord::RecordNotFound) do
             klass.find([instance.friendly_id, 'bad-friendly-id'])
@@ -92,6 +102,11 @@ module FriendlyId
           end
         end
 
+        test "should not change failure behavior for models not using friendly_id" do
+          assert_raise ActiveRecord::RecordNotFound do
+            unfriendly_class.find(-1)
+          end
+        end
       end
     end
   end

data/test/active_record_adapter/slugged.rb

@@ -13,7 +13,6 @@ module FriendlyId
           assert_nothing_raised do
             klass.find(instance.friendly_id, :include => :slug)
           end
-
         end
 
         def klass

data/test/active_record_adapter/support/models.rb

@@ -87,6 +87,10 @@ class CreateSupportModels < ActiveRecord::Migration
     create_table :companies do |t|
       t.string :name
     end
+
+    create_table :unfriendlies do |t|
+      t.string :name
+    end
   end
 
   def self.down

data/test/active_record_adapter/tasks_test.rb

@@ -1,5 +1,5 @@
+require "friendly_id/active_record_adapter/tasks"
 require File.expand_path('../ar_test_helper', __FILE__)
-require File.expand_path('../../../lib/friendly_id/active_record_adapter/tasks', __FILE__)
 
 class TasksTest < Test::Unit::TestCase
 

data/test/friendly_id_test.rb

@@ -1,55 +1,51 @@
 require File.expand_path('../test_helper', __FILE__)
 
 module FriendlyId
-
   module Test
-
     class FriendlyIdTest < ::Test::Unit::TestCase
-
       test "should parse a friendly_id name and sequence" do
-        assert_equal ["test", "2"], "test--2".parse_friendly_id
+        assert_equal ["test", 2], "test--2".parse_friendly_id
       end
 
       test "should parse a friendly_id name and a double digit sequence" do
-        assert_equal ["test", "12"], "test--12".parse_friendly_id
+        assert_equal ["test", 12], "test--12".parse_friendly_id
       end
 
       test "should parse with a default sequence of 1" do
-        assert_equal ["test", "1"], "test".parse_friendly_id
+        assert_equal ["test", 1], "test".parse_friendly_id
       end
 
       test "should be parseable with a custom separator" do
-        assert_equal ["test", "2"], "test:2".parse_friendly_id(":")
+        assert_equal ["test", 2], "test:2".parse_friendly_id(":")
       end
 
       test "should be parseable with a custom separator and a double digit sequence" do
-        assert_equal ["test", "12"], "test:12".parse_friendly_id(":")
+        assert_equal ["test", 12], "test:12".parse_friendly_id(":")
       end
 
       test "should parse when default sequence separator occurs in friendly_id name" do
-        assert_equal ["test--test", "2"], "test--test--2".parse_friendly_id
+        assert_equal ["test--test", 2], "test--test--2".parse_friendly_id
       end
 
       test "should parse when custom sequence separator occurs in friendly_id name" do
-        assert_equal ["test:test", "2"], "test:test:2".parse_friendly_id(":")
+        assert_equal ["test:test", 2], "test:test:2".parse_friendly_id(":")
       end
 
       test "should parse when sequence separator and number occur in friendly_id name" do
-        assert_equal ["test--2--test", "1"], "test--2--test".parse_friendly_id
+        assert_equal ["test--2--test", 1], "test--2--test".parse_friendly_id
       end
 
       test "should parse when sequence separator, number and sequence occur in friendly_id name" do
-        assert_equal ["test--2--test", "2"], "test--2--test--2".parse_friendly_id
+        assert_equal ["test--2--test", 2], "test--2--test--2".parse_friendly_id
       end
 
       test "should parse when double digit sequence separator, number and sequence occur in friendly_id name" do
-        assert_equal ["test--2--test", "12"], "test--2--test--12".parse_friendly_id
+        assert_equal ["test--2--test", 12], "test--2--test--12".parse_friendly_id
       end
 
       test "should parse with a separator and no sequence" do
-        assert_equal ["test", "1"], "test--".parse_friendly_id
+        assert_equal ["test", 1], "test--".parse_friendly_id
       end
-
     end
   end
-end
+end

data/test/test_helper.rb

@@ -1,16 +1,15 @@
+$:.unshift File.expand_path("../lib", File.dirname(__FILE__))
+$:.unshift File.expand_path(File.dirname(__FILE__))
+$:.uniq!
+
 $KCODE = "UTF8" if RUBY_VERSION < "1.9"
 $VERBOSE = false
-begin
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  # Fall back on doing an unlocked resolve at runtime.
-  require "rubygems"
-  require "bundler"
-  Bundler.setup
-end
+require "rubygems"
+require "bundler"
+Bundler.setup
 require "test/unit"
 require "mocha"
 require "active_support"
 # require "ruby-debug"
-require File.expand_path("../../lib/friendly_id", __FILE__)
-require File.expand_path("../../lib/friendly_id/test", __FILE__)
+require "friendly_id"
+require "friendly_id/test"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_id
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 3
+  - 1
   - 0
-  - 6
-  version: 3.0.6
+  - pre
+  version: 3.1.0.pre
 platform: ruby
 authors: 
 - Norman Clarke
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -04:00
+date: 2010-07-15 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +30,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 2
-        version: "2.2"
+        - 3
+        version: "2.3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: babosa
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -42,9 +43,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 2
-        version: "2.2"
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
   type: :runtime
   version_requirements: *id002
 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"
@@ -62,12 +64,12 @@ files:
 - lib/friendly_id/active_record.rb
 - lib/friendly_id/active_record_adapter/configuration.rb
 - lib/friendly_id/active_record_adapter/finders.rb
+- lib/friendly_id/active_record_adapter/relation.rb
 - lib/friendly_id/active_record_adapter/simple_model.rb
 - lib/friendly_id/active_record_adapter/slug.rb
 - lib/friendly_id/active_record_adapter/slugged_model.rb
 - lib/friendly_id/active_record_adapter/tasks.rb
 - lib/friendly_id/configuration.rb
-- lib/friendly_id/finders.rb
 - lib/friendly_id/railtie.rb
 - lib/friendly_id/sequel.rb
 - lib/friendly_id/slug_string.rb
@@ -107,7 +109,6 @@ files:
 - test/active_record_adapter/support/models.rb
 - test/active_record_adapter/tasks_test.rb
 - test/friendly_id_test.rb
-- test/slug_string_test.rb
 - test/test_helper.rb
 - extras/bench.rb
 - extras/extras.rb
@@ -135,11 +136,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: friendly-id
@@ -160,4 +163,3 @@ test_files:
 - test/active_record_adapter/sti_test.rb
 - test/active_record_adapter/tasks_test.rb
 - test/friendly_id_test.rb
-- test/slug_string_test.rb

data/lib/friendly_id/finders.rb

@@ -1,109 +0,0 @@
-module FriendlyId
-
-  module Finders
-
-    module Base
-
-      extend Forwardable
-
-      def_delegators :model_class, :base_class, :friendly_id_config,
-        :primary_key, :quoted_table_name, :sanitize_sql, :table_name
-
-      # Is the id friendly or numeric? Not that the return value here is
-      # +false+ if the +id+ is definitely not friendly, and +nil+ if it can
-      # not be determined.
-      # The return value will be:
-      # * +true+ - if the id is definitely friendly (i.e., any string with non-numeric characters)
-      # * +false+ - if the id is definitely unfriendly (i.e., an Integer, a model instance, etc.)
-      # * +nil+ - if it can not be determined (i.e., a numeric string like "206".)
-      # @return [true, false, nil]
-      # @see #unfriendly?
-      def self.friendly?(id)
-        if id.is_a?(Integer) or id.is_a?(Symbol) or id.class.respond_to? :friendly_id_config
-          return false
-        elsif id.to_i.to_s != id.to_s
-          return true
-        else
-          return nil
-        end
-      end
-
-      # Is the id numeric?
-      # @return [true, false, nil] +true+ if definitely unfriendly, +false+ if
-      #   definitely friendly, else +nil+.
-      # @see #friendly?
-      def self.unfriendly?(id)
-        !friendly?(id) unless friendly?(id) == nil
-      end
-
-      def initialize(ids, model_class, options={})
-        self.ids = ids
-        self.options = options
-        self.model_class = model_class
-        self.scope = options.delete :scope
-      end
-
-      # An array of ids; can be both friendly and unfriendly.
-      attr_accessor :ids
-
-      # The ActiveRecord query options
-      attr_accessor :options
-
-      # The FriendlyId scope
-      attr_accessor :scope
-
-      # The model class being used to perform the query.
-      attr_accessor :model_class
-
-      # Perform the find.
-      def find
-        raise NotImplementedError
-      end
-
-      private
-
-      def ids=(ids)
-        @ids = [ids].flatten
-      end
-      alias :id= :ids=
-
-      def scope=(scope)
-        unless scope.nil?
-          @scope = scope.respond_to?(:to_param) ? scope.to_param : scope.to_s
-        end
-      end
-    end
-
-    module Single
-      # Is the id definitely friendly?
-      # @see Finder::friendly?
-      def friendly?
-        Base.friendly?(id)
-      end
-
-      # Is the id definitely unfriendly?
-      # @see Finder::unfriendly?
-      def unfriendly?
-        Base.unfriendly?(id)
-      end
-
-      private
-
-      # The id (numeric or friendly).
-      def id
-        ids[0]
-      end
-
-      # The slug name; i.e. if "my-title--2", then "my-title".
-      def name
-        id.to_s.parse_friendly_id(friendly_id_config.sequence_separator)[0]
-      end
-
-      # The slug sequence; i.e. if "my-title--2", then "2".
-      def sequence
-        id.to_s.parse_friendly_id(friendly_id_config.sequence_separator)[1]
-      end
-    end
-
-  end
-end