dynamini 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3c9ae6d2dbeb10206578039daa3d7574c94a853
-  data.tar.gz: 0ef0e594c363b62c6bae8c98f31be5f362655ae1
+  metadata.gz: c17460deb3b08dafb342ebad70b0a8e44c27c010
+  data.tar.gz: 758474e9d031f108efd69f00d6895bcb7af70149
 SHA512:
-  metadata.gz: f2a9ca05976a847968a68a306f00bdb11d7e7bf87910ff7d99c6e2a43f13b555abb5b522910fd775c43f782606d3d6b636264d7844fc2d98e81f7976c7a13389
-  data.tar.gz: 210e3587ff76f28e94b58c637a301c5b67ce47fc9109917e25191b28688068c5fab03da8ffb05c407dd2dbc47b4ddbb5b1e76d75f7c35d865afa3b5a1f191e10
+  metadata.gz: d21d68d87d2c27a74cf8bded50632fdb772351805d3964cdde00354c5a44034127ca28c2f2a3e7e706ca6563c3593b897c0287430342e0364da83f7d1ae67d26
+  data.tar.gz: 69bcf0301927025a4a4623a530360f856a493a7e8bd55b6a170e0bf08bf92d935d0a51b45101e731b26813a07c75e0a7b8620758e2f6403f2249416914b9b4f9

data/lib/dynamini/base.rb

@@ -6,12 +6,25 @@ module Dynamini
     BATCH_SIZE = 25
 
     class << self
-      attr_writer :hash_key, :table_name, :batch_write_queue, :in_memory
+      attr_writer :batch_write_queue, :in_memory
 
       def table_name
         @table_name || name.demodulize.downcase.pluralize
       end
 
+      def set_table_name(name)
+        @table_name = name
+      end
+
+      def set_hash_key(key)
+        @hash_key = key
+      end
+
+      def handle(column, format_class, options={})
+        define_handled_getter(column, format_class, options)
+        define_handled_setter(column)
+      end
+
       def hash_key
         @hash_key || :id
       end
@@ -96,36 +109,37 @@ module Dynamini
 
     end
 
+    #### Instance Methods
+
     def initialize(attributes={}, new_record = true)
-      @attributes = attributes
       @changed = Set.new
       @new_record = new_record
-      add_changed(attributes) if new_record
+      @attributes = {}
+
+      attributes.each do |k, v|
+        write_attribute(k, v, new_record)
+      end
     end
 
+
     def ==(object)
       hash_key == object.hash_key if object.is_a?(self.class)
     end
 
     def assign_attributes(attributes)
       attributes.each do |key, value|
-        record_change(key, read_attribute(key), value)
+        write_attribute(key, value)
       end
-      @attributes.merge!(attributes)
       nil
     end
 
     def update_attribute(key, value)
-      record_change(key, value, @attributes[key])
-      @attributes[key] = value
+      write_attribute(key, value)
       save!
     end
 
     def update_attributes(attributes)
-      attributes.each do |key, value|
-        record_change(key, read_attribute(key), value)
-      end
-      @attributes.merge!(attributes)
+      assign_attributes(attributes)
       save!
     end
 
@@ -202,7 +216,7 @@ module Dynamini
     end
 
     def touch_to_dynamo
-      self.class.client.update_item(table_name: self.class.table_name, key: key, attribute_updates: {updated_at: {value: updated_at, action: 'PUT'}})
+      self.class.client.update_item(table_name: self.class.table_name, key: key, attribute_updates: {updated_at: {value: attributes[:updated_at], action: 'PUT'}})
     end
 
     def delete_from_dynamo
@@ -259,14 +273,47 @@ module Dynamini
       name =~ /^([a-zA-Z][-_\w]*)=.*$/
     end
 
+    def self.define_handled_getter(column, format_class, options={})
+      case format_class
+        when :integer
+          proc = Proc.new {|v| v.to_i}
+        when :datetime
+          proc = Proc.new {|v| Time.at(v.to_f)}
+        when :float
+          proc = Proc.new {|v| v.to_f}
+        when :symbol
+          proc = Proc.new {|v| v.to_sym}
+        when :string
+          proc = Proc.new {|v| v}
+        else
+          raise 'Unsupported data type: ' + format_class.to_s
+      end
+
+      define_method(column) do
+        if read_attribute(column)
+          proc.call(read_attribute(column))
+        else
+          options[:default] || nil
+        end
+      end
+    end
+
+    def self.define_handled_setter(column)
+      setter_symbol = (column.to_s + '=').to_sym
+
+      define_method(setter_symbol) do |value|
+        write_attribute(column, value)
+      end
+    end
+
     def respond_to_missing?(name, include_private=false)
       @attributes.keys.include?(name) || write_method?(name) || super
     end
 
-    def write_attribute(attribute, new_value)
+    def write_attribute(attribute, new_value, record_change=true)
       old_value = @attributes[attribute]
-      @attributes[attribute] = new_value
-      record_change(attribute, new_value, old_value)
+      @attributes[attribute] = (new_value.nil? ? nil : new_value.to_s)
+      record_change(attribute, new_value.to_s, old_value) if record_change
     end
 
     def record_change(attribute, new_value, old_value)
@@ -276,5 +323,10 @@ module Dynamini
     def read_attribute(name)
       @attributes[name]
     end
+
+    #### Default class macros
+
+    handle :updated_at, :datetime
+    handle :created_at, :datetime
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Greg Ward
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel