genio-parser 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50ee80413f467da4892c81864be171e300f105e5
-  data.tar.gz: 92b047bd2af150f4cb43741baa27120256a9443c
+  metadata.gz: 10f0d02b905c7e01cd0a4e0fb09a30d61478fa61
+  data.tar.gz: 9e1f7659da5584fc553caf34a419112a7b28a362
 SHA512:
-  metadata.gz: 8f3a4f7bfd3113543f2eae04e67fbf989b20b0566561736b63b90e9adbc5641d64f19bb6e7a71f0f13ab2f6e750f29b1a12a4842774049c1de520f233c8970ef
-  data.tar.gz: c01ab7e9a45254c802babd80519e63dfa061eb2517bd36a3144d74bef5d8bffe3b3c02bc7a19f4e973a5695403f8045d5b6e60046b8447179e63d6e0e2345c11
+  metadata.gz: 0df4ebe74f1159f7ee00eeeb2db23458b8bc035c50d8f7d6324efdc3497ed043f1ae5460d9ddbe2fce94ae2977db0e77333b39a05899ca17a542c88df3023d75
+  data.tar.gz: 173a8fe70e2b25313e3fec7dd4bd7d62586e52f79b3954c83eb21d3a3f750d6bc0c3df69c53689f1ad44622a9e1b05b81758680aba9fed03354672384020eef1

data/lib/genio/parser/format/json_schema.rb

@@ -1,11 +1,14 @@
 require 'json'
 
+
 module Genio
   module Parser
     module Format
       class JsonSchema < Base
         include Logging
 
+        attr_accessor :current_schema
+
         # Load schema
         # == Example
         #   schema.load("path/to/json_schema.json")
@@ -13,12 +16,61 @@ module Genio
         def load(filename, force = false)
           if data_types[filename] || (!force and data_types[class_name(filename)])
             class_name(filename)
+          elsif filename =~ /#./ and self.current_schema
+            inline_schema(filename)
           elsif files[filename]
             files[filename]
           else
             files[filename] = class_name(filename)
             parse_file(filename)
           end
+        rescue Errno::ENOENT => error
+          if force and data_types[class_name(filename)]
+            logger.error error.message
+            class_name(filename)
+          else
+            raise error
+          end
+        end
+
+        def inline_schema(filename)
+          file, names  = filename.split("#", 2)
+          names = names.split("/").delete_if(&:empty?)
+
+          schema = self.current_schema
+          if file.present?
+            read_file(file) do |data|
+              schema = JSON.parse(data, :object_class => Types::Base, :max_nesting => 100)
+              store_schema(schema) do
+                get_inline_schema_klass(names, schema, filename)
+              end
+            end
+          else
+            get_inline_schema_klass(names, schema, filename)
+          end
+        end
+
+        def get_inline_schema_klass(names, schema, filename)
+          names.each do |name|
+            schema = schema[name] if schema
+          end
+
+          if schema
+            klass = class_name(class_name(names.join("_")))
+            data_types[klass] = {}
+            data_types[klass] = parse_object(schema)
+            klass
+          else
+            raise "Unable to find schema #{filename}"
+          end
+        end
+
+        def store_schema(schema)
+          backup = self.current_schema
+          self.current_schema = schema
+          yield
+        ensure
+          self.current_schema = backup
         end
 
         # Parse Given schema file and return class name
@@ -26,11 +78,13 @@ module Genio
           klass = class_name(filename)
           read_file(filename) do |data|
             data = JSON.parse(data, :object_class => Types::Base, :max_nesting => 100)
-            if data.type == "object" or data.properties or data.type.is_a? Array   # Check the type is object or not.
-              data_types[klass] = {}
-              data_types[klass] = parse_object(data)
-            elsif data.resources                          # Checkout the schema file contains the services or not
-              parse_resource(data)
+            store_schema(data) do
+              if data.resources # discovery format
+                parse_resource(data)
+              else
+                data_types[klass] = {}
+                data_types[klass] = parse_object(data)
+              end
             end
           end
           klass
@@ -43,23 +97,39 @@ module Genio
           end
 
           properties = Types::Base.new
+          required_properties = data.required.is_a?(Array) ? data.required : []
 
           # Parse each properties
           if data.properties
             data.properties.each do |name, options|
               properties[name] = parse_property(name, options)
+              properties[name].required = true if required_properties.include? name
             end
           elsif data.type.is_a?(Array)
             data.type.each do |object|
-              properties.merge!(parse_object(object).properties)
+              properties.merge!(parse_object(object).properties) if object.is_a? Hash
             end
           end
 
           # Load extends class.
-          if data.extends.is_a? String
-            data.extends = self.load(data.extends)
-          else
-            data.extends = nil
+          data.extends =
+            if data.extends.is_a? String
+              self.load(data.extends)
+            elsif data.extends.is_a? Hash
+              if data.extends["$ref"]
+                self.load(data.extends["$ref"])
+              else
+                properties.merge!(parse_object(data.extends).properties)
+                nil
+              end
+            else
+              data.extends = nil
+            end
+
+          ["oneOf", "anyOf", "allOf"].each do |name|
+            data[name] = data[name].map do |schema|
+              parse_property(name, schema)
+            end if data[name].is_a? Array
           end
 
           # Parse array type
@@ -87,15 +157,17 @@ module Genio
               data_types[klass_name] = parse_object(data)
               klass_name
             elsif data.type.is_a? Array
-              data.union_types = data.type.map do |type|
-                parse_object(type)
+              data.oneOf = data.type.map do |type|
+                type = Types::Base.new( "type" => type ) unless type.is_a? Hash
+                parse_object(type) || Types::Base.new( "type" => "self" )
               end
               "object"
             elsif data.items              # Parse array value type
               array_property = parse_property(name, data.items)
               array_property.type
             else
-              data.type                   # Simple type
+              data.merge!(parse_object(data))
+              data.type || "object"
             end
           Types::Property.new(data)
         rescue => error
@@ -175,7 +247,10 @@ module Genio
         #   class_name("credit-card") # return "CreditCard"
         #   class_name("/path/to/payment.json") # return "Payment"
         def class_name(name)
-          File.basename(name.to_s.gsub(/\#$/, "").gsub(/-/, "_"), ".json").camelcase
+          name, anchor = name.to_s.split("#", 2)
+          name = File.basename(name, ".json")
+          name = name + "_" + anchor if anchor.present?
+          name.gsub(/[^\w]/, "_").camelcase
         end
 
         # Fix file name format

data/lib/genio/parser/version.rb

@@ -16,6 +16,6 @@
 #
 module Genio
   module Parser
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: genio-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - PayPal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   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: vcr
   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: webmock
   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: simplecov
   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'
 description: Parse schema and generates common object used by genio
@@ -129,21 +129,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.md
+- data/wadl2meta.xsl
+- data/wsdl2meta.xsl
+- lib/genio-parser.rb
+- lib/genio/parser.rb
 - lib/genio/parser/format/base.rb
 - lib/genio/parser/format/iodocs.rb
 - lib/genio/parser/format/json_schema.rb
 - lib/genio/parser/format/wadl.rb
 - lib/genio/parser/format/wsdl.rb
 - lib/genio/parser/logging.rb
-- lib/genio/parser/types/base.rb
 - lib/genio/parser/types.rb
+- lib/genio/parser/types/base.rb
 - lib/genio/parser/version.rb
-- lib/genio/parser.rb
-- lib/genio-parser.rb
-- data/wadl2meta.xsl
-- data/wsdl2meta.xsl
-- README.md
-- LICENSE.txt
 homepage: https://github.com/paypal/genio-parser
 licenses:
 - Apache License, Version 2.0
@@ -154,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Parse schema and generates common object used by genio