ruby_list_comprehension 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285f60718ee15989662d414d565271cc4896a6483d7e4f29ce012865c6c47765
-  data.tar.gz: 7877b0a0841e4adf341958b6d4813813e0e81fe3b85d518542cef81892764bc3
+  metadata.gz: 92a6a05f9854d7424aa30297fddcdcf38a41d8907158ce1ea307e0b67e9c5a46
+  data.tar.gz: ef703fa9300a220a78d384809edd66b6084446f5ce63d438f90ee6e437528bfa
 SHA512:
-  metadata.gz: 1b77cea73e37cc0bafcae40386e4533a2bc1336ba63c5c17e724640b05ed0b719c621f6c24c2dfecd306898d47c17d3255a783836c977aa7e58adce9f0a317a4
-  data.tar.gz: 863ad420a05d1d0fb894912d4da0b593927d03274734ecff3ac45935e32a8859cd6f0d66d3f0f2f757b7406b25385246c42862ed1d625d4ccfc450eae8aec759
+  metadata.gz: 958de729eb7b43f1c9c143bb21a7b70050c6ebf547ccce53db30046f9425e87603fb321a198e553f1da182cb28557e7039fb0db5e6bebd7c1a80fa2587828571
+  data.tar.gz: da4861c121ba2782023036b2c4c232ee5258273b6ba7d9e29b6a6e3d2f5c41e60480b27e7e97886527aa82eef62ccd64a71267fbb24f507ce67d15b9a0fcfa68

data/lib/ruby_list_comprehension.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'benchmark'
+
 class ListComprehension
   attr_accessor :cache, :caching
-  attr_reader :c, :version
+  attr_reader :c, :version, :op
 
   def [](*args)
     c[*args]
@@ -10,70 +10,89 @@ class ListComprehension
 
   def initialize
     @cache = {}
+    @op = nil
     @caching = true
     @version = RUBY_VERSION
-    @c = ->x {
-      raise 'please use "x" as block parameter name for now' if x[3..5] != ' x '
-      # save a pristine copy of call for caching
-      y = x[0..-1]
-      # check for cached results
+    @c = lambda { |x| # 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
+      # p "cached: #{@cache[arr].to_s}" if @cache[arr]
+
+      y = x[0..-1] # copy of original call
+      z = y[0..-1] # copy of original call
+      return [] if x.empty? || x == '' || x.nil? || eval(z[3]) == '[]'
       raise 'syntax error in list comprehension' if x.length < 10
+
+      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 back to do for simplicity :()
+
+      # check for semicolon instead of do, for now I replace to do
       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.
+      # pre-eval to check for invalid syntax
       begin
         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
-        raise 'incorrect syntax for list comprehension' + se.to_s
+        raise 'incorrect syntax for list comprehension' + "\n" + se.to_s
       end
-      # raise 'iterable can only be range, set, or array, not hash objects' if eval(x).is_a? Hash
-
 
+      # check for hash to parse csv's
       iterable = arr[3]
+      mdata = y[3...y.rindex('do')].match(/{.+[=>:].+}/)
+
+      if !mdata.nil?
+        if instance_eval(mdata[0]).is_a? Hash
+          iterable = mdata[0]
+        end
+      end
+
       if_condition = arr.include?('if') ? arr[arr.index('if') + 1...-1] : ['true']
       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 = instance_eval(arr[3])
+
+      if (map_condition == [arr[1]]) && (if_condition == ['true'])
+        @op = "each"
+        res = instance_eval(iterable)
         return res.is_a?(Array) ? res : [res]
       end
-      self.class.send(:define_method,'lc') do |arr|
-        if map_condition == [arr[1]]
-          # p 'filter'
+
+      # define a method to handle the transformation to list_comp
+      self.class.send(:define_method, 'lc') do |arr|
+        if map_condition.include?(arr[1])
+          @op = 'filter'
           return instance_eval(iterable).filter do |x|
             instance_eval(if_condition.join(' '))
           end
         end
 
-        if if_condition == ['true'] || if_condition == true
-          # p 'map'
+        if if_condition.include?('true' || 'x') || if_condition
+          @op = 'map'
           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'
+          @op = 'filter_map'
           return instance_eval(iterable).filter_map do |x|
             instance_eval(map_condition.join(' ')) if instance_eval(if_condition.join(' '))
           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!
         end
       end
       list_comp = lc(arr)
-      list_comp = list_comp.is_a?(Array) ? list_comp : [list_comp]
+      unless list_comp.is_a?(Array) || list_comp.is_a?(Hash)
+        list_comp = [list_comp]
+      end
       @cache[arr] = list_comp if @caching
       list_comp == [nil] ? [] : list_comp
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_list_comprehension
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Samuel Michael
@@ -20,7 +20,14 @@ files:
 homepage: https://github.com/SammoMichael/Ruby_List_Comprehension
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/SammoMichael/Ruby_List_Comprehension/issues
+  changelog_uri: https://github.com/SammoMichael/Ruby_List_Comprehension/commits/master
+  documentation_uri: https://github.com/SammoMichael/Ruby_List_Comprehension/blob/master/README.md
+  homepage_uri: https://github.com/SammoMichael/Ruby_List_Comprehension
+  mailing_list_uri: https://groups.example.com/bestgemever
+  source_code_uri: https://github.com/SammoMichael/Ruby_List_Comprehension/blob/master/lib/ruby_list_comprehension.rb
+  wiki_uri: https://github.com/SammoMichael/Ruby_List_Comprehension/wiki
 post_install_message: 
 rdoc_options: []
 require_paths: