unidata 0.0.3 → 0.0.4

data/lib/unidata/field.rb

@@ -1,11 +1,20 @@
 module Unidata
   class Field
-    attr_reader :index, :name, :type, :formatter
+    attr_reader :index, :name, :type
 
-    def initialize(index, name, type=String)
+    def initialize(index, name, type=String, options={})
       @index = [*index]
       @name = name
       @type = type
+      @default = options[:default]
+    end
+
+    def default
+      if @default.respond_to?(:call)
+        @default.call
+      else
+        @default
+      end
     end
 
     def typecast(value)

data/lib/unidata/model.rb

@@ -20,8 +20,8 @@ module Unidata
         fields.keys.include?(name.to_sym)
       end
 
-      def field(index, name, type=String)
-        fields[name.to_sym] = Field.new(index, name, type)
+      def field(index, name, type=String, options={})
+        fields[name.to_sym] = Field.new(index, name, type, options)
         define_attribute_accessor(name)
       end
 
@@ -79,8 +79,9 @@ module Unidata
     end
 
     def initialize(attributes={})
-      @attributes = {}
-      attributes.each do |key,value|
+      initialize_attributes
+
+      attributes.each do |key, value|
         next unless self.class.field?(key.to_sym)
         write_attribute(key, value)
       end
@@ -92,13 +93,23 @@ module Unidata
     end
 
     private
+    def initialize_attributes
+      @attributes = {}
+
+      self.class.fields.each do |key, field|
+        write_attribute(key, field.default)
+      end
+    end
+
     def read_attribute(attribute_name)
       @attributes[attribute_name.to_sym]
     end
 
     def write_attribute(attribute_name, value)
       field = self.class.fields[attribute_name.to_sym]
-      @attributes[attribute_name.to_sym] = field.typecast(value)
+      value = field.typecast(value) unless value.nil?
+
+      @attributes[attribute_name.to_sym] = value
     end
   end
 end

data/lib/unidata/version.rb

@@ -1,3 +1,3 @@
 module Unidata
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/unidata/field_spec.rb

@@ -20,6 +20,46 @@ describe Unidata::Field do
       field = subject.new(2, :name)
       field.type.should == String
     end
+
+    context 'when default value provided' do
+      it 'captures default value' do
+        field = subject.new(3, :status, String, :default => 'N')
+        field.default.should == 'N'
+      end
+    end
+
+    context 'when default value not provided' do
+      it 'does not set default value' do
+        field = subject.new(3, :status, String)
+        field.default.should be_nil
+      end
+    end
+  end
+
+  describe '#default' do
+    context 'when default is a proc/lambda/etc' do
+      it 'evaluates and returns result of default' do
+        field = subject.new(4, :created, Date, :default => proc { Date.today })
+        field.default.should == Date.today
+
+        field = subject.new(4, :created, Date, :default => lambda { Date.today })
+        field.default.should == Date.today
+      end
+    end
+
+    context 'when default is a not a proc/lambda/etc' do
+      it 'returns default' do
+        field = subject.new(3, :status, String, :default => 'active')
+        field.default.should == 'active'
+      end
+    end
+
+    context 'when no default defined' do
+      it 'returns nil' do
+        field = subject.new(2, :name)
+        field.default.should be_nil
+      end
+    end
   end
 
   describe '#typecast' do

data/spec/unidata/model_spec.rb

@@ -12,6 +12,7 @@ describe Unidata::Model do
     field [4,1],  :employer
     field [4,2],  :job_title
     field [4,3],  :salary,      BigDecimal
+    field 5,      :status,      String,     :default => 'active'
   end
 
   describe '.connection' do
@@ -22,11 +23,17 @@ describe Unidata::Model do
   end
 
   describe '.field' do
-    it 'adds Field with given index, name, and type to fields hash' do
+    it 'adds Field with given index, name, type, and options to fields hash' do
       field = Record.fields[:age]
       field.index.should == [2]
       field.name.should == :age
       field.type.should == Integer
+
+      field = Record.fields[:status]
+      field.index.should == [5]
+      field.name.should == :status
+      field.type.should == String
+      field.default.should == 'active'
     end
 
     it 'defines attribute reader/writer for field' do
@@ -45,7 +52,8 @@ describe Unidata::Model do
         :birth_date => Date.today,
         :employer   => 'Awesome Company',
         :job_title  => 'Manager',
-        :salary     => BigDecimal.new('60_000.00')
+        :salary     => BigDecimal.new('60_000.00'),
+        :status     => 'inactive'
       )
     end
 
@@ -57,6 +65,7 @@ describe Unidata::Model do
       record.extract(4, 1).to_s.should == 'AWESOME COMPANY'
       record.extract(4, 2).to_s.should == 'MANAGER'
       record.extract(4, 3).to_s.should == '6000000'
+      record.extract(5).to_s.should == 'INACTIVE'
     end
 
     it 'skips id field' do
@@ -75,6 +84,7 @@ describe Unidata::Model do
       @record.replace 4, 1, 'AWESOME COMPANY'
       @record.replace 4, 2, 'MANAGER'
       @record.replace 4, 3, 6_000_000
+      @record.replace 5, 'INACTIVE'
     end
 
     it 'converts UniDynArray to model' do
@@ -85,6 +95,7 @@ describe Unidata::Model do
       obj.employer.should == 'AWESOME COMPANY'
       obj.job_title.should == 'MANAGER'
       obj.salary.should == BigDecimal.new('60_000.00')
+      obj.status.should == 'INACTIVE'
     end
 
     it 'skips id field' do
@@ -120,6 +131,7 @@ describe Unidata::Model do
       @record.replace 4, 1, 'AWESOME COMPANY'
       @record.replace 4, 2, 'MANAGER'
       @record.replace 4, 3, 6_000_000
+      @record.replace 5, 'INACTIVE'
 
       @connection = double('connection', :read => @record)
       Unidata.stub(:connection).and_return(@connection)
@@ -139,14 +151,21 @@ describe Unidata::Model do
       obj.employer.should == 'AWESOME COMPANY'
       obj.job_title.should == 'MANAGER'
       obj.salary.should == BigDecimal.new('60_000.00')
+      obj.status.should == 'INACTIVE'
     end
   end
 
   describe '#initialize' do
     it 'captures provied attributes' do
-      instance = Record.new(:id => '123', :name => 'John Doe')
+      instance = Record.new(:id => '123', :name => 'John Doe', :status => 'inactive')
       instance.id.should == '123'
       instance.name.should == 'John Doe'
+      instance.status.should == 'inactive'
+    end
+
+    it 'defaults attributes if field defines a default value' do
+      instance = Record.new(:id => '123', :name => 'John Doe')
+      instance.status.should == 'active'
     end
 
     it 'ignores attributes that are not defined in fields' do
@@ -178,7 +197,8 @@ describe Unidata::Model do
         :birth_date => Date.today,
         :employer   => 'Awesome Company',
         :job_title  => 'Manager',
-        :salary     => BigDecimal.new('60_000.00')
+        :salary     => BigDecimal.new('60_000.00'),
+        :status     => 'inactive'
       )
 
       record = Unidata::UniDynArray.new
@@ -188,6 +208,7 @@ describe Unidata::Model do
       record.replace 4, 1, 'AWESOME COMPANY'
       record.replace 4, 2, 'MANAGER'
       record.replace 4, 3, 6_000_000
+      record.replace 5, 'INACTIVE'
 
       connection.should_receive(:write).with('TEST', '1234', record)
       obj.save

metadata

@@ -2,7 +2,7 @@
 name: unidata
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jeremy Israelsen