revolutionhealth-acts_as_seo_friendly 1.1.0 → 1.1.1

data/Rakefile

@@ -1,12 +1,64 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+require 'rubygems'
+require 'rake/gempackagetask'
+require 'rubygems/specification'
+require 'date'
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+GEM = "acts_as_seo_friendly"
+GEM_VERSION = "1.1.0"
+AUTHOR = "Revolution Health"
+EMAIL = "rails-trunk@revolutionhealth.com"
+HOMEPAGE = %q{http://github.com/revolutionhealth/acts_as_seo_friendly}
+SUMMARY = "provides a seo friendly version of field on a table"
+DESCRIPTION = "provides a seo friendly version of field on a table"
 
-task :gemspec  do
-  gemspec_file = File.join(File.dirname(__FILE__), "#{GEM_NAME}.gemspec")
-  `rake debug_gem > #{gemspec_file}`
-  gemspec = File.readlines(gemspec_file)
-  gemspec.delete_at(0)
-  File.open(gemspec_file, "w+") {|f| f <<  gemspec.to_s() }
+
+spec = Gem::Specification.new do |s|
+  s.name = GEM
+  s.version = GEM_VERSION
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = false
+  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
+  s.summary = SUMMARY
+  s.description = DESCRIPTION
+  s.author = AUTHOR
+  s.email = EMAIL
+  s.homepage = HOMEPAGE
+  s.rdoc_options = ["--main", "README"]
+  
+  
+  # Uncomment this to add a dependency
+  # s.add_dependency "foo"
+  
+  s.require_path = 'lib'
+  s.autorequire = GEM
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,test, config}/**/*") 
+  s.test_files = Dir.glob("{test}/**/*") 
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
+desc "install the gem locally"
+task :install => [:package] do
+  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
+end
+
+desc "create a gemspec file"
+task :make_spec do
+  File.open("#{GEM}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
+end
+
+require 'test/unit'
+ 
+task :test do
+ runner = Test::Unit::AutoRunner.new(true)
+ runner.to_run << 'test'
+ runner.pattern = [/_test.rb$/]
+ exit if !runner.run
+end
+ 
+task :default => [:test, :package] do
 end

data/lib/acts_as_seo_friendly.rb

@@ -120,8 +120,15 @@ module ActiveRecord
           
           result = nil
           if (count_seo_id_value != 0)
-            last = count_seo_id_N_value
-            result = last + 1
+            # +1 from current count of seo ids with similar format
+            result = count_seo_id_N_value + 1
+            # +1 until the seo id does not exist in the database
+            # The initial check is based on the counter above, so, in a rare case of another collision,
+            # the code shouldn't execute the find_by query that many times.
+            #
+            # For example, if there are 10000 rows that matches the format, the first check would be on 100001
+            # and not 1
+            result += 1 until self.class.send("find_by_#{seo_id_field}".to_sym, "#{seo_id_value}-#{result}").blank?
           end
           return result
         end

data/lib/acts_as_seo_friendly/version.rb

@@ -2,7 +2,7 @@ module ActsAsSeoFriendly #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/active_record_test_helper.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'active_support'
+
+silence_warnings do
+  require 'active_record'
+end
+
+module ActiveRecordTestHelper
+  def self.included(base)
+    ActiveRecord::Base.configurations = {'test' => {'adapter' => "sqlite3", "dbfile" => ":memory:"}}    
+  end
+  
+  def ar_setup
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.logger.level = Logger::WARN
+    ActiveRecord::Base.logger.level = Logger::DEBUG if ENV['DEBUG_SQL'] == 'true'
+    
+    ActiveRecord::Base.establish_connection
+    ActiveRecord::Base.connection.reconnect!
+  end
+  
+  def ar_teardown
+    ActiveRecord::Base.connection.tables.each do |table|
+      ActiveRecord::Base.connection.drop_table(table)
+    end
+    ActiveRecord::Base.connection.disconnect!
+  end
+  
+end

data/test/test_acts_as_seo_friendly.rb

@@ -2,17 +2,12 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 require 'ostruct'
 
 class TestActsAsSeoFriendly < Test::Unit::TestCase
-  ActiveRecord::Base.configurations = {'test' => {'adapter' => "sqlite3", "dbfile" => ":memory:"}}
-
+  include ActiveRecordTestHelper
+  
   def setup
-    ActiveRecord::Base.logger = Logger.new(STDOUT)
-    ActiveRecord::Base.logger.level = Logger::WARN
-    ActiveRecord::Base.logger.level = Logger::DEBUG if ENV['DEBUG_SQL'] == 'true'
+    ar_setup()
     
-    ActiveRecord::Base.establish_connection
-    ActiveRecord::Base.connection.reconnect!
-    ActiveRecord::Schema.define(:version => 1) do
-      
+    ActiveRecord::Schema.define(:version => 1) do      
       create_table :seo_test_models do |t|
         t.string :name
         t.timestamps
@@ -23,10 +18,7 @@ class TestActsAsSeoFriendly < Test::Unit::TestCase
   
   def teardown
     SeoTestModel.drop_seo_friendly_column()
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-    ActiveRecord::Base.connection.disconnect!
+    ar_teardown()
   end
 
   def test_id_generation
@@ -146,13 +138,26 @@ class TestActsAsSeoFriendly < Test::Unit::TestCase
 
     begin
       oil_short3 = SeoTestModel.create!(:name =>"oil")
-      assert (oil_short3.seo_id.size <= 8)
+      assert(oil_short3.seo_id.size <= 8)
     ensure
       opts[:seo_friendly_id_limit] = orig_limit
       SeoTestModel.write_inheritable_attribute(:seo_friendly_options, opts)
     end
     
   end
+
+  def test_collision_with_original_seo_id
+    a = SeoTestModel.create!(:name => "a 1")
+    assert_equal('a-1', a.seo_id)
+    b = SeoTestModel.create!(:name => "a 1/2")
+    assert_equal('a-1-2', b.seo_id)
+    c = SeoTestModel.create!(:name => "a 1/4")
+    assert_equal('a-1-4', c.seo_id)
+    d = SeoTestModel.create!(:name => "a 1")
+    assert_equal('a-1-3', d.seo_id, "seo_id unique counter should be +1 of and existing seo_id that matches the format with the minimum counter value")
+    e = SeoTestModel.create!(:name => "a 1")
+    assert_equal('a-1-5', e.seo_id, "seo_id unique counter should be +1 of and existing seo_id that matches the format with the minimum counter value")
+  end
   
   private
   def create_seo_str(str)

data/test/test_helper.rb

@@ -1,8 +1,8 @@
-RAILS_ENV = 'test'
+RAILS_ENV = 'test' if !defined?(RAILS_ENV) || RAILS_ENV != 'test'
 require 'test/unit'
 require 'rubygems'
 
-require 'active_record'
+require 'active_record_test_helper'
 
 require File.dirname(__FILE__) + '/../lib/acts_as_seo_friendly'
 

metadata

@@ -1,70 +1,47 @@
 --- !ruby/object:Gem::Specification 
 name: revolutionhealth-acts_as_seo_friendly
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Revolution Health
-autorequire: 
+autorequire: acts_as_seo_friendly
 bindir: bin
 cert_chain: []
 
-date: 2008-06-16 00:00:00 -07:00
+date: 2008-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: provides a seo friendly version of field on a table
-email: 
-- opensource@revolutionhealth.com
+email: rails-trunk@revolutionhealth.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- website/index.txt
+- README
+- LICENSE
+- TODO
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
+- LICENSE
+- README
 - Rakefile
-- acts_as_seo_friendly.gemspec
-- config/hoe.rb
-- config/requirements.rb
-- lib/acts_as_seo_friendly.rb
+- TODO
+- lib/acts_as_seo_friendly
 - lib/acts_as_seo_friendly/version.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/website.rake
+- lib/acts_as_seo_friendly.rb
+- test/active_record_test_helper.rb
 - test/seo_test_model.rb
 - test/seo_test_model_conditions.rb
 - test/test_acts_as_seo_friendly.rb
 - test/test_helper.rb
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.html.erb
-has_rdoc: true
-homepage: http://github.com/revolutionhealth/acts_as_seo_friendly/tree/master
-post_install_message: |+
-  
-  For more information on acts_as_seo_friendly, see http://github.com/revolutionhealth/acts_as_seo_friendly/tree/master
-  
+has_rdoc: false
+homepage: http://github.com/revolutionhealth/acts_as_seo_friendly
+post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,11 +58,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: acts_as_seo_friendly
-rubygems_version: 1.0.1
+rubyforge_project: 
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: provides a seo friendly version of field on a table
 test_files: 
+- test/active_record_test_helper.rb
+- test/seo_test_model.rb
+- test/seo_test_model_conditions.rb
 - test/test_acts_as_seo_friendly.rb
 - test/test_helper.rb

data/History.txt

@@ -1,4 +0,0 @@
-== 1.0.0 2008-06-13
-
-* 1 major enhancement:
-  * Initial release

data/Manifest.txt

@@ -1,28 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-PostInstall.txt
-README.txt
-Rakefile
-acts_as_seo_friendly.gemspec
-config/hoe.rb
-config/requirements.rb
-lib/acts_as_seo_friendly.rb
-lib/acts_as_seo_friendly/version.rb
-script/console
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
-test/seo_test_model.rb
-test/seo_test_model_conditions.rb
-test/test_acts_as_seo_friendly.rb
-test/test_helper.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.html.erb

data/PostInstall.txt

@@ -1,3 +0,0 @@
-
-For more information on acts_as_seo_friendly, see http://github.com/revolutionhealth/acts_as_seo_friendly/tree/master
-

data/acts_as_seo_friendly.gemspec

@@ -1,26 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{acts_as_seo_friendly}
-  s.version = "1.1.0"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Revolution Health"]
-  s.date = %q{2008-06-16}
-  s.description = %q{provides a seo friendly version of field on a table}
-  s.email = ["opensource@revolutionhealth.com"]
-  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "website/index.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "acts_as_seo_friendly.gemspec", "config/hoe.rb", "config/requirements.rb", "lib/acts_as_seo_friendly.rb", "lib/acts_as_seo_friendly/version.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/seo_test_model.rb", "test/seo_test_model_conditions.rb", "test/test_acts_as_seo_friendly.rb", "test/test_helper.rb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.html.erb"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/revolutionhealth/acts_as_seo_friendly/tree/master}
-  s.post_install_message = %q{
-For more information on acts_as_seo_friendly, see http://github.com/revolutionhealth/acts_as_seo_friendly/tree/master
-
-}
-  s.rdoc_options = ["--main", "README.txt"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{acts_as_seo_friendly}
-  s.rubygems_version = %q{1.1.1}
-  s.summary = %q{provides a seo friendly version of field on a table}
-  s.test_files = ["test/test_acts_as_seo_friendly.rb", "test/test_helper.rb"]
-end

data/config/hoe.rb

@@ -1,73 +0,0 @@
-require 'acts_as_seo_friendly/version'
-
-AUTHOR = 'Revolution Health'  # can also be an array of Authors
-EMAIL = "opensource@revolutionhealth.com"
-DESCRIPTION = "provides a seo friendly version of field on a table"
-GEM_NAME = 'acts_as_seo_friendly' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'acts_as_seo_friendly' # The unix name for your project
-HOMEPATH = "http://github.com/revolutionhealth/acts_as_seo_friendly/tree/master"
-DOWNLOAD_PATH = "http://github.com/revolutionhealth/acts_as_seo_friendly/tree/master"
-EXTRA_DEPENDENCIES = [
-#  ['activesupport', '>= 1.3.1']
-]    # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil
-# UNCOMMENT IF REQUIRED:
-# REV = YAML.load(`svn info`)['Revision']
-VERS = ActsAsSeoFriendly::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'acts_as_seo_friendly documentation',
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
-
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""