api_schema 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57c171f374e7457aa20f56cfa8f62a0b91110ce
-  data.tar.gz: d0533b1c70ea503dc795c9cfe8f2754edf8be545
+  metadata.gz: 35b851123a21e5f4688f88f145ddf1e2881323a1
+  data.tar.gz: e54cb55d27b82897bb098dc915a7b1b70fb81fff
 SHA512:
-  metadata.gz: 4dfbe06022ab3f80f1b6ea177bb805b3b1d561c0854a38e0b14d47f299730066a66ab28b05eb892b6062a363e141d40006b0600e7c68e31b6c896677752c0120
-  data.tar.gz: 90ca9cee0ffe27b68c572f1574eca928d79f2003297b5ed83101debef056b40a61ae18f5838923a470f5263df811842cfb4afb5065cabf41e65161ae21267b7a
+  metadata.gz: 6938dfbd1307a7af2da7b0e9aa61b552c250ae07927c516b8e101544fdc83087f5b2285f19a891f6f63cee9b541aa40e4fb785591e3fa91d87ccc720a2949a3d
+  data.tar.gz: f2fab1d59adaefbf68ab0099c39729037a0bd6c584c34e3916eb7ca38770fbe8abc5f902a0682855a00bcb9494b905fae9e1b5f1e4e40f1caf19ca25ae075542

data/README.md

@@ -1,4 +1,4 @@
-# Api Schema [![Build Status](https://travis-ci.org/qonto/api_schema.svg?branch=master)](https://travis-ci.org/qonto/api_schema)
+# Api Schema [![Build Status](https://travis-ci.org/qonto/api_schema.svg?branch=master)](https://travis-ci.org/qonto/api_schema) [![Gem Version](https://badge.fury.io/rb/api_schema.svg)](https://badge.fury.io/rb/api_schema)
 Provides a framework and DSL for describing APIs and generate swagger-json using minimalist, schema.db-like syntax.
 
 <p align="center">

data/lib/api_schema/resource_definition.rb

@@ -2,8 +2,6 @@ module ApiSchema
   class ResourceDefinition
     include ::Swagger::Blocks::ClassMethods
 
-    @neighbors = {}
-
     def initialize(method, base_path, extra_path = nil)
       @base_path = base_path
       @extra_path = extra_path
@@ -21,10 +19,6 @@ module ApiSchema
     :path_params, :query_params, :resp,
     :errors, :base_path, :extra_path, :full_path
 
-    def self.neighbors
-      @neighbors
-    end
-
     def name(name)
       @summary = name
     end
@@ -77,13 +71,13 @@ module ApiSchema
       @full_path << "/#{extra_path}" if extra_path
     end
 
-    def build_neighbors
+    def build_neighbors(neighbors)
       generate_full_path
-      self.class.neighbors[full_path] ||= []
-      self.class.neighbors[full_path] << self
+      neighbors[full_path] ||= []
+      neighbors[full_path] << self
     end
 
-    def build
+    def build(neighbors)
       error_model = :error_model
       error_desc = {
         '401' => "Unauthorized",
@@ -92,9 +86,8 @@ module ApiSchema
         '422' => "Unprocessable Entity"
      }
       resource = self
-      resource_class = self.class
       swagger_path resource.full_path do
-        resource_class.neighbors[resource.full_path].each do |r|
+        neighbors[resource.full_path].each do |r|
           operation(r.method) do
             key :summary, r.summary
             key :description, r.description

data/lib/api_schema/resource_methods.rb

@@ -7,35 +7,35 @@ module ApiSchema
       resource = ResourceDefinition.new(:get, base_path, extra_path)
       resource.instance_eval(&block)
       api_version.resources << resource
-      resource.build_neighbors
+      resource.build_neighbors(version_resources)
     end
 
     def post(base_path = default_path, extra_path: nil, &block)
       resource = ResourceDefinition.new(:post, base_path, extra_path)
       resource.instance_eval(&block)
       api_version.resources << resource
-      resource.build_neighbors
+      resource.build_neighbors(version_resources)
     end
 
     def put(base_path = default_path, extra_path: nil, &block)
       resource = ResourceDefinition.new(:put, base_path, extra_path)
       resource.instance_eval(&block)
       api_version.resources << resource
-      resource.build_neighbors
+      resource.build_neighbors(version_resources)
     end
 
     def patch(base_path = default_path, extra_path: nil, &block)
       resource = ResourceDefinition.new(:patch, base_path, extra_path)
       resource.instance_eval(&block)
       api_version.resources << resource
-      resource.build_neighbors
+      resource.build_neighbors(version_resources)
     end
 
     def delete(base_path = default_path, extra_path: nil, &block)
       resource = ResourceDefinition.new(:delete, base_path, extra_path)
       resource.instance_eval(&block)
       api_version.resources << resource
-      resource.build_neighbors
+      resource.build_neighbors(version_resources)
     end
 
     def default_path

data/lib/api_schema/root_methods.rb

@@ -4,22 +4,36 @@ module ApiSchema
     def inherited(subclass)
       instance_var = "@api_version"
       subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+      instance_var_neighbors = "@version_resources"
+      subclass.instance_variable_set(instance_var_neighbors, instance_variable_get(instance_var_neighbors))
+      instance_var_neighbors = "@version_serializers"
+      subclass.instance_variable_set(instance_var_neighbors, instance_variable_get(instance_var_neighbors))
     end
 
     def configure
       configuration = Configuration.new
       yield(configuration)
       @api_version = ApiVersion.new(configuration)
+      @version_resources = {}
+      @version_serializers = {}
     end
 
     def api_version
       @api_version
     end
 
+    def version_resources
+      @version_resources
+    end
+
+    def version_serializers
+      @version_serializers
+    end
+
     def generate_json
       @api_version.configuration.build
-      @api_version.serializers.each { |s| s.build }
-      @api_version.resources.each { |r| r.build }
+      @api_version.serializers.each { |s| s.build(version_serializers) }
+      @api_version.resources.each { |r| r.build(version_resources) }
 
       nodes = [@api_version.configuration] +  @api_version.serializers + @api_version.resources
       ::Swagger::Blocks.build_root_json(nodes)

data/lib/api_schema/serializer_definition.rb

@@ -2,26 +2,21 @@ module ApiSchema
   class SerializerDefinition
     include ::Swagger::Blocks::ClassMethods
 
-    @serializers = {}
-
     PriorReference = ::Struct.new(:id, :type, :desc)
 
     attr_reader :id, :fields, :references, :parent
     attr_accessor :type, :name, :description
 
-    def initialize(id, type, name=nil, parent_id = nil)
+    def initialize(id, type, serializers, name=nil, parent_id = nil)
       @id = id
       @type = type
       @name = name || id
-      @parent = self.class.serializers[parent_id]
+      @parent = serializers[parent_id]
       @fields = parent&.fields || []
       @prior_references = parent&.prior_references || []
       @references = []
-      self.class.serializers[id] = self
-    end
 
-    def self.serializers
-      @serializers
+      serializers[id] = self
     end
 
     def required_fields
@@ -32,16 +27,16 @@ module ApiSchema
       @prior_references << PriorReference.new(refernce_id, type, desc)
     end
 
-    def build
-      build_references
+    def build(serializers)
+      build_references(serializers)
       sd = self
       swagger_schema(id) { schema_for(sd) }
     end
 
-    def build_references
+    def build_references(serializers)
       @prior_references.each do |pr|
-        raise "Model #{pr.id} is not defined" unless self.class.serializers[pr.id]
-        reference = self.class.serializers[pr.id].clone
+        raise "Model #{pr.id} is not defined" unless serializers[pr.id]
+        reference = serializers[pr.id].clone
         reference.type = pr.type
         reference.description = pr.desc
         reference.name = reference.name.to_s.pluralize if reference.type == :array

data/lib/api_schema/serializer_methods.rb

@@ -4,13 +4,13 @@ module ApiSchema
     private
 
     def serializer(id, structure: :object, name: nil, parent: nil)
-      serializer = SerializerDefinition.new(id, structure, name, parent)
+      serializer = SerializerDefinition.new(id, structure, version_serializers, name, parent)
       yield serializer if block_given?
       api_version.serializers << serializer
     end
 
     def array_serializer(id, name: nil, parent: nil)
-      serializer = SerializerDefinition.new(id, :array, name, parent)
+      serializer = SerializerDefinition.new(id, :array, version_serializers, name, parent)
       yield serializer if block_given?
       api_version.serializers << serializer
     end

data/lib/api_schema/version.rb

@@ -1,3 +1,3 @@
 module ApiSchema
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Dmitry Chopey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: api_schema provides a framework and DSL for describing APIs and generate