ruby_list_comprehension 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc2af11cfbc01440dc7d210694011584a128be74773259a247c877b385f07cf0
-  data.tar.gz: a222d208644f9e026fabe759e6ec8de69c00da7ae6b4291f173baac0387c985b
+  metadata.gz: da0d475e01e660a109eff36d8f0f4f8ca3e105757bf6577bfdce20c7440177b5
+  data.tar.gz: e36bcd2fa8ba9e34fce4f78efb9f4853e7fff9469573dc1da1eb3fc447e17d4b
 SHA512:
-  metadata.gz: 4535317fbd3fbae647b53d3893876762be5d1dbf0623d6ecb7cc38899dac49d337e1c6f5896a20a7812bb6eeca8c5f95fb50a0a19ec5877a123cbb8fba772b08
-  data.tar.gz: 3b8541f1684bfd089e778cd733bc1060ddfa99a76ce54be9391d4f2e5ab9f6d4b83b6f40ec814537e71f398a2ba0469de12cae10111de7245c07fcc15231dff4
+  metadata.gz: 0116246f99df3cb5f403963e4743fcc34c88d9767434c9505454078b29c8a0814f84ec7ca21a22ffc309b433a4dd5f7c1944a1b695049196f09253072f379d1f
+  data.tar.gz: 905a24fdd92c58f87e4cf7e0539f0b711e7689564e825a1a84168609a1a320b9e9856ad5544fb5c2e25cbdfbfe721fb3186c34334ac031d4905c28ce20bab149

data/lib/ruby_list_comprehension.rb

@@ -2,7 +2,7 @@
 require 'readline'
 require 'singleton'
 require 'set'
-module RubyList
+module RubyListComprehension
   FM_REGEX = /for(?<parameter>.*)(?=in)in(?<iterable>.*)(?=do)do(?<mappable>.*)(?=if)if(?<filterable>.+)end/.freeze
   F_REGEX = /for(?<parameter>.*)(?=in)in(?<iterable>.*)(.+)do(.+)(?=if)if(?<filterable>.*)end/.freeze
   M_REGEX = /(?=for)for(?<parameter>.*)(?=in)in(?<iterable>.*)(?=do)do(?<mappable>.*)(?=end)end/.freeze
@@ -169,8 +169,8 @@ module RubyList
   end
 
   class ListComprehension
-    include Singleton
-    include RubyList
+    # include Singleton
+    include RubyListComprehension
     attr_accessor :cache, :caching, :mappable, :filterable, :iterable, :var, :list, :location, :line, :count
     attr_accessor :flattener, :len, :nested, :nested_var, :file, :list_comp, :final_iterable_value
     attr_accessor :count
@@ -205,7 +205,7 @@ module RubyList
     def locate_list_repl
       @line = Readline::HISTORY.to_a.reverse.uniq.reverse[-1]
       start = @line.index('l[') + 2
-      ending = @line[start..-1].index('end') + 5
+      ending = @line[start..-1].index('end') + 6
       @line = @line[start...ending]
     end
 
@@ -219,7 +219,6 @@ module RubyList
     def locate_list_file
       @location = caller_locations.last.to_s.scan(/\d+/).last.to_i
       @line = retrieve_file_data[@location - 1].strip.match(/\$l(?<line>.+)/)[:line][0...-1]
-
       # if @line.is_a? Array
       #   @line.each_with_index do |list, idx|
       #   list.split[3] == iterable.to_s
@@ -227,8 +226,7 @@ module RubyList
       #   end
       # end
       @line
-
     end
   end
-  $l = ListComprehension.instance
+  $l = ListComprehension.new
 end

metadata

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