ffmike-from_param 1.0 → 1.0.1

data/README

@@ -35,6 +35,7 @@ Example
   end
   
   # using a 'param' column, in this case 'slug'. Note the use of String.urlize to make the title URL-friendly.
+  # On Rails 2.2+, String.urlize is an alias for Rails built-in Inflector.parameterize.
   
   class Post < ActiveRecord::Base
     set_param_column "slug" # defaults to "param"
@@ -47,6 +48,8 @@ Example
     # GET /posts/2008-04-26-from-param-plugin-released
     @post = Post.from_param(params[:id]) # => <Post title="From Param: Plugin Released" created_at="2008-04-26">
   end
+
+Note: You will need to have the rspec gem installed to run the tests.
   
 Resources
 =========

data/Rakefile

@@ -1,9 +1,16 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'spec'
+require 'spec/rake/spectask'
 
-desc 'Default: run unit tests.'
-task :default => :test
+desc 'Default: run rspec tests.'
+task :default => :spec
+
+desc "Run all specs in spec directory "
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
 
 desc 'Test the from_param plugin.'
 Rake::TestTask.new(:test) do |t|

data/lib/from_param.rb

@@ -48,6 +48,26 @@ class ActiveRecord::Base
   # the param_column to the current to_param
   def set_param
     send "#{param_column}=", to_param if param_column?
+    if self.class.param_taken?(self)
+      i = 2
+      base_value = send "#{param_column}"
+      send "#{param_column}=", "#{base_value}-#{i}"
+      while(self.class.param_taken?(self))
+        base_value = send "#{param_column}"
+        send "#{param_column}=", base_value.chop + (i+=1).to_s
+      end
+    end
+  end
+  
+  # check to see if this param is already in use
+  class << self
+    def param_taken?(instance)
+      return false if !param_column?
+      conditions = instance.new_record? ? nil : ["id <> ?", instance.id]
+      check_value = instance.send "#{param_column}"
+      return true if instance.class.send("find_by_#{param_column}", check_value, :conditions => conditions)
+      false
+    end
   end
   
 end

data/lib/string_extensions.rb

@@ -5,6 +5,10 @@ class String
   # * Converts to all lower-case
   # * Removes all characters except alphabetic and numeric
   def urlize
-    self.gsub(" ","-").downcase.gsub(/[^a-z0-9-]/,"")
+    if ActiveSupport::Inflector.respond_to?(:parameterize)
+      self.parameterize
+    else
+      self.gsub(" ","-").downcase.gsub(/[^a-z0-9-]/,"")
+    end
   end
 end

data/spec/from_param_spec.rb

@@ -34,4 +34,44 @@ describe ActiveRecord::Base, "with from_param" do
     @paramed.save
     SluggedModel.from_param(@paramed.to_param).should == @paramed
   end
+  
+  it "#param_taken? should return true if param is already used" do
+    @paramed.name = "Angus"
+    @paramed.save
+    @paramed2 = ParameteredModel.new
+    @paramed2.param = "angus"
+    ParameteredModel.param_taken?(@paramed2).should be_true
+  end
+  
+  it "#param_taken? should return false if updating own parameter" do
+    @paramed.name = "Ben"
+    @paramed.save
+    @paramed.param = "ben"
+    ParameteredModel.param_taken?(@paramed).should be_false
+  end
+  
+  it "should append digit at the end if param is taken" do
+    @paramed.name = "Clyde"
+    @paramed.save
+    @paramed2 = ParameteredModel.new
+    @paramed2.name = "Clyde"
+    @paramed2.save
+    @paramed2.param.should == "clyde-2"
+  end
+  
+  it "should serialize the name as necessary to avoid collisions" do
+    @paramed.name = "Dennis"
+    @paramed.save
+    @paramed2 = ParameteredModel.new
+    @paramed2.name = "Dennis"
+    @paramed2.save
+    @paramed3 = ParameteredModel.new
+    @paramed3.name = "Dennis"
+    @paramed3.save
+    @paramed4 = ParameteredModel.new
+    @paramed4.name = "Dennis"
+    @paramed4.save
+    @paramed4.param.should == "dennis-4"
+  end
+  
 end

data/spec/spec_helper.rb

@@ -1,8 +1,35 @@
-require File.dirname(__FILE__) + '/../../../../spec/spec_helper'
+require 'rubygems'
+require 'spec'
+require 'active_record'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/from_param')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/string_extensions')
 
 plugin_spec_dir = File.dirname(__FILE__)
 ActiveRecord::Base.logger = Logger.new(plugin_spec_dir + "/debug.log")
 
+config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+
+db_adapter = ENV['DB']
+
+# no db passed, try one of these fine config-free DBs before bombing. 
+db_adapter ||= begin 
+  require 'rubygems' 
+  require 'sqlite'
+  'sqlite' 
+  rescue MissingSourceFile 
+    begin 
+    require 'sqlite3' 
+    'sqlite3' 
+    rescue MissingSourceFile 
+  end 
+end
+
+if db_adapter.nil?
+  raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3." 
+end
+
+ActiveRecord::Base.establish_connection(config[db_adapter])
+
 load(File.dirname(__FILE__) + '/schema.rb')
 
 class ParameteredModel < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ffmike-from_param
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: 1.0.1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-29 00:00:00 -07:00
+date: 2008-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: []