schai 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99670c33c4e1e826924ed5902a5d2143ab5fe033
-  data.tar.gz: 779db26346971a87a519e5f33c4bfecb7103423a
+  metadata.gz: e440f870638d3ccde9bf0c8e8a8161aefb6bc533
+  data.tar.gz: 118a6e81d6fcd1d87daa32d8926fa27362357691
 SHA512:
-  metadata.gz: a029ce8f1e7176b5c99ead8dec921d612cd33542f81b40f02167e874856d06a37d7ce28e1dd94968566fe0582fc2410a1191f42bd1142668a0c15d94b2dc3bd9
-  data.tar.gz: 41d4eacd6480a70a29d645222a88a532130708fef0771faa5f7479711c7f0cb707e0371e6a902ee09768dd40712b003c83ff51651022d8ce237ca095b6337ef9
+  metadata.gz: f65464c07a36e7543dd865a58e1f7411c2e418e33e0265469e9fd95ac0b8129c063a838dcf965e246a3735fb9ccd83c82bef6a793a23214f7e31766fc2082abc
+  data.tar.gz: 2300fb30fcbc81a4869050d65e5fe9dc96501fe93314cd4ba0943c0be9435b7d622a7b38486ea77c13a865c92d9d85ea61076bce578ed7e1739da8f82a4e51e2

data/lib/schai.rb

@@ -11,17 +11,24 @@ module Schai
     JsRoot.parse params
   end
 
-  def self.parse_file path
+  def self.path
     @@path ||=[]
-    if @@path.empty?
-      @@path << path
+  end
+
+  def self.current_parsing_file? path
+    File.expand_path("../#{path}", Schai.path.last) == Schai.path.last
+  end
+
+  def self.parse_file path
+    if Schai.path.empty?
+      Schai.path << path
       ret = parse YAML.load_file(path)
-      @@path.pop
+      Schai.path.pop
     else
-      expand_path = File.expand_path("../#{path}", @@path.last)
-      @@path << expand_path
+      expand_path = File.expand_path("../#{path}", Schai.path.last)
+      Schai.path << expand_path
       ret = parse YAML.load_file(expand_path)
-      @@path.pop
+      Schai.path.pop
     end
     ret
   end

data/lib/schai/json_schema/js_object.rb

@@ -7,6 +7,10 @@ module Schai
     end
 
     def initialize params
+      params["properties"].select! do |k, e|
+        !(Schai.current_parsing_file?(e['include']) and e['optional'])
+      end
+
       @all = Hash[params["properties"].map {|k, v|
         [k || 'null', JsRoot.parse_components(v)]
       }]

data/lib/schai/json_schema/js_root.rb

@@ -3,26 +3,28 @@ module Schai
     attr_accessor :schema
 
     def self.parse params
-      ret = self.new
-      ret.schema = parse_components params
-      ret
+      self.new.tap do |js_root|
+        js_root.schema = parse_components params
+      end
     end
 
     def self.parse_components params
-      case
-      when params.has_key?('include')
+      # include other .yaml file
+      if params.has_key?('include')
         included_schema = Schai.parse_file(params.delete('include')).schema
         params.each do |k, v|
           setter = "#{k}=".to_sym
           included_schema.send(setter, v)
         end
-        included_schema
-      when params['type'] == 'object'
+        return included_schema
+      end
+
+      raise "typeは必須(#{params})" unless params.has_key?('type')
+      case params['type']
+      when 'object'
         JsObject.parse params
-      when params['type'] == 'array'
+      when 'array'
         JsArray.parse params
-      when !params.has_key?('type')
-        raise "typeは必須(#{params})"
       else
         JsProperty.parse params
       end

data/lib/schai/version.rb

@@ -1,3 +1,3 @@
 module Schai
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schai
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - gin0606
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor