yukata 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7b57e16a64efce928a8711ebd9d5e5eb365b369
-  data.tar.gz: 0d2286cb23cc7d2f990dbe80bf76320186a74bab
+  metadata.gz: 47de67ec0d74b7c728b0dc79e75593a28e13b6e0
+  data.tar.gz: 6cd1408ee0ae9f0a16c6ac9001a9ed44feb9f6e2
 SHA512:
-  metadata.gz: f73c161f1afbead3c48916976e0bc775c2741bdce4a94e03a737ecbee2d26ed30b12fd27c358e561f892543aeb7f5e1466363a185e67b9749eda1df5043a895a
-  data.tar.gz: 68749b61090828c39497aac9bb26d281b5ece1ad4cd19faa9810782591e3962610a158bb3100d749499562b541e11294841a9a3b439c277566615938893b4f4b
+  metadata.gz: 4cbe5ea69916821c14b0206237c6ec6b127067fae342043bb0a6a0b9000827479a06401ca16b69f6b371de7b82fc481dbaaeafef5baeeaa3b2ce38f1b7cd99ad
+  data.tar.gz: 413d548b175d35a8b8cda4e7cde9c321716d367d610eb1f7bba0bcdf29c77cedd67fdd23b7b36885354e3f58397435c27d2596a9d1e4939afdf57fe1c60b987f

data/README.md

@@ -13,9 +13,13 @@ class Author < Yukata::Base
 end
 
 class Book < Yukata::Base
-  attribute :title,  String
-  attribute :author, Author
-  attribute :created_at, Date, default: -> { Date.today }
+  attribute :title,      String
+  attribute :author,     Author, coerce: false
+  attribute :created_at, Date,   default: -> { Date.today }, writer: false
+
+  def author=(value)
+    @author = Author.new(value.to_h)
+  end
 end
 
 book = Book.new({

data/lib/yukata/base.rb

@@ -22,7 +22,7 @@ module Yukata
     def attributes
       hash = {}
       self.class.attributes.keys.each do |k|
-        hash[k] = self.send(k)
+        hash[k] = send(k) if respond_to?(k)
       end
       hash
     end
@@ -35,30 +35,51 @@ module Yukata
       @attributes ||= {}
     end
 
+    # @override
+    def self.attr_accessor(*args)
+      args.each { |name| self.attributes[name] = Attribute.new(Object) }
+      super
+    end
+
     # Declares an attribute on the model
     #
     # @param name [String]
     # @param type [Class] a class that represents the type
     # @param options [Hash] extra options to apply to the attribute
     def self.attribute(name, type=String, options={})
+      config = { writer: true, reader: true, coerce: true }.merge(options)
+
       attr = Attribute.new(type, options)
       self.attributes[name] = attr
       variable = "@#{name}"
 
-      define_method("#{name}=") do |object|
-        val = Yukata.coercer.coerce(object, attr.type)
-        instance_variable_set(variable, val)
+      # -------------
+      # Define Writer
+      # -------------
+      if config[:writer]
+        define_method("#{name}=") do |object|
+          if config[:coerce]
+            val = Yukata.coercer.coerce(object, attr.type)
+            instance_variable_set(variable, val)
+          else
+            instance_variable_set(variable, object)
+          end
+        end
       end
 
-      define_method(name) do
-        val = instance_variable_get(variable)
-        unless val
-          val = attr.default
-          instance_variable_set(variable, val)
+      # -------------
+      # Define reader
+      # -------------
+      if config[:reader]
+        define_method(name) do
+          val = instance_variable_get(variable)
+          unless val
+            val = attr.default
+            instance_variable_set(variable, val)
+          end
+          val
         end
-        val
       end
-
     end
   end
 end

data/lib/yukata/version.rb

@@ -1,3 +1,3 @@
 module Yukata
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/base_spec.rb

@@ -2,29 +2,70 @@ require 'spec_helper'
 
 describe Yukata::Base do
   class MockedBase < Yukata::Base
+    attr_accessor :qux
     attribute :id,         Integer
     attribute :foo,        String
-    attribute :created_at, DateTime, default: -> { DateTime.now }
+    attribute :created_at, Date, default: -> { Date.today }
   end
 
+  let(:today) { Date.today }
+  let(:params) { { id: '1', foo: 'bar', created_at: today, qux: 'doh' } }
+
   describe '#initialize' do
     context 'when a hash is not passed' do
       subject { MockedBase.new }
 
-      its(:id) { should be_nil }
-      its(:foo) { should be_nil }
-      its(:created_at) { should_not be_nil }
+      it 'sets id to nil' do
+        expect(subject.id).to be_nil
+      end
+
+      it 'sets foo to nil' do
+        expect(subject.foo).to be_nil
+      end
+
+      it 'sets qux to nil' do
+        expect(subject.qux).to be_nil
+      end
     end
 
     context 'when a hash is passed' do
-      let(:now) { DateTime.now }
-      let(:params) { { id: '1', foo: 'bar', created_at: now } }
-
       subject { MockedBase.new(params) }
 
-      its(:id) { should eq(1) }
-      its(:foo) { should eq('bar') }
-      its(:created_at) { should eq(now) }
+      it 'sets id to 1' do
+        expect(subject.id).to eq(1)
+      end
+
+      it 'sets foo to "bar"' do
+        expect(subject.foo).to eq('bar')
+      end
+
+      it 'sets qux to "doh"' do
+        expect(subject.qux).to eq('doh')
+      end
+
+      it 'sets created_at to today' do
+        expect(subject.created_at).to eq(today)
+      end
+    end
+  end
+
+  describe '#attributes' do
+    subject { MockedBase.new(params).attributes }
+
+    it 'contains the :id' do
+      expect(subject[:id]).to eq(1)
+    end
+
+    it 'contains the :foo' do
+      expect(subject[:foo]).to eq('bar')
+    end
+
+    it 'contains the :qux' do
+      expect(subject[:qux]).to eq('doh')
+    end
+
+    it 'contains the :created_at' do
+      expect(subject[:created_at]).to eq(today)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yukata
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Matthew Johnston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler