hitsuji 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b084cd337a2aa754de2f5f8b0448964e30e1d352b7a59b7172f5817f89a7caf1
-  data.tar.gz: e8498e02136c8b754d37c96826bd84bb8f96da8fa7e17005f1af2eed34bbd66a
+  metadata.gz: 7c41db3b6e6ca1cb18ae1e6dcb161739641e43465f600be7d0be4bcc47cbc522
+  data.tar.gz: fd6960c1f691d2f24abd5b86cdef3bb0dcb180ad652229e0112a77a1554b9967
 SHA512:
-  metadata.gz: ce02e589408a6d7845a15d8aa11f231ed9d14056d369dd39dbbbc95286c393e73a1d3b218560e764edfe21b4d5d327b4040a1f36e71734fcca13c83082628e36
-  data.tar.gz: '09061782dc349c041754b64ed05d1cfaf2fad6badbcc34a9f2befcfa5c1cf13997cd3d39a6a0c74c54f42e1589d822142f5f04c15395c2d9d8cc0e2f0e737d53'
+  metadata.gz: 88ea5f30e92347db4cd6912f249960d086e52fee378144b4e0b4d32a13197fec5b0fff60be7ebf09c9904dd0092476a472a696e7a8e297f9d8d6786385767f2b
+  data.tar.gz: 89491e5e7bbab1141192426e4d0ac3c200bca58d134dc63a109a48b713bd616da8f4c4298198daef993400a8a3f4e99e895e14d93e7a983f567427026f5b1a9f

data/lib/hitsuji.rb

@@ -6,7 +6,7 @@ require_relative 'control.rb'
 # all the functions you need. Examples using this class can be found in the
 # descriptions of the class and instance methods below.
 class Hitsuji
-  # Creates a new system where all operations are performed.
+  # Creates a new empty system.
   #
   # ==== Example
   #
@@ -65,7 +65,7 @@ class Hitsuji
   # * +name+ - the name of the new linker, which is written as a symbol.
   # * +input+ - the contents of the new linker, whether that be an item or
   #   another linker.
-  # * +block+ - a block as a string to perform the operation
+  # * +block+ - a block that performs the operation
   #
   # ==== Example
   #
@@ -74,10 +74,10 @@ class Hitsuji
   #    my_item2 = Hitsuji.item(:qux, 2)               # a second item
   #    items = [:foo, :qux]
   #    my_linker = Hitsuji.linker(:baz, items)        # a new linker
-  #    my_op = Hitsuji.operation(:op, my_linker, %{
+  #    my_op = Hitsuji.operation(:op, my_linker) {
   #      |arg1, arg2| arg1 + arg2
-  #    }) # => :foo + :qux => 1 + 2 => 3              # a new operation
-  def self.operation(name, input, block)
+  #    } # => :foo + :qux => 1 + 2 => 3              # a new operation
+  def self.operation(name, input, &block)
     Operation.new(name, input, block)
   end
 
@@ -90,7 +90,7 @@ class Hitsuji
   #
   # ==== Attributes
   #
-  # * +obj+ - the items, linkers and operation you want to bind
+  # * +obj+ - the items, linkers and operations you want to bind
   #
   # ==== Example
   #

data/lib/subsystem.rb

@@ -1,3 +1,5 @@
+require 'method_source'
+
 # The Item class is the Hitsuji representation of a variable, and its properties
 # include a name and a value. The value has read-write properties, but once the
 # Item is bound, a seperate method must be used to read and change it. Examples
@@ -29,18 +31,33 @@ end
 # The Operation class is the Hitsuji representation of an equation, and its
 # properties include a name, a value and a block. The value is an Linker with
 # read-write properties, and the values in this Linker are parsed into the block
-# for execution. This block is not presented as block however, but as a string,
-# only executed upon read of dependent values. Once the Operation is bound, a
-# seperate method must be used to read them. Linkers are the main interface
-# between Items and Operations. Examples of its use can be seen in the
-# documentation for the Hitsuji.operation method.
+# for execution. This block is only executed upon read of dependent values. Once
+# the Operation is bound, a seperate method must be used to read them. Linkers
+# are the main interface between Items and Operations. Examples of its use can
+# be seen in the documentation for the Hitsuji.operation method.
 class Operation
   def initialize(name, input, block)
     @name = name
     @input = input
-    @block = block
+    src = MethodSource.source_helper(block.source_location)
+    @block = 'proc ' + src.match(/(do|\{)+?(.|\s)*(end|\})+?/).to_s
+  end
+
+  def call
+    eval(@block).call(recurse(@input.value))
+  end
+
+  def recurse(obj)
+    res = []
+    obj.each do |n|
+      res << n.value if n.class == Item
+      res << n.call_proc if n.class == Operation
+      res << recurse(n.value) if n.class == Linker
+    end
+    res
   end
 
+  private :recurse
   attr_reader :block
   attr_accessor :name, :input
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hitsuji
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Josh Quail
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-02-07 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: |-
   Hitsuji is a library that implements a tree data structure,
     where each node is represented by a value, points to other values, or performs
@@ -34,7 +48,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/realtable/hitsuji
   bug_tracker_uri: https://github.com/realtable/hitsuji/issues
-  documentation_uri: https://www.rubydoc.info/gems/hitsuji/0.2.2
+  documentation_uri: https://www.rubydoc.info/gems/hitsuji/0.3.0
 post_install_message: 
 rdoc_options: []
 require_paths: