varia_model 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a78aa9f5f5258c296e31c04b6c53c651801753c
-  data.tar.gz: 80dc767391b7a353b3aa37f73475ddfa2d620256
+  metadata.gz: 77dd327b0e41d985df1a161e39a5147b507e1df5
+  data.tar.gz: 347a99f528442382d89e7766f12492a5b1154522
 SHA512:
-  metadata.gz: f0ffddc9eb66f04a179816ea6abb730593543b65bfa12d01689556334cab6be1fb4b03bae3755340466864dae7c14241fdf07bb5855e923cc57f0b2d5bcce25f
-  data.tar.gz: 1b3c83784c73ccc2c878efa0087fdd80c793687185b0ad2f4fbf0cac501bb04a95c767d8a920358bc944433e3b0f0995af1f59569f5ee104c1781425ec869233
+  metadata.gz: b2b42df3bd92530a95735c97e6091849d93bd75a321e85027204390087364690f93be687aaa82babec153f139a94cf6ad94be123353ba8ebca33ad911c1f5cb5
+  data.tar.gz: 36ee952987081d8a69f9a9f58d37d5688b0d7caca1657860f8be7a1c6c5ea754c4782847b7de6c838d890864c9449f4aea9f91531af53ea43feeb7c086ff2090

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rspec

data/lib/varia_model/version.rb

@@ -1,3 +1,3 @@
 module VariaModel
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/varia_model.rb

@@ -214,7 +214,7 @@ module VariaModel
   #
   # @return [Object]
   def get_attribute(key)
-    _attributes_.dig(key.to_s)
+    eval_as_proc(_attributes_.dig(key.to_s))
   end
   alias_method :[], :get_attribute
 
@@ -254,10 +254,15 @@ module VariaModel
   #
   # @return [String]
   def to_json(options = {})
-    JSON.generate(_attributes_, options)
+    JSON.generate(to_hash, options)
   end
   alias_method :as_json, :to_json
 
+  # Convert the object to a hash.
+  def to_hash
+    _attributes_.inject({}) { |h, (k,v)| h[k] = eval_as_proc(v); h }
+  end
+
   protected
 
     # @param [String] attribute
@@ -269,6 +274,14 @@ module VariaModel
 
   private
 
+    # Send #call to the given object if it responds to it. If it doesn't, just return the
+    # object.
+    #
+    # @param [#call]
+    def eval_as_proc(obj)
+      obj.respond_to?(:call) ? obj.call : obj
+    end
+
     def carefree_assign(new_attrs = {})
       _attributes_.deep_merge!(new_attrs)
     end

data/spec/unit/varia_model_spec.rb

@@ -55,6 +55,12 @@ describe VariaModel do
 
         expect(subject.attributes.dig('attribute')).to eql('some value')
       end
+
+      it "allows an attribute that has a lambda default value" do
+        subject.attribute 'brooke', default: ->{ "winsor".upcase }
+
+        expect(subject.attributes.dig('brooke')).to be_a(Proc)
+      end
     end
 
     describe "::validations" do
@@ -468,6 +474,38 @@ describe VariaModel do
     it "returns nil if the dotted path matches no attributes" do
       expect(subject.get_attribute('brooke.costantini')).to be_nil
     end
+
+    it "returns the current value of the Proc" do
+      subject.brooke.winsor = ->{ "bacon".upcase }
+      expect(subject.get_attribute("brooke.winsor")).to eql("BACON")
+    end
+
+    it "returns the current value of the Proc each time" do
+      @magic = "ponies"
+      subject.brooke.winsor = -> { @magic }
+      expect(subject.get_attribute("brooke.winsor")).to eql("ponies")
+      @magic = "unicorns"
+      expect(subject.get_attribute("brooke.winsor")).to eql("unicorns")
+    end
+  end
+
+  describe "#[]" do
+    subject do
+      Class.new do
+        include VariaModel
+        attribute 'foo', default: ->{ String.new("Bacon").upcase }
+      end.new
+    end
+
+    it "returns the current value of the Proc" do
+      expect(subject['foo']).to eql("BACON")
+    end
+
+    it "returns the updated value of the Proc" do
+      subject['foo']
+      subject['foo'] = 'hello'
+      expect(subject['foo']).to eql('hello')
+    end
   end
 
   describe "#mass_assign" do
@@ -600,6 +638,13 @@ describe VariaModel do
 
       expect(subject.to_json).to eql(JSON.dump(first_name: "brooke", nick: "leblanc"))
     end
+
+    it "includes the most recent value for any Procs" do
+      subject.first_name = ->{ "seth".capitalize }
+      subject.nick = ->{ "name".upcase }
+
+      expect(subject.to_json).to eql(JSON.dump(first_name: "Seth", nick: "NAME"))
+    end
   end
 
   describe "#to_hash" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: varia_model
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie