hollerith 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3353a0f5cf501d7eddbc88d38e1f2e96167a6eb5b862f888a4ca8842e5a301f
-  data.tar.gz: 0991414ad5bc0a26004f6418594d4d0e1e659d87ba4a0f34e3c0e7a37063da64
+  metadata.gz: 1eb9f7b4d84224f78944e3bd09ad18078468dc6503e3771dd6c8e07226e0ed3a
+  data.tar.gz: 0e6f3461c7f1d618e1ec56eeef77c5eeb5844b889556350969b7c8806c08e313
 SHA512:
-  metadata.gz: 5f31d9d1b552c06a62663d5cad8b99f21d18ea68aa90f234f9d8a17fef7db1b1b64f9664dde621f584fa42ecba85123c111c49a57b429c37c0b544eddcf21b03
-  data.tar.gz: 862b4222af98f74c3895bf832e215ed8e778589b1303a50f20aa14d590c400f5d2d6afa92fa47b5801a7aff516547a4f68de225afa2739600c843eb386ce9589
+  metadata.gz: a1644214a56d13b14b6a55c8516169b25f92cae4d89112c086d0ae43283944cefc35701a410001873455f81d23b66bb3937b0da40358dc80387087a494928c42
+  data.tar.gz: e22614ffe560113598e579316b5851c7a0ba9462e11ac9b35dbba1bd86f3277ac228658127eaaf918e0ee02d4331a3375c4036e37a2906ba66bb4ca2156ccb1f

data/lib/hollerith/function_runner.rb

@@ -1,8 +1,8 @@
-require 'hollerith/value_getter'
-require 'hollerith/argument_decoder'
-require 'hollerith/base_functions'
+require 'hollerith/utilities/value_getter'
+require 'hollerith/utilities/argument_decoder'
+require 'hollerith/system_functions'
 
-class Hollerith::FunctionRunner < Hollerith::BaseFunctions
+class Hollerith::FunctionRunner < Hollerith::SystemFunctions
   attr_reader :user_context_change
   
   def initialize declaration, main_context, user_context, user_defined_functions

data/lib/hollerith/{base_functions.rb → system_functions.rb}

@@ -1,28 +1,34 @@
-class Hollerith::BaseFunctions  
+class Hollerith::SystemFunctions
+
+  BASE_VALID_FUNCTIONS = %w[
+    for_each
+    set
+    if
+    or
+    and
+    negate
+    count
+    make_external_request
+    custom_function
+    puts
+    concat
+    blank_array
+    array_push
+    array_value
+    eql
+    add
+    subtract
+    multiply
+    divide
+    split
+  ].freeze
 
   def valid_functions
-    %w(
-      for_each
-      set
-      if
-      or
-      and
-      negate 
-      count
-      make_external_request
-      custom_function
-      puts
-      concat
-      blank_array
-      array_push
-      array_value
-      eql
-      add
-      subtract
-      multiply
-      divide 
-      split
-    )
+    BASE_VALID_FUNCTIONS + custom_system_functions
+  end
+
+  def custom_system_functions
+    []
   end
 
   # Example usage: `%%_for_each($$_planets,%%_custom_function(get_distance_from_sun),each_planet)`

data/lib/hollerith/{value_getter.rb → utilities/value_getter.rb}

@@ -15,7 +15,7 @@ class Hollerith::ValueGetter
   end
 
   def get value_to_get
-    if !value_to_get.is_a? String
+    if !value_to_get.is_a?(String)
       return value_to_get
     elsif value_to_get.downcase == 'true'
       return true
@@ -39,13 +39,15 @@ class Hollerith::ValueGetter
       @user_context_change.deep_merge!(runner.user_context_change || {}) 
 
       get(result)
-    elsif value_to_get.is_a?(String) && (value_to_get.start_with?("'") || value_to_get.start_with?('"')) && (value_to_get.end_with?("'") || value_to_get.end_with?('"'))
+    elsif value_is_in_quotes?(value_to_get)
       value_to_get[1..-2]
     else
       value_to_get
     end
   end
 
+  private
+
   def read_hash_value hash_key
     split_hash_key = hash_key.split('.')
     base_hash_key = split_hash_key.shift
@@ -69,11 +71,14 @@ class Hollerith::ValueGetter
         end
       end
     end
-
-    # TODO: Add dot notation handling here.
-    #       - Read all rails attributes, hash values or instance variables.
     # FIXME: Variable getting needs to be DRYed up.
 
     return hash_key_value
   end
+
+  def value_is_in_quotes? value_to_get
+    value_to_get.is_a?(String) &&
+      (value_to_get.start_with?("'") || value_to_get.start_with?('"')) &&
+      (value_to_get.end_with?("'") || value_to_get.end_with?('"'))
+  end
 end

data/lib/hollerith.rb

@@ -79,7 +79,9 @@ class Hollerith
       if value_to_return
         return value_to_return
       else
-        raise ArgumentError.new("Variable not found #{value_to_return} in this context")
+        raise ArgumentError.new(
+          "Variable not found #{value_to_return} in this context"
+        )
       end
     else
       raise ArgumentError.new("Invalid variable definition #{variable}")
@@ -122,6 +124,6 @@ class Hollerith
 end
 
 require 'hollerith/function_runner'
-require 'hollerith/value_getter'
-require 'hollerith/argument_decoder'
+require 'hollerith/utilities/value_getter'
+require 'hollerith/utilities/argument_decoder'
 require 'hollerith/base_functions'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hollerith
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Noah Kochanowicz
@@ -32,10 +32,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/hollerith.rb
-- lib/hollerith/argument_decoder.rb
-- lib/hollerith/base_functions.rb
 - lib/hollerith/function_runner.rb
-- lib/hollerith/value_getter.rb
+- lib/hollerith/system_functions.rb
+- lib/hollerith/utilities/argument_decoder.rb
+- lib/hollerith/utilities/value_getter.rb
 homepage: https://rubygems.org/gems/hollerith
 licenses:
 - MIT