faceted 0.8.3 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.8.3
+1.0.0

data/faceted.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "faceted"
-  s.version = "0.8.3"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Ehmke", "Max Thom Stahl"]
-  s.date = "2012-09-27"
+  s.date = "2012-10-03"
   s.description = "Faceted provides set of tools, patterns, and modules for use in API implementations."
   s.email = "corey@trunkclub.com"
   s.extra_rdoc_files = [

data/lib/faceted/collector.rb

@@ -19,17 +19,19 @@ module Faceted
 
       def collects(name, args={})
         @fields = [name]
-        @collects = eval "#{scope}#{args[:class_name] || name.to_s.classify}"
+        find_by = args[:find_by] ? args[:find_by] : "#{name.to_s.downcase.singularize}_id"
+        @collects ||= {}
+        @collects[name.downcase] = eval "#{scope}#{args[:class_name] || name.to_s.classify}"
         define_method :"#{name.downcase}" do
-          objects
+          objects(name.downcase.to_sym)
         end
-        define_method :finder do
-          {"#{args[:find_by]}" => self.send(args[:find_by])}
+        define_method :"#{name.downcase}_finder" do
+          {"#{find_by}" => self.send(find_by)}
         end
-        self.send(:attr_accessor, args[:find_by])
+        self.send(:attr_accessor, find_by)
       end
 
-      def collected_class
+      def collected_classes
         @collects
       end
 
@@ -51,9 +53,10 @@ module Faceted
 
     private
 
-    def objects
-      return unless self.class.collected_class
-      @objects ||= self.class.collected_class.where(self.finder)
+    def objects(klass)
+      return [] unless self.class.collected_classes
+      return [] unless self.class.collected_classes.keys.include?(klass)
+      self.class.collected_classes[klass].where(self.send("#{klass.to_s}_finder"))
     end
 
   end

data/spec/collector_spec.rb

@@ -1,17 +1,23 @@
 require 'spec_helper'
 
-class Musician # pretend that this is an AR model
+class Musician # Mock AR model
   attr_accessor :id, :name, :rating, :errors, :birthplace_id
   def initialize(params={}); params.each{|k,v| self.send("#{k}=",v) if self.respond_to?(k)}; end
   def attributes; {:id => self.id, :name => self.name, :rating => self.rating}; end
 end
 
-class Birthplace # another make-believe AR model
+class Birthplace # Mock AR model
   attr_accessor :id, :city, :state
   def initialize(params={}); params.each{|k,v| self.send("#{k}=",v) if self.respond_to?(k)}; end
   def attributes; {:id => self.id, :city => self.city, :state => self.state}; end
 end
 
+class Song # Mock AR model
+  attr_accessor :id, :title, :rating
+  def initialize(params={}); params.each{|k,v| self.send("#{k}=",v) if self.respond_to?(k)}; end
+  def attributes; {:id => self.id, :title => self.title}; end
+end
+
 module MyApi
 
   class Birthplace
@@ -29,18 +35,24 @@ module MyApi
     field :birthplace_id
   end
 
+  class Song
+    include Faceted::Presenter
+    presents :song
+    field :title
+    field :rating
+  end
+
   class Band
     include Faceted::Collector
     collects :musicians, :find_by => :birthplace_id
+    collects :songs
   end
 
   describe Band do
 
-    before do
-    end
-
     it 'creates an accessor method for its collected objects' do
       Band.new.respond_to?(:musicians).should be_true
+      Band.new.respond_to?(:songs).should be_true
     end
 
     describe 'with associated objects' do
@@ -48,7 +60,9 @@ module MyApi
       it 'initializes the associated objects in the correct namespace' do
         band = MyApi::Band.new(:birthplace_id => 1)
         MyApi::Musician.stub(:where) { [MyApi::Musician.new] }
+        MyApi::Song.stub(:where) { [MyApi::Song.new] }
         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: 0.8.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -13865521977452324
+      hash: 1204187921055065729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: