sweet-moon 0.0.4 → 0.0.7

data/dsl/state.rb

@@ -1,13 +1,14 @@
 require_relative 'errors'
 require_relative 'concerns/packages'
 require_relative 'concerns/fennel'
+require_relative '../components/default'
 
 module DSL
   class State
     include DSL::Concerns::Packages
     include DSL::Concerns::Fennel
 
-    attr_reader :meta
+    attr_reader :meta, :api
 
     def initialize(api_component, interpreter_component, controller, options = {})
       @api = api_component[:api]
@@ -22,12 +23,24 @@ module DSL
       add_package_cpath(options[:package_cpath]) if options[:package_cpath]
     end
 
+    def raw
+      @state
+    end
+
     def eval(input, outputs = 1)
-      @controller[:eval!].(@api, @interpreter, state, input, outputs)[:output]
+      options = _build_options(outputs, nil)
+
+      @controller[:eval!].(
+        @api, @interpreter, state, input, options[:outputs]
+      )[:output]
     end
 
     def load(path, outputs = 1)
-      @controller[:load!].(@api, @interpreter, state, path, outputs)[:output]
+      options = _build_options(outputs, nil)
+
+      @controller[:load!].(
+        @api, @interpreter, state, path, options[:outputs]
+      )[:output]
     end
 
     def get(variable, key = nil)
@@ -51,6 +64,22 @@ module DSL
       nil
     end
 
+    def _build_options(first, second)
+      options = { outputs: 1 }
+
+      options = options.merge(first) if first.is_a? Hash
+      options = options.merge(second) if second.is_a? Hash
+
+      options[:outputs] = first if first.is_a? Numeric
+      options[:outputs] = second if second.is_a? Numeric
+
+      outputs = options[:outputs] if options[:outputs]
+
+      options.delete(:outputs)
+
+      { options: options, outputs: outputs }
+    end
+
     def _ensure_min_version!(purpose, lua, jit = nil)
       version = lua
       version = jit if meta.interpreter[/jit/] && jit
@@ -83,21 +112,32 @@ module DSL
 
     private
 
-    def build_meta(api_component, interpreter_component)
-      meta_data = {
+    def build_api_meta(api_component)
+      global_ffi = Component::Default.instance.options[:global_ffi]
+
+      unless api_component[:meta][:options][:global_ffi].nil?
+        global_ffi = api_component[:meta][:options][:global_ffi]
+      end
+
+      {
         api_reference: api_component[:meta][:elected][:api_reference],
         shared_objects: api_component[:meta][:elected][:shared_objects],
-        interpreter: interpreter_component[:meta][:elected][:interpreter],
-        runtime: interpreter_component[:meta][:runtime][:lua]
+        global_ffi: global_ffi
       }
+    end
+
+    def build_meta(api_component, interpreter_component)
+      meta_data = build_api_meta(api_component)
+
+      meta_data[:interpreter] = interpreter_component[:meta][:elected][:interpreter]
+      meta_data[:runtime] = interpreter_component[:meta][:runtime][:lua]
 
       @meta = Struct.new(*meta_data.keys).new(*meta_data.values)
     end
 
     def state
       unless @state
-        raise SweetMoon::Errors::SweetMoonError,
-              'The state no longer exists.'
+        raise SweetMoon::Errors::SweetMoonError, 'The state no longer exists.'
       end
 
       @state

data/dsl/sweet_moon.rb

@@ -11,7 +11,7 @@ require_relative '../logic/interpreter'
 module SweetMoon
   module API
     def new(options = {})
-      Cache.instance.api(Logic::Options[:normalize].(options))
+      DSL::Cache.instance.api(Logic::Options[:normalize].(options))
     end
 
     module_function :new
@@ -21,9 +21,9 @@ module SweetMoon
     def new(options = {})
       options = Logic::Options[:normalize].(options)
 
-      api = Cache.instance.api_module(options)
+      api = DSL::Cache.instance.api_module(options)
 
-      interpreter = Cache.instance.interpreter_module(api, options)
+      interpreter = DSL::Cache.instance.interpreter_module(api, options)
 
       DSL::State.new(api, interpreter, Controller::State, options)
     end
@@ -46,7 +46,7 @@ module SweetMoon
   end
 
   def global
-    Global
+    DSL::Global
   end
 
   module_function :meta, :global

data/logic/spec.rb

@@ -2,7 +2,7 @@ module Logic
   Spec = {
     name: 'sweet-moon',
     command: 'sweet-moon',
-    version: '0.0.4',
+    version: '0.0.7',
     author: 'gbaptista',
     summary: 'Lua / Fennel from Ruby and vice versa. Support to LuaJIT, Lua 5.0, ' \
              'and 5.1. Lua C API for Lua 5, 4, and 3. LuaRocks and fnx integration.',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweet-moon
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - gbaptista
 autorequire:
 bindir: ports/in/shell
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -48,6 +48,7 @@ files:
 - LICENSE
 - README.md
 - components/api.rb
+- components/default.rb
 - components/injections.rb
 - components/injections/injections_503.rb
 - components/injections/injections_514.rb