ruby_list_comprehension 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a09a6c55f3c18f9f89ab19ba482e94c50862cb20f251fd5c83755535e248cd64
-  data.tar.gz: f1812c165243cd0bc3e3c1fd91415e1c1bed2bcb314a4d8c88b48d1d5e5d3683
+  metadata.gz: 209cae3b97fefb10d73c95e41a2b96aa4ca74f585ce0297dbc56caf68880b0b7
+  data.tar.gz: 1dbd4792663ba7ec560989dd2505923aea9cbc8af302cf5de79c33a46e5838af
 SHA512:
-  metadata.gz: 88b9c43e97223089d22f1e921f1933f39d721ad82316c7cded62175254e8d538220ce4fa40e88a61ed2d0f5b1081fd7b54aed8b8d3fc7af2ee48565f10344e41
-  data.tar.gz: 88ceb53a0fe56ba5342acdd361b18daf0ba7cbeb9a1f5a2a90cad4f1d84661c59ccb814dfbbc355834b8bb1e0d36c2a650b71b75e7edc9cda8ed7270ce3b9e6e
+  metadata.gz: f3a876cf461fbf431e8be90fd8cf416077e2abb26a566548f88197a462c241dc337773a62ae6be8c748b510de8e1343de16db47be0977ed0955c53f22460f0df
+  data.tar.gz: 8510c3620b25e95188e0952f18e0eb52cc126adee5a165bb4a123770cbc6e4339b841b7fad44ac6b895b13aa8fd2b38b9defd8e696387cdbac427dc200b5eda9

data/lib/ruby_list_comprehension.rb

@@ -1,23 +1,34 @@
 # frozen_string_literal: true
-
+require 'benchmark'
 class ListComprehension
-  attr_reader :c, :version
 
+  attr_reader :c, :version, :cache
   def [](*args)
     c[*args]
   end
 
   def initialize
+    @cache = {}
+    @caching = true
     @version = RUBY_VERSION
     @c = ->x {
-      return [] if x == ""
+      # save a pristine copy of call for caching
+      y = x[0..-1]
+      # check for cached results
+      return @cache[x] if @caching && @cache[x]
+      # check for empty call
+      return [] if x.empty? || x == "" || x.nil?
+      # required length of keywords and spaces is 10
       raise 'syntax error in list comprehension' if x.length < 10
       arr = x.split
+      # check for semicolon instead of do, for now I replace back to do for simplicity :()
+      if arr[3][-1] == ';' || arr[4][0] == ';' || arr[5][0] == ';' && !arr.include?('do')
+        arr = x.to_s.sub(';', ' do ').split
+      end
+
+      # pre-eval to check for invalid syntax, hash as iterable, etc.
       begin
-        if arr[3][-1] == ';' || arr[4][0] == ';'
-          arr = x.to_s.sub(';', ' do').split
-        end
-        res = eval(x)
+        res = instance_eval(x)
         return [] if res.nil?
         raise 'iterable can only be range, set, or array, not hash objects' if res.is_a? Hash
       rescue SyntaxError => se
@@ -31,35 +42,38 @@ class ListComprehension
       map_condition = arr[arr.index('do') + 1...(arr.index('if') || arr.index('end'))]
       if (map_condition == [arr[1]]) && (if_condition == ['true'] || if_condition == true)
         # p "no method needed"
-        res = eval(arr[3])
+        res = instance_eval(arr[3])
         return res.is_a?(Array) ? res : [res]
       end
       self.class.send(:define_method,'lc') do |arr|
         if map_condition == [arr[1]]
           # p 'filter'
-          return eval(iterable).filter do |x|
-            eval(if_condition.join(' '))
+          return instance_eval(iterable).filter do |x|
+            instance_eval(if_condition.join(' '))
           end
         end
 
         if if_condition == ['true'] || if_condition == true
           # p 'map'
-          return eval(iterable).map do |x|
-            eval(map_condition.join(' '))
+          return instance_eval(iterable).map do |x|
+            instance_eval(map_condition.join(' '))
           end
         end
         # check Ruby Version stored in @version
         if @version >= '2.7.0'
-          return eval(iterable).filter_map do |x|
-            eval(map_condition.join(' ')) if eval(if_condition.join(' '))
+          return instance_eval(iterable).filter_map do |x|
+            instance_eval(map_condition.join(' ')) if eval(if_condition.join(' '))
           end
         else
-          return eval(iterable).map do |x|
-            eval(map_condition.join(' ')) if eval(if_condition.join(' ')).compact!
+          return instance_eval(iterable).map do |x|
+            instance_eval(map_condition.join(' ')) if eval(if_condition.join(' ')).compact!
           end
         end
       end
-      return lc(arr)
+      list_comp = lc(arr)
+      list_comp = list_comp.is_a?(Array) ? list_comp : [list_comp]
+      @cache[arr] = list_comp
+      list_comp
     }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_list_comprehension
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Samuel Michael