faceted 1.0.4 → 1.0.5

data/README.md

@@ -18,10 +18,11 @@ Let's say that you have an ActiveRecord model called Musician, and you want to e
         presents :musician
         field :name
         field :genre
+        field :instrument, :default => 'guitar'
       end
     end
 
-That's actually all you have to do. The `presents` method maps your Musician presenter to a root-level class called `Musician`, and the `field` methods map to attributes *or* methods on the associated AR Musician instance.
+That's actually all you have to do. The `presents` method maps your Musician presenter to a root-level class called `Musician`, and the `field` methods map to attributes *or* methods on the associated AR Musician instance. If a default is set for a field, that default value will be stored when the presenter is used to create a record, unless overridden.
 
 What's that, you say? How is the appropriate AR Musican record associated? Simple. Invoke an instance of the `MyApi::Musician` passing in an `:id` parameter, and it just works:
 

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/faceted.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "faceted"
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   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-10-12"
+  s.date = "2012-11-16"
   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/has_object.rb

@@ -22,14 +22,17 @@ module Faceted
     # Instance methods =======================================================
 
     def initialize(args={})
-      self.id = args[:id]
-      initialize_with_object
-      ! args.empty? && args.symbolize_keys.delete_if{|k,v| v.nil?}.each{|k,v| self.send("#{k}=", v) if self.respond_to?("#{k}=") && ! v.blank? }
+      unless args.empty?
+        self.id = args[:id]
+        initialize_with_object
+        args.symbolize_keys.delete_if{|k,v| v.nil?}.each{|k,v| self.send("#{k}=", v) if self.respond_to?("#{k}=") && ! v.nil? }
+      end
       self.errors = []
       self.success = true
     end
 
     def reinitialize_with_object(obj)
+      obj.reload
       schema_fields.each{ |k| self.send("#{k}=", obj.send(k)) if obj.respond_to?(k) && self.send(:settable_field?, k) }
     end
 
@@ -54,7 +57,7 @@ module Faceted
 
     def initialize_with_object
       return unless object
-      schema_fields.each{ |k| self.send("#{k}=", object.send(k)) if object.respond_to?(k) && self.respond_to?("#{k}=") }
+      schema_fields.each{|k| self.send("#{k}=", object.send(k)) if object.respond_to?(k) && self.respond_to?("#{k}=") }
     end
 
     def object

data/lib/faceted/model.rb

@@ -29,7 +29,8 @@ module Faceted
       def field(name, args={})
         fields << name
         define_method :"#{name}" do
-          instance_variable_get("@#{name}") || args[:default]
+          val = instance_variable_get("@#{name}")
+          val.nil? ? args[:default] : val
         end
         unless args[:read_only]
           define_method :"#{name}=" do |val|

data/spec/presenter_spec.rb

@@ -1,15 +1,17 @@
 require 'spec_helper'
 
 class Musician # pretend that this is an AR model
-  attr_accessor :id, :name, :rating, :errors, :birthplace_id
+  attr_accessor :id, :name, :rating, :errors, :birthplace_id, :alive
   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
+  def attributes; {:id => self.id, :name => self.name, :rating => self.rating, :alive => self.alive}; end
+  def reload; self; end
 end
 
 class Birthplace # another make-believe 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
+  def reload; self; end
 end
 
 module MyApi
@@ -27,13 +29,14 @@ module MyApi
     field :name
     field :rating
     field :birthplace_id
+    field :alive
   end
 
   describe Musician do
 
     before do
 
-      @ar_musician = ::Musician.new(:id => 1, :name => 'Johnny Cash', :rating => 'Good')
+      @ar_musician = ::Musician.new(:id => 1, :name => 'Johnny Cash', :rating => 'Good', :alive => false)
       ::Musician.stub(:find) { @ar_musician }
 
       @ar_birthplace = ::Birthplace.new(:id => 1, :city => 'Kingsland', :state => 'Arkansas')
@@ -43,9 +46,19 @@ module MyApi
 
     describe 'initialized with a presented object' do
 
-      it 'inherits values from its AR counterpart' do
-        musician = MyApi::Musician.new(:id => 1)
-        musician.name.should == 'Johnny Cash'
+      describe 'inherits values from its AR counterpart' do
+
+        it 'normal values' do
+          musician = MyApi::Musician.new(:id => 1)
+          musician.name.should == 'Johnny Cash'
+        end
+
+        it 'boolean values' do
+          musician = MyApi::Musician.new(:id => 1)
+          musician.alive.should be_false
+          musician.alive.should_not be_nil
+        end
+
       end
 
       it 'overwrites values from its AR counterpart' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-11-16 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: 1706870145372003928
+      hash: -3357536951405815517
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: