unidata 0.0.2 → 0.0.3

data/lib/unidata/extensions.rb

@@ -3,4 +3,3 @@ require 'unidata/extensions/date'
 require 'unidata/extensions/float'
 require 'unidata/extensions/integer'
 require 'unidata/extensions/string'
-require 'unidata/extensions/time'

data/lib/unidata/extensions/big_decimal.rb

@@ -1,14 +1,19 @@
 require 'bigdecimal'
+require 'bigdecimal/util'
 
 module Unidata
   module Extensions
     module BigDecimal
+      def typecast(value)
+        value.kind_of?(::BigDecimal) ? value : value.to_d
+      end
+
       def to_unidata(value)
         (value * 100).to_i
       end
 
       def from_unidata(value)
-        ::BigDecimal.new(value.to_s) / 100
+        typecast(value) / 100
       end
     end
   end

data/lib/unidata/extensions/date.rb

@@ -5,6 +5,10 @@ module Unidata
     module Date
       PICK_EPOCH = ::Date.parse('1968-01-01')
 
+      def typecast(value)
+        value.kind_of?(::Date) ? value : value.to_date
+      end
+
       def to_unidata(value)
         (value - PICK_EPOCH).to_i
       end

data/lib/unidata/extensions/float.rb

@@ -1,12 +1,16 @@
 module Unidata
   module Extensions
     module Float
+      def typecast(value)
+        value.kind_of?(::Float) ? value : value.to_f
+      end
+
       def to_unidata(value)
-        ::BigDecimal.to_unidata(value)
+        (value * 100).to_i
       end
 
       def from_unidata(value)
-        ::BigDecimal.from_unidata(value).to_f
+        typecast(value) / 100
       end
     end
   end

data/lib/unidata/extensions/integer.rb

@@ -1,12 +1,16 @@
 module Unidata
   module Extensions
     module Integer
+      def typecast(value)
+        value.kind_of?(::Integer) ? value : value.to_i
+      end
+
       def to_unidata(value)
         value
       end
 
       def from_unidata(value)
-        value.to_i
+        typecast(value)
       end
     end
   end
@@ -14,4 +18,8 @@ end
 
 class Integer
   extend Unidata::Extensions::Integer
+
+  def to_d
+    BigDecimal.new(self.to_s)
+  end
 end

data/lib/unidata/extensions/string.rb

@@ -1,12 +1,16 @@
 module Unidata
   module Extensions
     module String
+      def typecast(value)
+        value.kind_of?(::String) ? value : value.to_s
+      end
+
       def to_unidata(value)
         value.upcase
       end
 
       def from_unidata(value)
-        value
+        typecast(value)
       end
     end
   end

data/lib/unidata/field.rb

@@ -8,6 +8,10 @@ module Unidata
       @type = type
     end
 
+    def typecast(value)
+      type.typecast(value)
+    end
+
     def to_unidata(value)
       type.to_unidata(value)
     end

data/lib/unidata/model.rb

@@ -28,10 +28,11 @@ module Unidata
       def to_unidata(instance)
         record = Unidata::UniDynArray.new
 
-        instance.attributes.each do |key, value|
+        fields.each do |key, field|
           next if key == :id
 
-          field = fields[key]
+          value = instance.send(key)
+          next if value.nil?
           record.replace *field.index, field.to_unidata(value)
         end
 
@@ -44,10 +45,8 @@ module Unidata
         fields.each do |key, field|
           next if key == :id
 
-          instance.send(
-            "#{key}=",
-            field.from_unidata(record.extract(*field.index).to_s)
-          )
+          value = record.extract(*field.index).to_s
+          instance.send("#{key}=", field.from_unidata(value))
         end
 
         instance
@@ -79,13 +78,11 @@ module Unidata
       end
     end
 
-    attr_reader :attributes
-
     def initialize(attributes={})
       @attributes = {}
       attributes.each do |key,value|
         next unless self.class.field?(key.to_sym)
-        @attributes[key.to_sym] = value
+        write_attribute(key, value)
       end
     end
 
@@ -100,7 +97,8 @@ module Unidata
     end
 
     def write_attribute(attribute_name, value)
-      @attributes[attribute_name.to_sym] = value
+      field = self.class.fields[attribute_name.to_sym]
+      @attributes[attribute_name.to_sym] = field.typecast(value)
     end
   end
 end

data/lib/unidata/version.rb

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

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ if ENV['COVERAGE']
 end
 
 require 'rspec'
+require 'time'
 require 'unidata'
 
 def package_local_constructor klass,*values

data/spec/unidata/field_spec.rb

@@ -22,14 +22,117 @@ describe Unidata::Field do
     end
   end
 
-  describe '#to_unidata' do
-    context 'when type is Time' do
-      it 'converts value to pick time' do
-        field = subject.new(1, :created_at, Time)
-        field.to_unidata(Time.parse('2012-04-02 12:34:00')).should == 16163
+  describe '#typecast' do
+    context 'when type is Date' do
+      context 'when value is a Date' do
+        it 'returns value' do
+          value = Date.today
+
+          field = subject.new(1, :created_on, Date)
+          field.typecast(value).should == value
+        end
+      end
+
+      context 'when value is not a Date' do
+        it 'converts value to a Date' do
+          value = Time.parse('2012-01-01 12:00:00')
+
+          field = subject.new(1, :created_on, Date)
+          field.typecast(value).should == Date.parse('2012-01-01')
+        end
+      end
+    end
+
+    context 'when type is String' do
+      context 'when value is a String' do
+        it 'returns value' do
+          value = 'John Doe'
+
+          field = subject.new(1, :name, String)
+          field.typecast(value).should == value
+        end
+      end
+
+      context 'when value is not a String' do
+        it 'converts value to a String' do
+          value1 = Time.parse('2012-01-01 12:00:00')
+          value2 = 12345
+
+          field = subject.new(1, :name, String)
+          field.typecast(value1).should == value1.to_s
+          field.typecast(value2).should == '12345'
+        end
+      end
+    end
+
+    context 'when type is Float' do
+      context 'when value is a Float' do
+        it 'returns value' do
+          value = 123.45
+
+          field = subject.new(1, :price, Float)
+          field.typecast(value).should == value
+        end
+      end
+
+      context 'when value is not a Float' do
+        it 'converts value to a Float' do
+          value1 = BigDecimal.new('123.45')
+          value2 = 12345
+
+          field = subject.new(1, :price, Float)
+          field.typecast(value1).should == 123.45
+          field.typecast(value2).should == 12345.0
+        end
       end
     end
 
+    context 'when type is BigDecimal' do
+      context 'when value is a BigDecimal' do
+        it 'returns value' do
+          value = BigDecimal.new('123.45')
+
+          field = subject.new(1, :price, BigDecimal)
+          field.typecast(value).should == value
+        end
+      end
+
+      context 'when value is not a BigDecimal' do
+        it 'converts value to a BigDecimal' do
+          value1 = 123.45
+          value2 = 12345
+
+          field = subject.new(1, :price, BigDecimal)
+          field.typecast(value1).should == BigDecimal.new('123.45')
+          field.typecast(value2).should == BigDecimal.new('12345.0')
+        end
+      end
+    end
+
+    context 'when type is Integer' do
+      context 'when value is a Integer' do
+        it 'returns value' do
+          value = 123
+
+          field = subject.new(1, :price, Integer)
+          field.typecast(value).should == value
+        end
+      end
+
+      context 'when value is not a Integer' do
+        it 'converts value to a Integer' do
+          value1 = BigDecimal.new('123.45')
+          value2 = 12345.0
+
+          field = subject.new(1, :price, Integer)
+          field.typecast(value1).should == 123
+          field.typecast(value2).should == 12345
+        end
+      end
+    end
+  end
+
+  describe '#to_unidata' do
     context 'when type is Date' do
       it 'converts value to pick time' do
         field = subject.new(1, :created_on, Date)
@@ -67,13 +170,6 @@ describe Unidata::Field do
   end
 
   describe '#from_unidata' do
-    context 'when type is Time' do
-      it 'converts value from pick time' do
-        field = subject.new(1, :created_at, Time)
-        field.from_unidata(16163).should == Time.parse('2012-04-02 00:00:00')
-      end
-    end
-
     context 'when type is Date' do
       it 'converts value from pick time' do
         field = subject.new(1, :created_on, Date)

data/spec/unidata/model_spec.rb

@@ -39,7 +39,7 @@ describe Unidata::Model do
   describe '.to_unidata' do
     before(:each) do
       @obj = Record.new(
-        :id         => 1234,
+        :id         => '1234',
         :name       => 'John Doe',
         :age        => 25,
         :birth_date => Date.today,
@@ -68,7 +68,7 @@ describe Unidata::Model do
   describe '.from_unidata' do
     before(:each) do
       @record = Unidata::UniDynArray.new
-      @record.replace 0, 123
+      @record.replace 0, '123'
       @record.replace 1, 'JOHN DOE'
       @record.replace 2, 25
       @record.replace 3, Date.to_unidata(Date.today)
@@ -96,18 +96,18 @@ describe Unidata::Model do
   describe '.exists?' do
     before(:each) do
       @connection = double('connection')
-      @connection.stub(:exists?).with('TEST', 123).and_return(true)
-      @connection.stub(:exists?).with('TEST', 234).and_return(false)
+      @connection.stub(:exists?).with('TEST', '123').and_return(true)
+      @connection.stub(:exists?).with('TEST', '234').and_return(false)
 
       Unidata.stub(:connection).and_return(@connection)
     end
 
     it 'returns true if record with id exists in file' do
-      Record.exists?(123).should == true
+      Record.exists?('123').should == true
     end
 
     it 'returns false if record with id does not exist in file' do
-      Record.exists?(234).should == false
+      Record.exists?('234').should == false
     end
   end
 
@@ -126,13 +126,13 @@ describe Unidata::Model do
     end
 
     it 'reads record from file' do
-      @connection.should_receive(:read).with('TEST', 123).and_return(@record)
-      Record.find(123)
+      @connection.should_receive(:read).with('TEST', '123').and_return(@record)
+      Record.find('123')
     end
 
     it 'returns model' do
       obj = Record.find(123)
-      obj.id.should == 123
+      obj.id.should == '123'
       obj.name.should == 'JOHN DOE'
       obj.age.should == 25
       obj.birth_date.should == Date.today
@@ -144,13 +144,25 @@ describe Unidata::Model do
 
   describe '#initialize' do
     it 'captures provied attributes' do
-      instance = Record.new(:id => 123, :name => 'John Doe')
-      instance.attributes.should == { :id => 123, :name => 'John Doe' }
+      instance = Record.new(:id => '123', :name => 'John Doe')
+      instance.id.should == '123'
+      instance.name.should == 'John Doe'
     end
 
     it 'ignores attributes that are not defined in fields' do
-      instance = Record.new(:id => 123, :name => 'John Doe', :nickname => 'J-Dog')
-      instance.attributes.should == { :id => 123, :name => 'John Doe' }
+      instance = Record.new(:id => '123', :name => 'John Doe', :nickname => 'J-Dog')
+      instance.should_not respond_to(:nickname)
+    end
+
+    it 'typecasts attributes' do
+      instance = Record.new(
+        :age => '12',
+        :birth_date => Time.parse('2012-01-01 12:00:00'),
+        :salary => '5000.00'
+      )
+      instance.age.should == 12
+      instance.birth_date.should == Date.parse('2012-01-01')
+      instance.salary.should == BigDecimal.new('5000.00')
     end
   end
 
@@ -160,7 +172,7 @@ describe Unidata::Model do
       Unidata.stub(:connection).and_return(connection)
 
       obj = Record.new(
-        :id         => 1234,
+        :id         => '1234',
         :name       => 'John Doe',
         :age        => 25,
         :birth_date => Date.today,
@@ -177,7 +189,7 @@ describe Unidata::Model do
       record.replace 4, 2, 'MANAGER'
       record.replace 4, 3, 6_000_000
 
-      connection.should_receive(:write).with('TEST', 1234, record)
+      connection.should_receive(:write).with('TEST', '1234', record)
       obj.save
     end
   end

metadata

@@ -2,14 +2,14 @@
 name: unidata
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeremy Israelsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,7 +75,6 @@ files:
 - lib/unidata/extensions/float.rb
 - lib/unidata/extensions/integer.rb
 - lib/unidata/extensions/string.rb
-- lib/unidata/extensions/time.rb
 - lib/unidata/field.rb
 - lib/unidata/model.rb
 - lib/unidata/version.rb

data/lib/unidata/extensions/time.rb

@@ -1,19 +0,0 @@
-require 'time'
-
-module Unidata
-  module Extensions
-    module Time
-      def to_unidata(value)
-        ::Date.to_unidata(value.to_date)
-      end
-
-      def from_unidata(value)
-        ::Date.from_unidata(value).to_time
-      end
-    end
-  end
-end
-
-class Time
-  extend Unidata::Extensions::Time
-end