type_struct 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62411529ae4d443eb76c8e65ec081314decf3fc1
-  data.tar.gz: 18398c63d48e66b1f7cb92f88a2e8369e0c2e707
+  metadata.gz: cbecb2844975883551a46f903fbf34f9439e41b2
+  data.tar.gz: f58dee879f4b19b1d6af9881f69cca31d156f1c2
 SHA512:
-  metadata.gz: e2de24f4d580ed09776828a16d5b66779eeffa4edd5a99efc2b18ca1e698e97fb7107175e9cb99d92f1da752abbfd1dd277e42adf1e674acb4db7c25aeb9f372
-  data.tar.gz: 9ecf7b2fddfabfb78b353b7f2999b4d7036aaefef259ee043bd683c994103c0028e9a983f2393b0cfe5320d7a47bcf2faa95645c3f488e5c80337685aa6a273e
+  metadata.gz: b7d605b64ed3a8c7a0c988acbddcb9236f51fd2e58b25f3ca040a1d7e9e2cd28cd3f013cf406e8dec0531bc7c329cb116494f2c2d9c3a32fe01c843e86156196
+  data.tar.gz: bbec831d29e3edcbbcd764e1dc462335f899d94c106ca45b6b6bf8f39c9cc66aadd70fc91bb3df89e838620310e35293d62d277dc7d0a20eafed9f6550a6f3fc

data/lib/type_struct.rb

@@ -64,7 +64,7 @@ class TypeStruct
   module ClassMethods
     def from_hash(arg)
       unless h = Hash.try_convert(arg)
-        raise TypeError, "#{self}.from_hash only accept Hash got `#{h.class}'"
+        raise TypeError, "no implicit conversion from #{arg} to Hash"
       end
       args = {}
       errors = []

data/lib/type_struct/generator.rb

@@ -22,34 +22,36 @@ class TypeStruct
       io = StringIO.new
       io.puts "#{name} = TypeStruct.new("
       h.each do |key, value|
-        case value
-        when Array
-          if value.empty?
-            io.puts "  #{key}: Array,"
-          else
-            type_struct = key.to_s.gsub(/s\z/, '').split('_').map(&:capitalize).join
-            parse(type_struct, value.first)
-            io.puts "  #{key}: ArrayOf(#{type_struct}),"
-          end
-        when Hash
-          if value.empty?
-            io.puts "  #{key}: Hash,"
-          else
-            type_struct = key.to_s.gsub(/e?s\z/, '').split('_').map(&:capitalize).join
-            parse(type_struct, value)
-            io.puts "  #{key}: #{type_struct},"
-          end
-        when NilClass
-          io.puts "  #{key}: Object,"
-        when TrueClass, FalseClass
-          io.puts "  #{key}: TrueClass | FalseClass,"
-        else
-          io.puts "  #{key}: #{value.class},"
-        end
+        io.puts "  #{key}: #{parse_one(io, key, value)},"
       end
       io.puts ")"
       @io.print io.string
       @io.string
     end
+
+    def parse_one(io, key, value)
+      case value
+      when Array
+        if value.empty?
+          "Array"
+        else
+          "ArrayOf(#{parse_one(io, key, value.first)})"
+        end
+      when Hash
+        if value.empty?
+          "Hash"
+        else
+          type_struct = key.to_s.gsub(/e?s\z/, '').split('_').map(&:capitalize).join
+          parse(type_struct, value)
+          type_struct
+        end
+      when NilClass
+        "Object"
+      when TrueClass, FalseClass
+        "TrueClass | FalseClass"
+      else
+        value.class.to_s
+      end
+    end
   end
 end

data/lib/type_struct/version.rb

@@ -1,3 +1,3 @@
 class TypeStruct
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: type_struct
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - ksss