rrod 1.0.0.alpha.5 → 1.0.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06754ed204ad9ff8a477fdeffa4d06434dea7e67
-  data.tar.gz: 9ae55842b97ccec524f8b5ca164f847dd5988a1a
+  metadata.gz: 0c796e27be01b2f1ae14658a4566e5a1628dad0e
+  data.tar.gz: 98d98dae17e3b05f9f56f00b3acee8aee1820501
 SHA512:
-  metadata.gz: 642a5471ed9e3b49d879846c7744ebc88052662c9c52eddc5a27b0c077c3426865b6ac365dbaed0df9996536a57d1ce24e73fdc227343d83fd1b23b96c4e23aa
-  data.tar.gz: e85b9b3e8a854b1eed52ccdf1713d5560992baffb22bda02eb27947353f55f4464dbbb79df1fe52292a5cbbca66e34eb5abcec54e01288d70f04454698617f42
+  metadata.gz: 1753e525a127b61eee4791ef384d0c26a948d688ed06ff59c6c9b1172dde99ae773143c354acd11c3569dad7f23a7eb498291c6aaf33b63af21a5ad2aa792c3a
+  data.tar.gz: cf1565f5cd0515bad8c890501749b6be59ea78446e1e0a048a3baee316ae08a78e485374f1d3581ef47f7c187e8b59543c9bb5666f3d991b227c8958925bccfa

data/lib/rrod/model/attribute.rb

@@ -29,15 +29,11 @@ module Rrod
         set_index if options.delete(:index)
       end
 
-      # @return [Object] default value or result of call on default value
-      def default(instance)
-        @default.respond_to?(:call) ? instance.instance_exec(&@default) : @default
-      end
-
       def define
         define_reader
         define_writer
         define_presence
+        define_default
         apply_validators
         self
       end
@@ -79,7 +75,13 @@ module Rrod
       def define_presence
         model.send :define_method, "#{name}?", self.class.presence_definition(name)
       end
-      
+
+      def define_default
+        value  = default unless default.respond_to?(:call)
+        method = default.respond_to?(:call) ? default : -> {value} 
+        model.send :define_method, "#{name}_default", method
+      end
+
       def set_index
         @index = Index.new(self)
       end

data/lib/rrod/model/attribute_methods.rb

@@ -39,8 +39,7 @@ module Rrod
       # @param [Symbol, String] the key of the attribute to read
       # @return the attribute at the given key
       def read_attribute(key)
-        @attributes[key.to_s] || 
-          write_attribute(key, self.class.attributes[key.to_sym].try(:default, self))
+        @attributes[key.to_s] || write_attribute(key, read_default(key))
       end
       alias :[] :read_attribute
 
@@ -52,6 +51,11 @@ module Rrod
       end
       alias :[]= :write_attribute
 
+      def read_default(key)
+        method = "#{key}_default"
+        send(method) if respond_to?(method)
+      end
+
       private
 
       def magic_methods=(keys)

data/lib/rrod/version.rb

@@ -1,2 +1,2 @@
 Rrod = Module.new unless defined? Rrod
-Rrod::VERSION = '1.0.0.alpha.5'
+Rrod::VERSION = '1.0.0.alpha.6'

data/spec/rrod/model/attribute_spec.rb

@@ -29,36 +29,6 @@ describe Rrod::Model::Attribute do
     expect(attribute.options).to eq(options)
   end
 
-  describe "defaults" do
-    let(:default) { attribute.default(instance) }
-  
-    context "when a value" do
-      let(:options) { {default: 'SOO fluffy!'} }
-
-      it "can provide a default value" do
-        expect(default).to eq 'SOO fluffy!'
-      end
-    end
-
-    context "when a proc" do
-      let(:options) { {default: -> { 'alligator' }} }
-
-      it "can provide a default value if a proc" do
-        expect(default).to eq 'alligator'
-      end
-
-      context "given an instance" do
-        let(:model)   { Class.new { include Rrod::Model; attr_accessor :foo } }
-        let(:options) { {default: -> { foo.upcase }} }
-
-        it "evaluates in the context of the given instance" do
-          instance.foo = 'whoah'
-          expect(default).to eq('WHOAH')
-        end
-      end
-    end
-  end
-
   describe "defining attribute methods" do
     before(:each) { attribute.define }
 
@@ -79,6 +49,12 @@ describe Rrod::Model::Attribute do
         expect(instance).to respond_to("#{name}?")
       end
     end
+
+    describe "default" do
+      it "adds the default" do
+        expect(instance).to respond_to("#{name}_default")
+      end
+    end
   end
 
   describe "casting" do

data/spec/rrod/model/schema_spec.rb

@@ -14,6 +14,26 @@ describe Rrod::Model::Schema do
     expect(instance).to respond_to(:name=)
   end
 
+  it "defines a default for the attribute if provided as a scalar" do
+    expect(instance.likes_pets_default).to be true
+  end
+
+  it "defines a default for the attribute if provided as a proc" do
+    expect(instance.comments).to eq([instance.build_comment])
+  end
+
+  context "subclassing" do
+    let(:model) { Class.new(Person) }
+
+    it "provides defaults" do
+      expect(instance.likes_pets_default).to be true
+    end
+
+    it "provides defaults to readers" do
+      expect(instance.likes_pets).to be true
+    end
+  end
+
   it "will properly typecast when writing an attribute" do
     instance.gender = 'female'
     expect(instance.gender).to be :female

data/spec/support/models/person.rb

@@ -40,12 +40,19 @@ class Person
   attribute :age,     Integer, numericality: {min: 10}
   attribute :gender,  Symbol
 
+  attribute :likes_pets, Boolean, default: true
+  attribute :comments,   Array,   default: -> { [build_comment] }
+
   attribute :address, Address
 
   attribute :pets,    [Pet]
 
   validates_length_of :pets, minimum: 1
 
+  def build_comment
+    {name: 'Adam', text: 'What kind of comment is this really?'}
+  end
+
   private
 
   def stuffs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrod
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.5
+  version: 1.0.0.alpha.6
 platform: ruby
 authors:
 - Adam Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client