ismasan-sluggable_finder 2.0.4 → 2.0.5

data/lib/sluggable_finder/finder.rb

@@ -2,16 +2,36 @@ module SluggableFinder
   # This module is included by the base class as well as AR asociation collections
   #
   module Finder
-    
-    def find_with_slug(*args)
-      if (respond_to?(:sluggable_finder_options) && args.first.is_a?(String) and !(args.first =~ /\A\d+\Z/))#only contain digits
-          options = {:conditions => ["#{ sluggable_finder_options[:to]} = ?", args.first]}
-          first(options) or 
-            raise SluggableFinder.not_found_exception.new("There is no #{sluggable_finder_options[:sluggable_type]} with #{sluggable_finder_options[:to]} '#{args.first}'")
+    def find_sluggable(opts,*args)
+      key = args.first
+      if (key.is_a?(String) and !(key =~ /\A\d+\Z/))#only contain digits
+          options = {:conditions => ["#{ opts[:to]} = ?", key]}
+          error = "There is no #{opts[:sluggable_type]} with #{opts[:to]} '#{key}'"
+          with_scope(:find => options) do
+            find_without_slug(:first) or 
+            raise SluggableFinder.not_found_exception.new(error)
+          end
       else
         find_without_slug(*args)
       end
     end
   end
   
+  module BaseFinder
+    
+    def find_with_slug(*args)
+      return find_without_slug(*args) unless respond_to?(:sluggable_finder_options)
+      options = sluggable_finder_options
+      find_sluggable(options,*args)
+    end
+  end
+  
+  module AssociationProxyFinder
+    def find_with_slug(*args)
+      return find_without_slug(*args) unless @reflection.klass.respond_to?(:sluggable_finder_options)
+      options = @reflection.klass.sluggable_finder_options
+      find_sluggable(options,*args)
+    end
+  end
+  
 end

data/lib/sluggable_finder/orm.rb

@@ -1,17 +1,18 @@
 module SluggableFinder
   module Orm
     
-    def self.included(base)
-      base.extend ClassMethods
-      base.class_eval{include InstanceMethods}
-      class << base
-        alias_method_chain :find, :slug
-      end
-    end
-    
     module ClassMethods
 
       def sluggable_finder(field = :title, options = {})
+        return if self.included_modules.include?(SluggableFinder::Orm::InstanceMethods)
+        extend SluggableFinder::Finder
+        extend SluggableFinder::BaseFinder
+        include SluggableFinder::Orm::InstanceMethods
+
+        class << self
+          alias_method_chain :find, :slug
+        end
+        
         write_inheritable_attribute(:sluggable_finder_options, {
           :sluggable_type => ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s,
           :from		        =>	field,
@@ -49,12 +50,8 @@ module SluggableFinder
             "#{sluggable_finder_options[:to]}"
           end
 
-          def the_scope
-            "#{sluggable_finder_options[:scope]}"
-          end
-
           def to_param
-          	send("#{sluggable_finder_options[:to]}")
+          	self.#{sluggable_finder_options[:to]}
           end
 
           #{scope_condition_method}

data/lib/sluggable_finder.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module SluggableFinder
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
   
   @@not_found_exception = nil
   
@@ -17,8 +17,7 @@ module SluggableFinder
   class << self
     
     def enable_activerecord
-      ActiveRecord::Base.extend SluggableFinder::Finder
-      ActiveRecord::Base.class_eval{include SluggableFinder::Orm}
+      ActiveRecord::Base.extend SluggableFinder::Orm::ClassMethods
       # support for associations
       a = ActiveRecord::Associations
       returning([ a::AssociationCollection ]) { |classes|
@@ -28,6 +27,8 @@ module SluggableFinder
         end
       }.each do |klass|
         klass.send :include, SluggableFinder::Finder
+        klass.send :include, SluggableFinder::AssociationProxyFinder
+        klass.alias_method_chain :find, :slug
       end
       
     end

data/spec/sluggable_finder_spec.rb

@@ -46,6 +46,7 @@ end
 #
 class Category < ActiveRecord::Base
   has_many :scoped_items
+  has_many :simple_items
 end
 
 class ScopedItem < Item
@@ -158,6 +159,28 @@ describe PermalinkItem,'writing to custom field' do
   end
 end
 
+describe SimpleItem,"scoping finder" do
+  before(:each) do
+    Item.delete_all
+    @category1 = Category.create!(:name => 'Category one')
+    @category2 = Category.create!(:name => 'Category two')
+    # Lets create 3 items with the same title, two of them in the same category
+    @item1 = @category1.simple_items.create!(:title => '1 in 1')
+    @item2 = @category1.simple_items.create!(:title => '2 in 1')
+    @item3 = @category2.simple_items.create!(:title => '1 in 2')
+  end
+  
+  it "should find in scope" do
+    @category1.simple_items.find('1-in-1').should == @item1
+  end
+  
+  it "should not find out of scope" do
+    lambda{
+      @category2.simple_items.find('1-in-1')
+    }.should raise_error(ActiveRecord::RecordNotFound)
+  end
+end
+
 describe ScopedItem,'scoped to parent object' do
   before(:each) do
     Item.delete_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ismasan-sluggable_finder
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Ismael Celis