diva 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c42c53cdc1c9bbdcaca44be78cb1802a4a8c2d
-  data.tar.gz: 5a82b7d204e5d1da8b4be122b5a760d218ee4f18
+  metadata.gz: bbd71e6eab2ac33b0889772975d9eca73bc410b4
+  data.tar.gz: 9b22e2df9cef290b873554f511266cbd844cbebc
 SHA512:
-  metadata.gz: adbe743fa2579e3575623f0923e33f25b2e8ecf1dfab8ffdd8b0cd994d2416642d264af978e48b2a0f43add06d2d2739fc4415cfe0c1ed20d7b9e6b386e40d20
-  data.tar.gz: 175d0fb4142c27b823862135330f73e2969f8be74e6abc4977d10c035ed6492fe0192b57da6ee8add473b3d7a794abf56207e1f21ff80945122c1060c89cfdb1
+  metadata.gz: 5f13d1159a00b3476b2ce4718a11d3dda0cd037210bab256d3d6b2e32aa0fcd71afc2b3366446b538ba867b0a907411f91f54f45a722cfe17f723a80fd0c1bd9
+  data.tar.gz: 60a7677cbba7d4716b7246428c36b9b27e15ad9a4fc7299a7eb03de2594fcb8cb6f9f5945f40f7d4a4877121e005c4c3008608ab65307ff4d095fa0f16b7f7b6

data/lib/diva/field.rb

@@ -19,6 +19,10 @@ module Diva
       @required = !!required
     end
 
+    def dump_for_json(value)
+      type.dump_for_json(value)
+    end
+
     def required?
       required
     end

data/lib/diva/model.rb

@@ -86,7 +86,9 @@ class Diva::Model
   end
 
   def to_json(*rest, **kwrest)
-    to_hash.to_json(*rest, **kwrest)
+    Hash[
+      self.class.fields.map{|f| [f.name, f.dump_for_json(fetch(f.name))] }
+    ].to_json(*rest, **kwrest)
   end
 
   # カラムの生の内容を返す

data/lib/diva/type.rb

@@ -27,6 +27,8 @@ Diva::Modelのサブクラスであれば、それを制約とすることがで
 配列の全ての要素が設定された制約を満たしていれば、配列制約が満たされたことになる。
 
 =end
+require "time"
+
 module Diva::Type
   extend self
 
@@ -61,6 +63,10 @@ module Diva::Type
       name.to_s
     end
 
+    def dump_for_json(value)
+      value
+    end
+
     def inspect
       "Diva::Type(#{to_s})"
     end
@@ -113,14 +119,19 @@ module Diva::Type
       v.to_s
     end
   end
-  TIME = AtomicType.new(:time) do |v|
+  class TimeType < AtomicType
+    def dump_for_json(value)
+      cast(value).iso8601
+    end
+  end
+  TIME = TimeType.new(:time) do |v|
     case v
     when Time
       v
     when Integer, Float
       Time.at(v)
     when String
-      Time.new(v)
+      Time.iso8601(v)
     else
       raise Diva::InvalidTypeError, "The value is not a `#{name}'."
     end
@@ -171,6 +182,10 @@ module Diva::Type
       value.to_a.map(&@type.method(:cast))
     end
 
+    def dump_for_json(value)
+      value.to_a.map(&@type.method(:dump_for_json))
+    end
+
     def to_s
       "Array of #{@type.to_s}"
     end
@@ -190,6 +205,14 @@ module Diva::Type
       end
     end
 
+    def dump_for_json(value)
+      if value.nil?
+        value
+      else
+        @type.dump_for_json(value)
+      end
+    end
+
     def to_s
       "#{@type.to_s}|nil"
     end

data/lib/diva/version.rb

@@ -1,3 +1,3 @@
 module Diva
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diva
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Implementation of expression for handling things.