faceted 1.1.1 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/faceted.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "faceted"
-  s.version = "1.1.1"
+  s.version = "1.2.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-12-20"
+  s.date = "2013-02-25"
   s.description = "Faceted provides set of tools, patterns, and modules for use in API implementations."
   s.email = "corey@trunkclub.com"
   s.extra_rdoc_files = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/trunkclub/faceted"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "1.8.24"
   s.summary = "Faceted provides set of tools, patterns, and modules for use in API implementations."
 
   if s.respond_to? :specification_version then

data/lib/faceted/has_object.rb

@@ -75,7 +75,7 @@ module Faceted
 
     def object
       return unless self.class.klass
-      @object ||= self.id ? self.class.klass.find(self.id) : self.class.klass.new
+      @object ||= self.class.klass.where(find_by => self.send(find_by)) || self.class.klass.new
     end
 
     def object=(obj)

data/lib/faceted/presenter.rb

@@ -24,6 +24,9 @@ module Faceted
       def presents(name, args={})
         class_name = args[:class_name] || name.to_s.classify
         @presents = eval(class_name)
+        define_method :find_by do
+          args[:find_by] || :id
+        end
         define_method :"#{class_name.downcase}" do
           object
         end

data/spec/presenter_spec.rb

@@ -14,6 +14,13 @@ class Birthplace # another make-believe AR model
   def reload; self; end
 end
 
+class Album # and yet another make-believe AR model
+  attr_accessor :id, :name
+  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}; end
+  def reload; self; end
+end
+
 module MyApi
 
   class Birthplace
@@ -32,15 +39,21 @@ module MyApi
     field :alive
   end
 
+  class Album
+    include Faceted::Presenter
+    presents :album, :find_by => :name
+    field :name
+  end
+
   describe Musician do
 
     before do
 
       @ar_musician = ::Musician.new(:id => 1, :name => 'Johnny Cash', :rating => 'Good', :alive => false)
-      ::Musician.stub(:find) { @ar_musician }
+      ::Musician.stub(:where) { @ar_musician }
 
       @ar_birthplace = ::Birthplace.new(:id => 1, :city => 'Kingsland', :state => 'Arkansas')
-      ::Birthplace.stub(:find) { @ar_birthplace }
+      ::Birthplace.stub(:where) { @ar_birthplace }
 
     end
 
@@ -110,6 +123,13 @@ module MyApi
         musician.birthplace.city.should == 'Kingsland'
       end
 
+      it 'initializes the associated object finding by a specified key' do
+        @ar_album = ::Album.new(:id => 1, :name => 'Greatest Hits')
+        ::Album.stub(:where) { @ar_album }
+        album = MyApi::Album.new(:name => 'Greatest Hits')
+        album.id.should == 1
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2921058822992473011
+      hash: 4579976774321596650
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Faceted provides set of tools, patterns, and modules for use in API implementations.