faceted 1.0.1 → 1.0.2

data/README.md

@@ -78,6 +78,7 @@ Collectors are simply models that collect multiple instances of another model. A
       class Playlist
         include Faceted::Collector
         collects :musicians, :find_by => :genre_id
+        collects :deejays #implicit find_by, using 'playlist_id'
       end
     end
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/faceted.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "faceted"
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Ehmke", "Max Thom Stahl"]

data/lib/faceted/collector.rb

@@ -19,14 +19,20 @@ module Faceted
 
       def collects(name, args={})
         @fields = [name]
-        find_by = args[:find_by] ? args[:find_by] : "#{self.class.name.underscore.singularize}_id"
+        find_by = args[:find_by] ? args[:find_by] : "#{self.name.split('::')[-1].underscore.singularize}_id"
         @collects ||= {}
         @collects[name.downcase] = eval "#{scope}#{args[:class_name] || name.to_s.classify}"
         define_method :"#{name.downcase}" do
           objects(name.downcase.to_sym)
         end
-        define_method :"#{name.downcase}_finder" do
-          {"#{find_by}" => self.send(find_by)}
+        if args[:find_by].nil?
+          define_method :"#{name.downcase}_finder" do
+            {"#{find_by}" => self.id}
+          end
+        else
+          define_method :"#{name.downcase}_finder" do
+            {"#{find_by}" => self.send(find_by)}
+          end
         end
         self.send(:attr_accessor, find_by)
       end

data/spec/collector_spec.rb

@@ -59,10 +59,13 @@ module MyApi
 
       it 'initializes the associated objects in the correct namespace' do
         band = MyApi::Band.new(:birthplace_id => 1)
+        band.stub(:id) { 3 }
         MyApi::Musician.stub(:where) { [MyApi::Musician.new] }
         MyApi::Song.stub(:where) { [MyApi::Song.new] }
+        MyApi::Song.should_receive(:where).with('band_id' => 3)
         band.musicians.first.class.name.should == "MyApi::Musician"
         band.songs.first.class.name.should == "MyApi::Song"
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4548707145106113177
+      hash: -4373279037322943472
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: