puzzly_api_plugin 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00f52554c35f88d0c6283a1a28c17d5d3bba862fbe08e75a242c7008da31650
-  data.tar.gz: 5d764e13ebda544f65aa2a1cdc6bc1afc8c667830b66297651b5fa483ce1c4f6
+  metadata.gz: 45bdb8faa3538443ada11b4f7c084240a600506befa7575f68b82594ab30f42f
+  data.tar.gz: 2fa8f399c64a9314ac68eac4881625b11ff439c34562537e33044ab8e7abc9fc
 SHA512:
-  metadata.gz: 75d7792582ba9dd5db783abeefc48b2eb840548b0ad4715918355d288a1b06a40c0fc949e93f45324cdc8d31d99eb922d240bb0a59b06bf68599c46f0b585959
-  data.tar.gz: a2bee80691743891fc78a79494db88faa47a97a087ff5e6e487a119bf5df9b5b24765e7f36e65a71746fd0b98c9dd4b7009a5e02a022202cfa4154b957d70a5a
+  metadata.gz: 606ffb37200d9d46c1dc5d8d5f17ac5d1d46146f40627b1ad46e33e7b3ffe4b57338cf677c851773b72afb1872cf7d02907fde3381e06f4d9f45a5f0f1a391d1
+  data.tar.gz: 417e47584d268f0eff52badc51707055e863289ec24f8280d86f70201bf68881a7a208853c154c9c28812ef2eb6dae5f99b2cf377b75b98b9ebe5188533a3f8f

data/lib/puzzly_api_plugin/collection/topics.rb

@@ -10,11 +10,28 @@ module PuzzlyApiPlugin
     end
 
     def get_by_modules modules
-      select { |_id, topic| modules.key?(topic.module_id) }
+      topics = []
+      modules.each do |_id, mod|    
+        mod_topics = get_by_module(mod)
+        topics = topics + mod_topics
+      end
+
+      topics
     end
 
     def get_by_module mod
-      select { |_id, topic| mod.id == topic.module_id }
+      topics = []
+      mod.consumesTopics.each do |topic_id|
+        topic = TopicsCollection.instance.get_by_id topic_id
+        topics.push topic
+      end
+
+      mod.producesTopics.each do |topic_id|
+        topic = TopicsCollection.instance.get_by_id topic_id
+        topics.push topic
+      end
+
+      topics
     end
 
     def get_by_schema schema

data/lib/puzzly_api_plugin/fields.rb

@@ -60,8 +60,7 @@ module PuzzlyApiPlugin
     CACHE_NAME = 'cacheName'
     CACHE_DESCRIPTION = 'cacheDescription'
     CACHE_SCHEMA_FILE = 'cacheSchemaFile'
-    CACHE_SCHEMA_ID = 'cacheSchemaId'
-
+    
     CONTEXT_ID = 'contextId'
     CONTEXT_NAME = 'contextName'
     CONTEXT_DESCRIPTION = 'contextDescription'

data/lib/puzzly_api_plugin/generator.rb

@@ -5,6 +5,8 @@ module PuzzlyApiPlugin
     safe true
 
     def generate(site)
+      clean(site)
+
       site.documents.each do |document|
         collection = PuzzlyApiPlugin.const_get("#{document.collection.label.capitalize}Collection").instance
         collection.add(document)
@@ -53,6 +55,30 @@ module PuzzlyApiPlugin
       end
     end
 
+    def clean(site)
+      destination = site.config["destination"]
+      clean_collection_directory("#{destination}/apis")
+      clean_collection_directory("#{destination}/caches")
+      clean_collection_directory("#{destination}/contexts")
+      clean_collection_directory("#{destination}/modules")
+      clean_collection_directory("#{destination}/queries")
+      clean_collection_directory("#{destination}/schemas")
+      clean_collection_directory("#{destination}/tables")
+      clean_collection_directory("#{destination}/topics")
+    end
+
+    def clean_collection_directory(path)
+      if(!Dir.exist?(path))
+        return
+      end
+      
+      Dir.foreach(path) do |file|
+        if ((file.to_s != ".") and (file.to_s != ".."))
+          File.delete("#{path}/#{file}")
+        end
+      end
+    end
+
     def render(site, view)
       content = view.render
       path = view.path

data/lib/puzzly_api_plugin/jsonable.rb

@@ -11,5 +11,9 @@ module PuzzlyApiPlugin
     def to_s
       to_json
     end
+
+    def info message
+      Jekyll.logger.info "Puzzly:", message  
+    end
   end
 end

data/lib/puzzly_api_plugin/metadata/api.rb

@@ -17,6 +17,30 @@ module PuzzlyApiPlugin
       self[MetadataFields::DESCRIPTION] = description
       self[MetadataFields::GRAPHQL_FILE] = graphQL_file
       self[MetadataFields::SWAGGER_FILE] = swagger_file
+
+      validate
+    end
+
+    def validate     
+      if(module_id.nil?)
+        warn "Please set #{YAMLFields::MODULE_ID} property"
+      end
+
+      if(name.nil?)
+        warn "Please set #{YAMLFields::API_NAME} property"
+      end
+
+      if(description.nil?)
+        warn "Please set #{YAMLFields::API_DESCRIPTION} property"
+      end
+
+      if(graphQL_file.nil?)
+        warn "Please set #{YAMLFields::API_GRAPHQL_FILE} property"
+      end
+
+      if(swagger_file.nil?)
+        warn "Please set #{YAMLFields::API_SWAGGER_FILE} property"
+      end
     end
 
     def module_id

data/lib/puzzly_api_plugin/metadata/cache.rb

@@ -8,7 +8,7 @@ module PuzzlyApiPlugin
                 document.data[YAMLFields::CACHE_NAME],
                 document.data[YAMLFields::CACHE_DESCRIPTION],
                 document.data[YAMLFields::CACHE_SCHEMA_FILE],
-                document.data[YAMLFields::CACHE_SCHEMA_ID])
+                document.data[YAMLFields::SCHEMA_ID])
     end
 
     def initialize(document, module_id, name, description, schema_file, schema_id)
@@ -18,12 +18,28 @@ module PuzzlyApiPlugin
       self[MetadataFields::SCHEMA_FILE] = schema_file
       self[MetadataFields::SCHEMA_ID] = schema_id
 
+      validate
+    end
+
+    def validate     
+      if(module_id.nil?)
+        warn "Please set #{YAMLFields::MODULE_ID} property"
+      end
+
+      if(name.nil?)
+        warn "Please set #{YAMLFields::CACHE_NAME} property"
+      end
+
+      if(description.nil?)
+        warn "Please set #{YAMLFields::CACHE_DESCRIPTION} property"
+      end
+
       if(schema_file.nil? && schema_id.nil?)
-        raise "Cache should have schema file or schema id"
+        warn "Please set #{YAMLFields::CACHE_SCHEMA_FILE} or #{YAMLFields::SCHEMA_ID} property"
       end
       
       if(!schema_file.nil? && !schema_id.nil?)
-        raise "Cache should have only schema file or schema id"
+        warn "Please set only one between #{YAMLFields::CACHE_SCHEMA_FILE} and #{YAMLFields::SCHEMA_ID} properties"
       end
     end
 

data/lib/puzzly_api_plugin/metadata/context.rb

@@ -11,10 +11,22 @@ module PuzzlyApiPlugin
     def initialize(document, name, description)
       super(document, name)
       self[MetadataFields::DESCRIPTION] = description
+      
+      validate
+    end
+
+    def validate     
+      if(name.nil?)
+        warn "Please set #{YAMLFields::CONTEXT_NAME} property"
+      end
+
+      if(description.nil?)
+        warn "Please set #{YAMLFields::CONTEXT_DESCRIPTION} property"
+      end
     end
 
     def description
       self[MetadataFields::DESCRIPTION]
-    end
+    end    
   end
 end

data/lib/puzzly_api_plugin/metadata/metadata.rb

@@ -23,5 +23,9 @@ module PuzzlyApiPlugin
     def to_identity
       Identity.create(self)
     end
+   
+    def warn message
+      Jekyll.logger.warn log_category = "Review your file #{path}:", message
+    end
   end
 end

data/lib/puzzly_api_plugin/metadata/module.rb

@@ -15,8 +15,39 @@ module PuzzlyApiPlugin
       super(document, name)
       self[MetadataFields::CONTEXT_ID] = context_id
       self[MetadataFields::DESCRIPTION] = description
-      self[MetadataFields::CONSUMES_TOPICS] = consumesTopics
-      self[MetadataFields::PRODUCES_TOPICS] = producesTopics
+      if(consumesTopics.nil?)
+        consumesTopics = ""
+      end
+      self[MetadataFields::CONSUMES_TOPICS] = consumesTopics.split(",")
+      
+      if(producesTopics.nil?)
+        producesTopics = ""
+      end
+      self[MetadataFields::PRODUCES_TOPICS] = producesTopics.split(",")
+
+      validate
+    end
+
+    def validate     
+      if(context_id.nil?)
+        warn "Please set #{YAMLFields::CONTEXT_ID} property"
+      end
+
+      if(name.nil?)
+        warn "Please set #{YAMLFields::MODULE_NAME} property"
+      end
+
+      if(description.nil?)
+        warn "Please set #{YAMLFields::MODULE_DESCRIPTION} property"
+      end
+
+      if(consumesTopics.nil?)
+        warn "Please set #{YAMLFields::MODULE_CONSUMES_TOPICS} property"
+      end
+
+      if(producesTopics.nil?)
+        warn "Please set #{YAMLFields::MODULE_PRODUCES_TOPICS} property"
+      end
     end
 
     def context_id

data/lib/puzzly_api_plugin/metadata/query.rb

@@ -15,6 +15,26 @@ module PuzzlyApiPlugin
       self[MetadataFields::MODULE_ID] = module_id
       self[MetadataFields::DESCRIPTION] = description
       self[MetadataFields::SCHEMA_FILE] = schema_file
+
+      validate
+    end
+
+    def validate     
+      if(module_id.nil?)
+        warn "Please set #{YAMLFields::MODULE_ID} property"
+      end
+
+      if(name.nil?)
+        warn "Please set #{YAMLFields::QUERY_NAME} property"
+      end
+
+      if(description.nil?)
+        warn "Please set #{YAMLFields::QUERY_DESCRIPTION} property"
+      end
+
+      if(schema_file.nil?)
+        warn "Please set #{YAMLFields::QUERY_SCHEMA_FILE} property"
+      end
     end
 
     def module_id

data/lib/puzzly_api_plugin/metadata/schema.rb

@@ -15,6 +15,26 @@ module PuzzlyApiPlugin
       self[MetadataFields::CONTEXT_ID] = context_id
       self[MetadataFields::DESCRIPTION] = description
       self[MetadataFields::FILE] = file
+      
+      validate
+    end
+
+    def validate     
+      if(context_id.nil?)
+        warn "Please set #{YAMLFields::CONTEXT_ID} property"
+      end
+
+      if(name.nil?)
+        warn "Please set #{YAMLFields::SCHEMA_NAME} property"
+      end
+
+      if(description.nil?)
+        warn "Please set #{YAMLFields::SCHEMA_DESCRIPTION} property"
+      end
+
+      if(file.nil?)
+        warn "Please set #{YAMLFields::SCHEMA_FILE} property"
+      end      
     end
 
     def context_id

data/lib/puzzly_api_plugin/metadata/table.rb

@@ -15,6 +15,26 @@ module PuzzlyApiPlugin
       self[MetadataFields::MODULE_ID] = module_id
       self[MetadataFields::DESCRIPTION] = description
       self[MetadataFields::SCHEMA_FILE] = schema_file
+
+      validate
+    end
+
+    def validate     
+      if(module_id.nil?)
+        warn "Please set #{YAMLFields::MODULE_ID} property"
+      end
+
+      if(name.nil?)
+        warn "Please set #{YAMLFields::TABLE_NAME} property"
+      end
+
+      if(description.nil?)
+        warn "Please set #{YAMLFields::TABLE_DESCRIPTION} property"
+      end
+
+      if(schema_file.nil?)
+        warn "Please set #{YAMLFields::TABLE_SCHEMA_FILE} property"
+      end
     end
 
     def module_id

data/lib/puzzly_api_plugin/metadata/topic.rb

@@ -4,17 +4,31 @@ module PuzzlyApiPlugin
   class Topic < Metadata
     def self.create(document)
       Topic.new(document,
-                document.data[YAMLFields::MODULE_ID],
                 document.data[YAMLFields::SCHEMA_ID],
                 document.data[YAMLFields::TOPIC_NAME],
                 document.data[YAMLFields::TOPIC_DESCRIPTION])
     end
 
-    def initialize(document, module_id, schema_id, name, description)
+    def initialize(document, schema_id, name, description)
       super(document, name)
-      self[MetadataFields::MODULE_ID] = module_id
       self[MetadataFields::SCHEMA_ID] = schema_id
       self[MetadataFields::DESCRIPTION] = description
+
+      validate
+    end
+
+    def validate     
+      if(schema_id.nil?)
+        warn "Please set #{YAMLFields::SCHEMA_ID} property"
+      end
+
+      if(name.nil?)
+        warn "Please set #{YAMLFields::TABLE_NAME} property"
+      end
+
+      if(description.nil?)
+        warn "Please set #{YAMLFields::TABLE_DESCRIPTION} property"
+      end
     end
 
     def module_id

data/lib/puzzly_api_plugin/page.rb

@@ -1,19 +1,20 @@
 # frozen_string_literal: true
+module PuzzlyApiPlugin
+  class JSONPage < Jekyll::Page
+    def initialize(site, base, dir, name, content)
+      @site = site
+      @base = base
+      @dir  = dir
+      @name = name
 
-class JSONPage < Jekyll::Page
-  def initialize(site, base, dir, name, content)
-    @site = site
-    @base = base
-    @dir  = dir
-    @name = name
+      self.data = {}
+      self.content = content
 
-    self.data = {}
-    self.content = content
+      process(@name)
+    end
 
-    process(@name)
+    def render_with_liquid?
+      false
+    end
   end
-
-  def render_with_liquid?
-    false
-  end
-end
+end

data/lib/puzzly_api_plugin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuzzlyApiPlugin
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/puzzly_api_plugin/view/context.rb

@@ -10,6 +10,7 @@ module PuzzlyApiPlugin
       caches = CachesCollection.instance.get_by_modules modules
       queries = QueriesCollection.instance.get_by_modules modules
       tables = TablesCollection.instance.get_by_modules modules
+      
       topics = TopicsCollection.instance.get_by_modules modules
 
       ContextView.new(context,
@@ -19,7 +20,7 @@ module PuzzlyApiPlugin
                       caches.map { |_id, cache| cache.to_identity },
                       queries.map { |_id, query| query.to_identity },
                       tables.map { |_id, table| table.to_identity },
-                      topics.map { |_id, topic| topic.to_identity })
+                      topics.map { |topic| topic.to_identity })
     end
 
     def initialize(context, modules, schemas, apis, caches, queries, tables, topics)

data/lib/puzzly_api_plugin/view/module.rb

@@ -10,19 +10,17 @@ module PuzzlyApiPlugin
       tables = TablesCollection.instance.get_by_module mod
       
       consumesTopics = []
-      mod.consumesTopics.split(",").each do |topic_id|
+      mod.consumesTopics.each do |topic_id|
         topic = TopicsCollection.instance.get_by_id topic_id
         consumesTopics.push topic.to_identity
       end
 
       producesTopics = []
-      mod.producesTopics.split(",").each do |topic_id|
+      mod.producesTopics.each do |topic_id|
         topic = TopicsCollection.instance.get_by_id topic_id
         producesTopics.push topic.to_identity
       end
       
-      topics = TopicsCollection.instance.get_by_module mod
-
       ModuleView.new(context.to_identity,
                       mod,
                       apis.map { |_id, api| api.to_identity },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puzzly_api_plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mr. Braz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll