friendly_id 5.0.0.alpha.1 → 5.0.0.beta1

data/lib/friendly_id/version.rb

@@ -1,3 +1,3 @@
 module FriendlyId
-  VERSION = "5.0.0.alpha.1"
-end
+  VERSION = "5.0.0.beta1"
+end

data/test/shared.rb

@@ -101,6 +101,14 @@ module FriendlyId
           with_instance_of(model_class) {|record| assert model_class.friendly.find record.id.to_s}
         end
 
+        test "should treat numeric part of string as an integer id" do
+          with_instance_of(model_class) do |record|
+            assert_raises(ActiveRecord::RecordNotFound) do
+              model_class.friendly.find "#{record.id}-foo"
+            end
+          end
+        end
+
         test "should be findable by numeric friendly_id" do
           with_instance_of(model_class, :name => "206") {|record| assert model_class.friendly.find record.friendly_id}
         end

data/test/slugged_test.rb

@@ -224,7 +224,7 @@ class UnderscoreAsSequenceSeparatorRegressionTest < MiniTest::Unit::TestCase
 
 end
 
-# https://github.com/FriendlyId/friendly_id/issues/148
+# https://github.com/norman/friendly_id/issues/148
 class FailedValidationAfterUpdateRegressionTest < MiniTest::Unit::TestCase
   include FriendlyId::Test
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha.1
+  version: 5.0.0.beta1
 platform: ruby
 authors:
 - Norman Clarke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -123,6 +123,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for
   Ruby on Rails. It allows you to create pretty URLs and work with human-friendly
@@ -138,13 +152,13 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CONTRIBUTING.md
 - Changelog.md
 - Gemfile
-- Guide.rdoc
+- Guide.md
 - MIT-LICENSE
 - README.md
 - Rakefile
-- WhatsNew.md
 - bench.rb
 - friendly_id.gemspec
 - gemfiles/Gemfile.rails-4.0.rb
@@ -153,12 +167,12 @@ files:
 - lib/friendly_id/base.rb
 - lib/friendly_id/candidates.rb
 - lib/friendly_id/configuration.rb
+- lib/friendly_id/finders.rb
 - lib/friendly_id/history.rb
 - lib/friendly_id/migration.rb
 - lib/friendly_id/object_utils.rb
 - lib/friendly_id/reserved.rb
 - lib/friendly_id/scoped.rb
-- lib/friendly_id/scopes.rb
 - lib/friendly_id/simple_i18n.rb
 - lib/friendly_id/slug.rb
 - lib/friendly_id/slug_generator.rb

data/WhatsNew.md

@@ -1,3 +0,0 @@
-# What's New in FriendlyId 5?
-
-## Write me

data/lib/friendly_id/scopes.rb

@@ -1,28 +0,0 @@
-module FriendlyId
-  module Scopes
-
-    def self.extended(model_class)
-      model_class.scope :friendly, ->{model_class.all} do
-        def find(*args)
-          id = args.first
-          return super if args.count != 1 || id.unfriendly_id?
-          find_by_friendly_id(id) or super
-        end
-
-        def exists?(conditions = :none)
-          return super if conditions.unfriendly_id? || conditions.unfriendly_id?.nil?
-          exists_by_friendly_id?(conditions)
-        end
-      end
-    end
-
-    def find_by_friendly_id(id)
-      where(friendly_id_config.query_field => id).first
-    end
-
-    def exists_by_friendly_id?(id)
-      where(friendly_id_config.query_field => id).exists?
-    end
-
-  end
-end