friendly_id 4.1.0.beta.1 → 5.0.0.alpha.1

data/gemfiles/Gemfile.rails-3.0.rb

@@ -1,21 +0,0 @@
-source :rubygems
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-  gem 'jruby-openssl'
-end
-
-platforms :ruby do
-  gem 'sqlite3'
-  gem 'mysql2', '~> 0.2.0'
-  gem 'pg'
-end
-
-gem 'activerecord', '~> 3.0.0'
-gem 'railties', '~> 3.0.0'
-gem 'minitest', '3.2.0'
-gem 'mocha'
-gem 'rake'
-gem 'globalize3'

data/gemfiles/Gemfile.rails-3.1.rb

@@ -1,22 +0,0 @@
-source :rubygems
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-  gem 'jruby-openssl'
-end
-
-platforms :ruby do
-  gem 'sqlite3'
-  gem 'mysql2'
-  gem 'pg'
-end
-
-gem 'activerecord', '~> 3.1.0'
-gem 'railties', '~> 3.1.3'
-gem 'ffaker'
-gem 'minitest', '3.2.0'
-gem 'mocha'
-gem 'rake'
-gem 'globalize3'

data/gemfiles/Gemfile.rails-3.2.rb

@@ -1,22 +0,0 @@
-source :rubygems
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-  gem 'jruby-openssl'
-end
-
-platforms :ruby do
-  gem 'sqlite3'
-  gem 'mysql2'
-  gem 'pg'
-end
-
-gem 'ffaker'
-gem 'activerecord', '~> 3.2.0'
-gem 'railties', '~> 3.2.0'
-gem 'minitest', '3.2.0'
-gem 'mocha'
-gem 'rake'
-gem 'globalize3'

data/lib/friendly_id/finder_methods.rb

@@ -1,35 +0,0 @@
-module FriendlyId
-  # These methods will be added to the model's {FriendlyId::Base#relation_class relation_class}.
-  module FinderMethods
-
-    protected
-
-    # FriendlyId overrides this method to make it possible to use friendly id's
-    # identically to numeric ids in finders.
-    #
-    # @example
-    #  person = Person.find(123)
-    #  person = Person.find("joe")
-    #
-    # @see FriendlyId::ObjectUtils
-    def find_one(id)
-      return super if id.unfriendly_id?
-      where(@klass.friendly_id_config.query_field => id).first or super
-    end
-
-    # FriendlyId overrides this method to make it possible to use friendly id's
-    # identically to numeric ids in finders.
-    #
-    # @example
-    #  person = Person.exists?(123)
-    #  person = Person.exists?("joe")
-    #  person = Person.exists?({:name => 'joe'})
-    #  person = Person.exists?(['name = ?', 'joe'])
-    #
-    # @see FriendlyId::ObjectUtils
-    def exists?(id = false)
-      return super if id.unfriendly_id?
-      super @klass.friendly_id_config.query_field => id
-    end
-  end
-end

data/lib/friendly_id/globalize.rb

@@ -1,115 +0,0 @@
-require 'i18n'
-
-module FriendlyId
-
-=begin
-
-== Translating Slugs Using Globalize
-
-The {FriendlyId::Globalize Globalize} module lets you use
-Globalize[https://github.com/svenfuchs/globalize3] to translate slugs. This
-module is most suitable for applications that need to be localized to many
-languages. If your application only needs to be localized to one or two
-languages, you may wish to consider the {FriendlyId::SimpleI18n SimpleI18n}
-module.
-
-In order to use this module, your model's table and translation table must both
-have a slug column, and your model must set the +slug+ field as translatable
-with Globalize:
-
-    class Post < ActiveRecord::Base
-      translates :title, :slug
-      extend FriendlyId
-      friendly_id :title, :use => :globalize
-    end
-
-=== Finds
-
-Finds will take the current locale into consideration:
-
-  I18n.locale = :it
-  Post.find("guerre-stellari")
-  I18n.locale = :en
-  Post.find("star-wars")
-
-Additionally, finds will fall back to the default locale:
-
-  I18n.locale = :it
-  Post.find("star-wars")
-
-To find a slug by an explicit locale, perform the find inside a block
-passed to I18n's +with_locale+ method:
-
-  I18n.with_locale(:it) { Post.find("guerre-stellari") }
-
-=== Creating Records
-
-When new records are created, the slug is generated for the current locale only.
-
-=== Translating Slugs
-
-To translate an existing record's friendly_id, use
-{FriendlyId::Globalize::Model#set_friendly_id}. This will ensure that the slug
-you add is properly escaped, transliterated and sequenced:
-
-  post = Post.create :name => "Star Wars"
-  post.set_friendly_id("Guerre stellari", :it)
-
-If you don't pass in a locale argument, FriendlyId::Globalize will just use the
-current locale:
-
-  I18n.with_locale(:it) { post.set_friendly_id("Guerre stellari") }
-
-=end
-  module Globalize
-
-    def self.included(model_class)
-      model_class.instance_eval do
-        friendly_id_config.use :slugged
-        relation_class.send :include, FinderMethods
-        include Model
-        # Check if slug field is enabled to be translated with Globalize
-        unless respond_to?('translated_attribute_names') || translated_attribute_names.exclude?(friendly_id_config.query_field.to_sym)
-          puts "\n[FriendlyId] You need to translate '#{friendly_id_config.query_field}' field with Globalize (add 'translates :#{friendly_id_config.query_field}' in your model '#{self.class.name}')\n\n"
-        end
-      end
-    end
-
-    module Model
-      def set_friendly_id(text, locale)
-        I18n.with_locale(locale || I18n.locale) do
-          set_slug(normalize_friendly_id(text))
-        end
-      end
-    end
-
-    module FinderMethods
-      # FriendlyId overrides this method to make it possible to use friendly id's
-      # identically to numeric ids in finders.
-      #
-      # @example
-      #  person = Person.find(123)
-      #  person = Person.find("joe")
-      #
-      # @see FriendlyId::ObjectUtils
-      def find_one(id)
-        return super if id.unfriendly_id?
-        found = where(@klass.friendly_id_config.query_field => id).first
-        found = includes(:translations).
-                where(translation_class.arel_table[:locale].in([I18n.locale, I18n.default_locale])).
-                where(translation_class.arel_table[@klass.friendly_id_config.query_field].eq(id)).first if found.nil?
-
-        if found
-          # Reload the translations for the found records.
-          found.tap { |f| f.translations.reload }
-        else
-          # if locale is not translated fallback to default locale
-          super
-        end
-      end
-
-      protected :find_one
-
-    end
-  end
-end

data/test/globalize_test.rb

@@ -1,57 +0,0 @@
-# encoding: utf-8
-
-require "helper"
-
-class TranslatedArticle < ActiveRecord::Base
-  translates :slug, :title
-  extend FriendlyId
-  friendly_id :title, :use => :globalize
-end
-
-class GlobalizeTest < MiniTest::Unit::TestCase
-  include FriendlyId::Test
-
-  def setup
-    I18n.locale = :en
-  end
-
-  test "should find slug in current locale if locale is set, otherwise in default locale" do
-    transaction do
-      I18n.default_locale = :en
-      article_en = I18n.with_locale(:en) { TranslatedArticle.create(:title => 'a title') }
-      article_de = I18n.with_locale(:de) { TranslatedArticle.create(:title => 'titel') }
-
-      I18n.with_locale(:de) {
-        assert_equal TranslatedArticle.find("titel"), article_de
-        assert_equal TranslatedArticle.find("a-title"), article_en
-      }
-    end
-  end
-
-  test "should set friendly id for locale" do
-    transaction do
-      article = TranslatedArticle.create!(:title => "War and Peace")
-      article.set_friendly_id("Guerra y paz", :es)
-      article.save!
-      article = TranslatedArticle.find('war-and-peace')
-      I18n.with_locale(:es) { assert_equal "guerra-y-paz", article.friendly_id }
-      I18n.with_locale(:en) { assert_equal "war-and-peace", article.friendly_id }
-    end
-  end
-
-  # https://github.com/svenfuchs/globalize3/blob/master/test/globalize3/dynamic_finders_test.rb#L101
-  # see: https://github.com/svenfuchs/globalize3/issues/100
-  test "record returned by friendly_id should have all translations" do
-    transaction do
-      I18n.with_locale(:en) do
-        article = TranslatedArticle.create(:title => 'a title')
-        Globalize.with_locale(:ja) { article.update_attributes(:title => 'タイトル') }
-        article_by_friendly_id = TranslatedArticle.find("a-title")
-        article.translations.each do |translation|
-          assert_includes article_by_friendly_id.translations, translation
-        end
-      end
-    end
-  end
-
-end