depository 0.1.3 → 0.1.4

data/lib/depository/collection.rb

@@ -3,6 +3,7 @@ require 'forwardable'
 
 require 'depository/sequel'
 require 'depository/collection_config'
+require 'depository/serialize'
 
 module Depository
   RecordNotFound        = Class.new(RuntimeError)
@@ -31,19 +32,13 @@ module Depository
       end
 
       def save(model)
-        if model.send(config.primary_key)
-          model.updated_at = Time.now if model.respond_to?(:updated_at=)
+        pkey = config.primary_key
 
-          db.where(config.primary_key => model.send(config.primary_key)).
-            update(pack(model.to_hash))
+        if new?(model)
+          model.send(:"#{pkey}=", db.insert(Serialize.pack(config, model)))
         else
-          time = Time.now
-
-          [:created_at=, :updated_at=].each do |stamp|
-             model.send(stamp, time) if model.respond_to?(stamp)
-          end
-
-          model.send(:"#{config.primary_key}=", db.insert(pack(model.to_hash)))
+          db.where(pkey => model.send(pkey)).
+            update(Serialize.pack(config, model))
         end
 
         return model
@@ -79,20 +74,16 @@ module Depository
         when Array
           attrs.map(&method(:convert))
         when Hash
-          config.model.new(unpack(attrs))
+          config.model.new(Serialize.unpack(config, attrs))
         else
           raise UnknownConversionType, "unable to convert #{attrs.inspect}"
         end
       end
 
-      def pack(attrs)
-        config.packer.call(attrs)
-        attrs
-      end
+    private
 
-      def unpack(attrs)
-        config.unpacker.call(attrs)
-        attrs
+      def new?(model)
+        model.send(config.primary_key).nil?
       end
     end
   end

data/lib/depository/serialize.rb

@@ -0,0 +1,67 @@
+module Depository
+  module Serialize
+    def self.pack(*args)
+      Packer.new(*args).call
+    end
+
+    def self.unpack(*args)
+      Unpacker.new(*args).call
+    end
+
+    class Packer
+      attr_protected :config, :model
+
+      def initialize(config, model)
+        self.config = config
+        self.model = model
+      end
+
+      def call
+        attrs = normalize(model.to_hash)
+
+        config.packer.call(attrs)
+        set_timestamps(attrs, model)
+
+        model.set(Serialize.unpack(config, attrs.dup))
+        attrs
+      end
+
+    private
+
+      def set_timestamps(attrs, model)
+        now = Time.now
+
+        attrs[:updated_at] = now if model.respond_to?(:updated_at=)
+        attrs[:created_at] = now if model.respond_to?(:created_at=) &&
+          !model.send(config.primary_key)
+      end
+
+      def normalize(attrs)
+        attrs = attrs.dup
+
+        Depository::Database.db.schema(config.db).reject { |column, opts|
+          attrs[column].nil?
+        }.each do |column, opts|
+          attrs[column] = attrs[column].to_i if opts[:type] == :integer
+        end
+
+        attrs
+      end
+    end
+
+    class Unpacker
+      attr_protected :config, :attrs
+
+      def initialize(config, attrs)
+        self.config = config
+        self.attrs = attrs
+      end
+
+      def call
+        config.unpacker.call(attrs)
+        attrs
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: depository
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -111,6 +111,7 @@ files:
 - lib/depository/model.rb
 - lib/depository/result.rb
 - lib/depository/sequel.rb
+- lib/depository/serialize.rb
 homepage: https://github.com/pratt121/depository
 licenses:
 - WTFPL