dymos 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b894d9241914afc233192cd1da3794a69b92ab2
-  data.tar.gz: e76acf5fddcbff9209328938dd0cd8467443c92a
+  metadata.gz: bcc2ca53b227af59529709c865fbec440d59b561
+  data.tar.gz: ae44901535497e1e3c0d771aa89167c82659d9fb
 SHA512:
-  metadata.gz: 881ce83d77e2fcf3fc8f65c2b55e8b3b3dc2e472b1c3c38023e0867fae7da79ccc68f730489e5fa87f593f7d7c33f826cc20b1f7fcb1cd16a10bca7a79519f2b
-  data.tar.gz: c26127e28cb0b5e0712939cf7afda440567d22088dd877712eff84c395273de8a873c00024271e37a8635e1d4ff75dea3e87511d6c71a61ab9bc4f8e06aa31ec
+  metadata.gz: 163fafcafb4f7d3b9501a85a39f209aa5bf003af6cb7eb9d262178fca672d4b2a6d953dd0cd1b162678bde892f7eb73ce8f182928fa0fd2722f989b01f1a436d
+  data.tar.gz: c2e1d1b19404ec4fc4d94575393eea33841c32b67b19d8e5913df4c2253ac1c2a2b6b76ced15cca79459ff49207ff3c0e78fac002f3953c0dbb500deadc01b60

data/dymos.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "fake_dynamo"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "timecop"
   spec.add_development_dependency "activemodel", '~> 4.1.5'
 
   spec.add_dependency "aws-sdk-core", "2.0.0.rc15"

data/lib/dymos.rb

@@ -16,3 +16,25 @@ require "dymos/version"
 
 module Dymos
 end
+
+module Aws
+  module DynamoDB
+    class AttributeValue
+      class Marshaler
+        def format(obj)
+          case obj
+            when String then { s: obj }
+            when Time then { s: obj.iso8601 }
+            when Numeric then { n: obj.to_s }
+            when StringIO, IO then { b: obj.read }
+            when Set then format_set(obj)
+            else
+              msg = "unsupported type, expected Set, String, Numeric, or "
+              msg << "IO object, got #{obj.class.name}"
+              raise ArgumentError, msg
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dymos/model.rb

@@ -22,16 +22,28 @@ module Dymos
           default: default
       }
       define_attribute_methods attr
-      define_method(attr) { read_attribute(attr) || default }
+      define_method(attr) {|raw=false|
+        val=read_attribute(attr) || default
+        return val if raw
+        if type == :time && val.present?
+          Time.parse val
+        else
+          val
+        end
+      }
       define_method("#{attr}_type") { type }
       define_method("#{attr}?") { !read_attribute(attr).nil? }
-      define_method("#{attr}=") { |value| write_attribute(attr, value) }
+      define_method("#{attr}=") do |value, initialize=false|
+        value = value.iso8601 if self.class.fields.include?(attr) && value.is_a?(Time)
+        write_attribute(attr, value, initialize)
+      end
     end
 
     def self.fields
       @fields
     end
 
+
     def self.table(name)
       define_singleton_method('table_name') { name }
       define_method('table_name') { name }
@@ -40,15 +52,15 @@ module Dymos
     def attributes=(attributes = {}, initialize = false)
       if attributes
         attributes.each do |attr, value|
-          write_attribute(attr, value, initialize)
+          send("#{attr}=", value, initialize) if respond_to? "#{attr}="
         end
       end
     end
 
-    def attributes
+    def attributes(raw=false)
       attrs = {}
       @attributes.keys.each do |name|
-        attrs[name] = read_attribute(name)
+        attrs[name] = send "#{name}", raw if respond_to? "#{name}"
       end
       attrs
     end

data/lib/dymos/persistence.rb

@@ -21,7 +21,7 @@ module Dymos
 
     def save(*)
       create_or_update
-    rescue
+    rescue => e
       false
     end
 
@@ -43,10 +43,17 @@ module Dymos
     end
 
     def _update_record()
-      _create_record
+      send :updated_at=, Time.new.iso8601 if respond_to? :updated_at
+      _execute
     end
 
     def _create_record()
+      send :created_at=, Time.new.iso8601 if respond_to? :created_at
+      send :updated_at=, Time.new.iso8601 if respond_to? :updated_at
+      _execute
+    end
+
+    def _execute()
       result = self.class.put.item(attributes).execute
       changes_applied
       @new_record = false

data/lib/dymos/version.rb

@@ -1,3 +1,3 @@
 module Dymos
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/lib/dymos/model_spec.rb

@@ -6,6 +6,9 @@ describe Dymos::Model do
     field :email, :string
     field :list, :string_set
 
+    field :created_at, :time
+    field :updated_at, :time
+
     validates :id, :presence => true
     validates :name, :presence => true, length: {maximum: 8}
     validates :email, :presence => true, format: {with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i}
@@ -32,17 +35,17 @@ describe Dymos::Model do
 
     client.delete_table(table_name: 'dummy') if client.list_tables[:table_names].include?('dummy')
     client.create_table(
-        table_name: 'dummy',
-        attribute_definitions: [
-            {attribute_name: 'id', attribute_type: 'S'}
-        ],
-        key_schema: [
-            {attribute_name: 'id', key_type: 'HASH'}
-        ],
-        provisioned_throughput: {
-            read_capacity_units: 1,
-            write_capacity_units: 1,
-        })
+            table_name: 'dummy',
+            attribute_definitions: [
+                {attribute_name: 'id', attribute_type: 'S'}
+            ],
+            key_schema: [
+                {attribute_name: 'id', key_type: 'HASH'}
+            ],
+            provisioned_throughput: {
+                read_capacity_units: 1,
+                write_capacity_units: 1,
+            })
     client.put_item(table_name: 'dummy', item: {id: 'hoge', name: '太郎', list: Set['a', 'b', 'c']})
     client.put_item(table_name: 'dummy', item: {id: 'fuga', name: '次郎'})
     client.put_item(table_name: 'dummy', item: {id: 'piyo', name: '三郎'})
@@ -50,26 +53,26 @@ describe Dymos::Model do
 
     client.delete_table(table_name: 'post') if client.list_tables[:table_names].include?('post')
     client.create_table(
-        table_name: 'post',
-        attribute_definitions: [
-            {attribute_name: 'id', attribute_type: 'S'},
-            {attribute_name: 'timestamp', attribute_type: 'N'},
-        ],
-        key_schema: [
-            {attribute_name: 'id', key_type: 'HASH'},
-            {attribute_name: 'timestamp', key_type: 'RANGE'},
-        ],
-        provisioned_throughput: {
-            read_capacity_units: 1,
-            write_capacity_units: 1,
-        })
+            table_name: 'post',
+            attribute_definitions: [
+                {attribute_name: 'id', attribute_type: 'S'},
+                {attribute_name: 'timestamp', attribute_type: 'N'},
+            ],
+            key_schema: [
+                {attribute_name: 'id', key_type: 'HASH'},
+                {attribute_name: 'timestamp', key_type: 'RANGE'},
+            ],
+            provisioned_throughput: {
+                read_capacity_units: 1,
+                write_capacity_units: 1,
+            })
   end
 
 #  let(:model) { Dummy.new }
 
   describe :fields do
     it do
-      expect(DummyUser.fields.keys).to eq([:id, :name, :email, :list])
+      expect(DummyUser.fields.keys).to eq([:id, :name, :email, :list, :created_at, :updated_at])
     end
   end
   describe "クラスマクロのデフォルト値" do
@@ -189,13 +192,34 @@ describe Dymos::Model do
       end
     end
 
-    describe :save do
+    describe :save, :order => :defined do
       it '書き込み' do
         user = DummyUser.new
         user.id = 'aiueo'
         user.name = '四郎'
-        result = user.save
+        user.email = 'hoge@sample.net'
+        expect(user.created_at).to eq(nil)
+        now = Time.now
+        Timecop.freeze(now)
+        result = user.save!
         expect(result).to eq(true)
+        expect(user.created_at.to_s).to eq(now.to_s)
+        expect(user.updated_at.to_s).to eq(now.to_s)
+      end
+
+      it '更新' do
+        user = DummyUser.new
+        user.id = 'aiueo'
+        user.name = '四郎'
+        user.email = 'hoge@sample.net'
+        now = Time.now
+        Timecop.freeze(now)
+        user.save!
+        user.email = 'hoge@sample.net'
+        Timecop.freeze(now+1)
+        user.save!
+        expect(user.created_at.to_s).to eq(now.to_s)
+        expect(user.updated_at.to_s).not_to eq(now.to_s)
       end
     end
 

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ Coveralls.wear!
 
 require 'rubygems'
 require 'bundler/setup'
-
+require 'timecop'
 require 'dymos'
 
 I18n.enforce_available_locales = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dymos
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - hoshina85
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement