procemon 0.4.3 → 0.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTVkYTA0MWEwOGQ0YjdhMzU2NjU1OWMzZjUyODdiOTU2MjMxYmFkOA==
+    ZmEwMDA2YjA1YTJhNmY0MDdlYjI0ZWIzOGU1MDJkMjMwZjE5ODdlZQ==
   data.tar.gz: !binary |-
-    YzBiNjU4NWY0NjljNGFlM2Y0YmQ1MWZjMGE3NzBhNzFhMDI1NGNhMg==
+    YTBmMDQxYjkwMzMzNTAyYTdmYjM0N2FhYTBjZmZiYTI3OWU4MTlhZQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2YxYTMyN2FjYjMxYzRjZGRiNTc2ZGYwNmEyNmVjY2JhZmM5ZDBlOGM2NDg4
-    NDcwMzRhOGNjNDExN2UxYTkyNTA0M2I4YjM2ZDQxNjcyZTcyMDM5NzgxODk5
-    NjAwZTVjZTU5OTJjY2IzMDdkNTQwOTQ0ZWIzM2Y4ZmI0YTgyZmU=
+    ZDI4NWI0ZDVkNjhmMjQyODJiNTc1MTJhNjViZGY2OGFlNDQzN2Y3NTcyNDVi
+    OWE2OGIyNDFhNTJmNjYxNjhjM2M3MjUyY2JjZTBkODQ3YzkxYWNiMDk0Y2Q3
+    NjU2ZTNhNjM0MjZmZjQxOGMxN2E3YjA1NWRhMzIzOTkzN2VhZDQ=
   data.tar.gz: !binary |-
-    YjZiZDlhM2Q2ZmQzNjQ2ZjA3NmJkOGNjMGMyYTViZWIzNjYxNjFjMzQ5YThh
-    YzY4Mzc4NTQ4N2RhMTVmN2E3ZGMxOTYyMzQ4NjgyYzc2MmVhZDkxZWYyNDE1
-    ZDg2OTlhYTU0NmNmMWEyMjQ4MmVkNzdiMzRkODE4MzE1MjFjNGM=
+    NTY1MTMxYWRkYzE1OGZhNzQ5ZDMwMTVjZDI0YmVjODc0NTRhNDlmODRhNWRj
+    ZTdjNGUyOGIwZGY0MTMyYmM3NGJkZjc5ZGE3YzA5MDJiMWFkY2UxMjFiY2Jj
+    Y2IwMGU0NmEwMjIwNmM2MGI3MjJkMjllMzMyYjZiYzdkYzM0OGQ=

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/procemon/function/proc_source/method.rb

@@ -9,8 +9,9 @@ module MethodToProcSource
       return_string= ProcSource.new
       block= 0
     end
-    unless Proc.source_cache[self.object_id].nil?
-      return Proc.source_cache[self.object_id]
+
+    unless ProcSource.source_cache[self.source_location].nil?
+      return ProcSource.source_cache[self.source_location]
     else
 
       File.open(File.expand_path(self.source_location[0])
@@ -43,7 +44,7 @@ module MethodToProcSource
         return_string.sub!(/^[^{]*(?!={)/,'Proc.new')
       end
 
-      Proc.source_cache[self.object_id]= return_string
+      ProcSource.source_cache[self.source_location]= return_string
 
       return return_string
     end

data/lib/procemon/function/proc_source/proc.rb

@@ -2,24 +2,16 @@ class Proc
 
   # create a raw eval-able process source, so you can set
   # the right bindings using the .to_proc call from String methods
-  class << self
-    attr_accessor :source_cache
-  end
-  Proc.source_cache= Hash.new
-  def source(test=nil)
+  def source
+
     # defaults
     begin
       return_string= ProcSource.new
       block= 0
     end
 
-    unless test.nil?
-      puts Proc.source_cache.inspect
-      puts self.object_id
-    end
-
-    unless Proc.source_cache[self.object_id].nil?
-      return Proc.source_cache[self.object_id]
+    unless ProcSource.source_cache[self.source_location].nil?
+      return ProcSource.source_cache[self.source_location]
     else
 
       File.open(File.expand_path(self.source_location[0])
@@ -36,7 +28,7 @@ class Proc
         return_string.sub!(/^[^{]*(?!={)/,'Proc.new')
       end
 
-      Proc.source_cache[self.object_id]= return_string
+      ProcSource.source_cache[self.source_location]= return_string
 
       return return_string
     end

data/lib/procemon/function/proc_source/proc_source.rb

@@ -1,5 +1,10 @@
 class ProcSource < String
 
+  class << self
+    attr_accessor :source_cache
+  end
+  self.source_cache= Hash.new
+
   def self.build(source_code_to_be_wrappered,*params_obj_array)
     self.new(source_code_to_be_wrappered).wrapper_around!(*params_obj_array)
   end
@@ -29,10 +34,10 @@ class ProcSource < String
         return_proc= eval(self,binding)
       end
 
-      # do cache to proc!
-      begin
-        Proc.source_cache[return_proc.object_id]= self
-      end
+      #do cache to proc!
+      #begin
+      #  ProcSource.source_cache[return_proc.source_location]= self
+      #end
 
       return return_proc
     end
@@ -41,11 +46,7 @@ class ProcSource < String
   def body
 
     body= ProcSourceBody.new(self.dup.to_s)
-
-    body.gsub!("{","{\n")
-    body.gsub!("}","\n}")
-
-    body.sub!(/^\s*Proc\.new\s*{ *[\S ]*/,String.new)
+    body.sub!(/.*Proc\.new *{ *(\|.*\|)?/,String.new)
     body.gsub!(/^$\n/, String.new)
     body.sub!(/\s*}\s*$/,String.new)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: procemon
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Adam Luzsi