api_schema 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9f9615b4b22de2c2cb6dfa280bb272a67c31c49
-  data.tar.gz: 7c21d543d28d7f9a87fa517f32c298c3faf53f01
+  metadata.gz: 3c1107551e7ed1520bba3597273977a97dcc3403
+  data.tar.gz: 989b92b544a4ac765456010a52e19070385bd39b
 SHA512:
-  metadata.gz: 99014c93602f61c8c1beb85c9fad1303c38b686f66facde75cb7cdd313b42567a123b3c7d035f53affc5cffaf2f9de0f546df0e6281043a8bf56b09c6fc00b7c
-  data.tar.gz: acf2bf69a52e23564a0f62e8bb0364078d0cfbb0e0014d116979d8cd624a2daf13465319506569afa11638a51323de0d5c9c4f2aa2762c866a1dfdce797f612d
+  metadata.gz: b06b88aa9b4490e6751978ed85ce84c2072d62c78a0a3aeae5908966a9f94d251d8fa73be1acfe546c2830af9587994cdd1ac8e7ad774a872df95ce7ea4a852a
+  data.tar.gz: 3ae635ef41a88bbf511e483dbbe9a88ff7a09b73e68043e8bf74e680b0adde4cfe895890b2bddb31bdfc6caa37d8427982701e239b9e3d393445a0935ce129f6

data/README.md

@@ -23,8 +23,9 @@ Or install it yourself as:
 
 ## Usage
 
-Just add `include ApiSchema` and configurations to your base class and inherit from it.
-To generate json use `BaseDocs.generate_json` method.
+Just add `include ApiSchema` and configurations to your base class and inherit from it. You also should define your default `:error_model`
+
+**To generate json use `BaseDocs.generate_json` method.**
 
 #### BaseDocs
 
@@ -52,6 +53,11 @@ module V1
         '422' => "Unprocessable Entity"
       }
     end
+
+    serializer :error_model do |f|
+      f.integer :code, required: true
+      f.string :message, required: true
+    end
   end
 end
 ```

data/lib/api_schema/resource_definition.rb

@@ -2,7 +2,7 @@ module ApiSchema
   class ResourceDefinition
     include ::Swagger::Blocks::ClassMethods
 
-    @@neighbors = {}
+    @neighbors = {}
 
     def initialize(method, base_path, extra_path = nil)
       @base_path = base_path
@@ -21,6 +21,10 @@ 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
@@ -75,8 +79,8 @@ module ApiSchema
 
     def build_neighbors
       generate_full_path
-      @@neighbors[full_path] ||= []
-      @@neighbors[full_path] << self
+      self.class.neighbors[full_path] ||= []
+      self.class.neighbors[full_path] << self
     end
 
     def build
@@ -88,9 +92,9 @@ module ApiSchema
         '422' => "Unprocessable Entity"
      }
       resource = self
-
+      resource_class = self.class
       swagger_path resource.full_path do
-        @@neighbors[resource.full_path].each do |r|
+        resource_class.neighbors[resource.full_path].each do |r|
           operation(r.method) do
             key :summary, r.summary
             key :description, r.description

data/lib/api_schema/root_methods.rb

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

data/lib/api_schema/serializer_definition.rb

@@ -2,7 +2,7 @@ module ApiSchema
   class SerializerDefinition
     include ::Swagger::Blocks::ClassMethods
 
-    @@serializers = {}
+    @serializers = {}
 
     PriorReference = ::Struct.new(:id, :type, :desc)
 
@@ -13,11 +13,15 @@ module ApiSchema
       @id = id
       @type = type
       @name = name || id
-      @parent = @@serializers[parent_id]
+      @parent = self.class.serializers[parent_id]
       @fields = parent&.fields || []
       @prior_references = parent&.prior_references || []
       @references = []
-      @@serializers[id] = self
+      self.class.serializers[id] = self
+    end
+
+    def self.serializers
+      @serializers
     end
 
     def required_fields
@@ -36,7 +40,7 @@ module ApiSchema
 
     def build_references
       @prior_references.each do |pr|
-        reference = @@serializers[pr.id].clone
+        reference = self.class.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/version.rb

@@ -1,3 +1,3 @@
 module ApiSchema
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dmitry Chopey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport