k_doc 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13425498035dd9742336c907655e6555a37f7b4293c99443921bea29b38b0db9
-  data.tar.gz: 63ff3b0ad02f17833cc23318d529c80cc1e0165eae4d18fb096db484f331808b
+  metadata.gz: f303cce0d48fa08ea50ce2e14a4c5d935fe927c2e634c03db0f2d909cb6a01a6
+  data.tar.gz: 5bffef8ae688894faf79e73c6fc04725315793d75795d784a3875563c7e6b1be
 SHA512:
-  metadata.gz: d623d3964433ecbd4b33d4c4cce608d5e1923836ab6ffb3ab91c05dc9ae517719d2da2a14ca0ab3c83e5cace4593d2afaad80f24eaa4c8e8e48dd7b6229c886a
-  data.tar.gz: 9557e8c8082bcfed3acb10fea6a4516e7aec04a49cfdf3f99fb3800faf32531937df8f52278db7a0e02f6543b8e22e25bbadef7d472e530a5ccaf6c8ae053081
+  metadata.gz: def580541db16a31f6c80759f7387da8a38f4e1ffbf4545d65ae14da72498fcc86e274b207931347937f55b4d78b9009443f6321b74a8b1a5224cc74127c28c4
+  data.tar.gz: e4cddb3891b5d4bc785833aa0d9de6efc19fd8d58f1525b99ca20b13407aa0a509ac4808fd70604093d9d7c67d0ffa64b9083af20ec45fba8a052dbd3dd29a5b

data/lib/k_doc/container.rb

@@ -9,8 +9,11 @@ module KDoc
     include KDoc::Taggable
     include KDoc::Datum
     include KDoc::BlockProcessor
-    include KDoc::Importable
 
+    # OpenStruct to be populated with context data, this can be used inside the on_init
+    attr_reader :context
+
+    # Opts that are passed to the container. Some options will be removed when evaluated by different plugins (Taggable, BlockProcessor)
     attr_reader :opts
 
     # TODO: Owner/Owned need to be in a module and tested
@@ -21,11 +24,11 @@ module KDoc
     end
 
     def initialize(**opts, &block)
+      @context = OpenStruct.new
       @opts = opts
 
       initialize_tag(opts)
       initialize_data(opts)
-      initialize_import(opts)
       initialize_block(opts, &block)
     end
 

data/lib/k_doc/mixins/block_processor.rb

@@ -8,9 +8,13 @@ module KDoc
     attr_accessor :block
     attr_accessor :block_state
 
-    def initialize_block(_opts, &block)
+    # Proc/Handler to be called before evaluating when importing data
+    attr_reader :on_init
+
+    def initialize_block(opts, &block)
       @block = block if block_given?
-      @block_state = :initial
+      @block_state = :new
+      @on_init = opts.delete(:on_init)
     end
 
     def evaluated?
@@ -21,16 +25,31 @@ module KDoc
       @block_state == :actioned
     end
 
-    def execute_block(run_importer: nil, run_actions: nil)
-      run_on_import if run_importer
+    def execute_block(run_actions: nil)
+      run_on_init
+
+      # return unless dependencies_met?
+
       eval_block
       run_on_action if run_actions
     end
 
+    def run_on_init
+      instance_eval(&on_init) if on_init
+
+      @block_state = :initialized
+    rescue StandardError => e
+      log.error('Standard error in document on_init')
+      # puts "key #{unique_key}"
+      # puts "file #{KUtil.data.console_file_hyperlink(resource.file, resource.file)}"
+      log.error(e.message)
+      @error = e
+      raise
+    end
+
     def eval_block
-      return if @block.nil?
+      instance_eval(&block) if block
 
-      instance_eval(&@block)
       @block_state = :evaluated
     rescue StandardError => e
       log.error('Standard error in document')
@@ -42,7 +61,7 @@ module KDoc
     end
 
     def run_on_action
-      return if @block.nil?
+      return unless block
 
       if respond_to?(:on_action)
         on_action

data/lib/k_doc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KDoc
-  VERSION = '0.0.27'
+  VERSION = '0.0.28'
 end

data/lib/k_doc.rb

@@ -15,7 +15,6 @@ require 'k_doc/mixins/taggable'
 require 'k_doc/mixins/datum'
 require 'k_doc/mixins/block_processor'
 require 'k_doc/mixins/composable_components'
-require 'k_doc/mixins/importable'
 require 'k_doc/container'
 # require 'k_doc/data'
 require 'k_doc/action'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: k_doc
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - David Cruwys
@@ -130,7 +130,6 @@ files:
 - lib/k_doc/mixins/composable_components.rb
 - lib/k_doc/mixins/datum.rb
 - lib/k_doc/mixins/guarded.rb
-- lib/k_doc/mixins/importable.rb
 - lib/k_doc/mixins/taggable.rb
 - lib/k_doc/model.rb
 - lib/k_doc/model_backup.rb

data/lib/k_doc/mixins/importable.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module KDoc
-  # Alow documents to import data from other sources (usually other documents)
-
-  module Importable
-    include KLog::Logging
-
-    # Proc/Handler to be called when importing data
-    attr_reader :on_import
-
-    # OpenStruct to be populated with data from import
-    attr_reader :imports
-
-    def initialize_import(opts)
-      # log.error 'initialize_import'
-      @on_import = opts.delete(:on_import)
-      @imports = OpenStruct.new
-    end
-
-    def run_on_import
-      return unless on_import
-
-      instance_eval(&on_import)
-    end
-  end
-end