@@ -31,15 +31,13 @@ def run_coverage(files) return end files = files.join(" ") - if PLATFORM =~ /darwin/ - exclude = '--exclude "gems/"' - else - exclude = '--exclude "rubygems"' - end - rcov = "rcov -Ilib:test --sort coverage --text-report #{exclude} --no-validator-links" - cmd = "#{rcov} #{files}" - puts cmd - sh cmd + # if RUBY_PLATFORM =~ /darwin/ + # exclude = '--exclude "gems/"' + # else + # exclude = '--exclude "rubygems"' + # end + rcov = ENV["RCOV"] ? ENV["RCOV"] : "rcov" + sh "#{rcov} -Ilib:test --sort coverage --text-report #{files}" end desc 'Publish RDoc to RubyForge.' Rakefile @@ -1 +1,3 @@ +# encoding: utf-8 + require 'friendly_id' \ No newline at end of file init.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + require 'friendly_id/helpers' require 'friendly_id/slug' lib/friendly_id.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + module FriendlyId module Helpers lib/friendly_id/helpers.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + module FriendlyId::NonSluggableClassMethods include FriendlyId::Helpers lib/friendly_id/non_sluggable_class_methods.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + module FriendlyId::NonSluggableInstanceMethods attr :found_using_friendly_id lib/friendly_id/non_sluggable_instance_methods.rb @@ -35,9 +35,7 @@ class Slug < ActiveRecord::Base def normalize(slug_text) return "" if slug_text.nil? || slug_text == "" ActiveSupport::Multibyte.proxy_class.new(slug_text.to_s).normalize(:kc). - # For some reason Spanish ¡ and ¿ are not detected as non-word - # characters. Bug in Ruby? - gsub(/[\W|¡|¿]/u, ' '). + gsub(/[\W]/u, ' '). strip. gsub(/\s+/u, '-'). gsub(/-\z/u, ''). @@ -45,10 +43,6 @@ class Slug < ActiveRecord::Base to_s end - def postnormalize(string) - string.gs - end - def parse(friendly_id) name, sequence = friendly_id.split('--') sequence ||= "1" @@ -77,10 +71,6 @@ class Slug < ActiveRecord::Base private - def chars_func - "".respond_to?(:mb_chars) ? :mb_chars : :chars - end - end # Whether or not this slug is the most recent of its owner's slugs. lib/friendly_id/slug.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + module FriendlyId::SluggableClassMethods include FriendlyId::Helpers lib/friendly_id/sluggable_class_methods.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + module FriendlyId::SluggableInstanceMethods NUM_CHARS_RESERVED_FOR_FRIENDLY_ID_EXTENSION = 2 lib/friendly_id/sluggable_instance_methods.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + module FriendlyId #:nodoc: module Version #:nodoc: MAJOR = 2 lib/friendly_id/version.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + namespace :friendly_id do desc "Make slugs for a model." task :make_slugs => :environment do lib/tasks/friendly_id.rake @@ -1,3 +1,5 @@ +# encoding: utf-8 + require File.dirname(__FILE__) + '/test_helper' class NonSluggedTest < Test::Unit::TestCase test/non_slugged_test.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + ActiveRecord::Schema.define(:version => 1) do create_table "books", :force => true do |t| test/schema.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 + require File.dirname(__FILE__) + '/test_helper' class ScopedModelTest < Test::Unit::TestCase test/scoped_model_test.rb @@ -1,8 +1,9 @@ +# encoding: utf-8 + $:.unshift(File.dirname(__FILE__) + '/../lib') $:.unshift(File.dirname(__FILE__)) $KCODE = 'UTF8' if RUBY_VERSION < '1.9' $VERBOSE = false -require 'rubygems' require 'test/unit' require 'contest' # You can use "rake test AR_VERSION=2.0.5" to test against 2.0.5, for example. @@ -13,7 +14,6 @@ if ENV["AR_VERSION"] end require 'active_record' require 'active_support' - require 'friendly_id' require 'models/post' require 'models/person' @@ -24,16 +24,6 @@ require 'models/novel' require 'models/thing' require 'models/event' -# 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") test/test_helper.rb d3bb8f97518260ab823506ea978ebf504283bb2e Norman Clarke norman@randomba.org http://github.com/norman/friendly_id/commit/1da53991d44ad791ad4699a2748f1db7dfc302b6 1da53991d44ad791ad4699a2748f1db7dfc302b6 2009-06-03T10:09:08-07:00 2009-06-03T10:09:08-07:00 A few minor maintenance updates and cleanups. 17889b01a74566011998351df76c96ccf3ceea2e Norman Clarke norman@randomba.org