has_friendly_name 0.2.2 → 0.4

data/lib/has_friendly_name.rb

@@ -16,15 +16,32 @@ module HasFriendlyName
       before_create :generate_friendly_name
       include HasFriendlyName::InstanceMethods
     end
+    
+    def find_by_friendly_name(query)
+      obj = find(:first, :conditions => "friendly_name ='#{query}'")
+      
+      if query.match(/\d+/)
+        obj = find(:first, :conditions => "friendly_name = '#{query.gsub(/-\d+/, "")}'") unless obj
+        obj = find(:first, :conditions => "friendly_name LIKE '#{query.gsub(/-\d+/, "")}-%'") unless obj
+      end
+      
+        
+      raise ActiveRecord::RecordNotFound, "Couldn't find #{name} with friendly_name #{query}" unless obj
+
+      obj
+    end
+    
   end
   
   module InstanceMethods
     
+    
+    
     def generate_friendly_name              
       self.friendly_name = send(self.has_friendly_name_options[:from].to_s.to_sym).to_friendly(self.has_friendly_name_options)
       
       if self.has_friendly_name_options[:unique] 
-        checkmodel=self.class.find_by_friendly_name(self.friendly_name)          
+        checkmodel=self.class.find(:first, :conditions => "friendly_name='#{self.friendly_name}'")          
         if checkmodel and checkmodel!=self
           self.friendly_name+='-'+(self.class.count+1).to_s
         end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: has_friendly_name
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  hash: 3
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Dennis Meise
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +01:00
+date: 2010-06-14 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +35,7 @@ files:
 - lib/active_record_extensions.rb
 - rails/init.rb
 has_rdoc: true
-homepage: http://www.dennis-meise.de
+homepage: http://www.gitub.com/netjungle/has_friendly_name
 licenses: []
 
 post_install_message: 
@@ -40,21 +45,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: HasFriendlyName adds a search engine friendly name to your active record model.