ruby_list_comprehension 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a6a05f9854d7424aa30297fddcdcf38a41d8907158ce1ea307e0b67e9c5a46
-  data.tar.gz: ef703fa9300a220a78d384809edd66b6084446f5ce63d438f90ee6e437528bfa
+  metadata.gz: d2d35273a3ae0a52a219848adb715d96ca5f13dbd0eb500c4ae80ea2cc151977
+  data.tar.gz: b5ddeb3771d13d9c314f0bc7588db1d918b79396fe32e4b27b87fa86812d8a53
 SHA512:
-  metadata.gz: 958de729eb7b43f1c9c143bb21a7b70050c6ebf547ccce53db30046f9425e87603fb321a198e553f1da182cb28557e7039fb0db5e6bebd7c1a80fa2587828571
-  data.tar.gz: da4861c121ba2782023036b2c4c232ee5258273b6ba7d9e29b6a6e3d2f5c41e60480b27e7e97886527aa82eef62ccd64a71267fbb24f507ce67d15b9a0fcfa68
+  metadata.gz: 302c90d601a6affe56d8a06567ec6ea3071f216e274131f7184185a082e77ebd7b6a23752feb6222a602fbb84828ed6fcbc1511c381728ddf86af26d0c4d4156
+  data.tar.gz: 8a60c0e66d4e6defc8a3b728cc2b4a656ac8c12237a14a96d51447b440049bd0234c4b07fcd29b68fc0cfb5ae8519a9f301d69ef95202a1bde00b73b4c883d8a

data/lib/ruby_list_comprehension.rb

@@ -14,8 +14,10 @@ class ListComprehension
     @caching = true
     @version = RUBY_VERSION
     @c = lambda { |x| # check for cached results
-
+      return [] if x == ''
+      x.concat(' end')if x[-3..-1] != 'end'
       return @cache[x] if @caching && @cache[x]
+
       # p "cached: #{@cache[arr].to_s}" if @cache[arr]
 
       y = x[0..-1] # copy of original call
@@ -26,8 +28,10 @@ class ListComprehension
       raise 'please use "x" as block parameter name for now' if x[3..5] != ' x '
 
       arr = x.split
-
-      # check for semicolon instead of do, for now I replace to do
+      if !arr.include?('do')
+        arr.insert(5, 'do')
+      end
+      # replace initial semicolon with do if needed for parser
       if arr[3][-1] == ';' || arr[4][0] == ';' || arr[5][0] == ';' && !arr.include?('do')
         arr = x.to_s.sub(';', ' do ').split
       end
@@ -42,11 +46,25 @@ class ListComprehension
 
       # check for hash to parse csv's
       iterable = arr[3]
-      mdata = y[3...y.rindex('do')].match(/{.+[=>:].+}/)
+      return [{}] if iterable == "{}"
 
-      if !mdata.nil?
+      mdata = y[3...y.rindex('do')].match(/{.+[=>:].+}/)
+      if mdata && mdata[0].include?(';')
+        # p 'hi'
+        iterable = mdata[0].split(';')[0]
+        # p iterable
+        # p arr.insert(5, "do")
+      end
+      if mdata
         if instance_eval(mdata[0]).is_a? Hash
           iterable = mdata[0]
+          p mdata[0]
+          p iterable
+          p arr
+
+          if iterable[-1] == ';'
+            iterable = iterable[0..-1]
+          end
         end
       end
 
@@ -83,7 +101,6 @@ class ListComprehension
           end
         else
           @op = 'map&compact'
-          # p 'map&compact'
           return instance_eval(iterable).map do |x|
             instance_eval(map_condition.join(' ')) if instance_eval(if_condition.join(' '))
           end.compact!
@@ -93,8 +110,9 @@ class ListComprehension
       unless list_comp.is_a?(Array) || list_comp.is_a?(Hash)
         list_comp = [list_comp]
       end
+
+      list_comp = list_comp == [nil] ? [] : list_comp
       @cache[arr] = list_comp if @caching
-      list_comp == [nil] ? [] : 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.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Samuel Michael