try-catch 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84f2bba2b110f675a2f70f1ff631d8c5d180d13a
-  data.tar.gz: e1a3891ab124ac5c24096806fc1bb0b4f636c1e5
+  metadata.gz: 345103aaa3a3a13455a9efa6c7d8aaab523fdc3b
+  data.tar.gz: d8862c5da29c4fba29311f2cbc7f3ec44df656ec
 SHA512:
-  metadata.gz: d816e1e719538e3270a1bddaffe5a673b6c8253e41d03ba623d36994da58d564b89fb9df26dfa97646726d0d687c6aa904fb8245b334a520b2d78a473df958d9
-  data.tar.gz: 6203816e7dd020974de6686e9ed63f846f277aa5fde402c7cfee841a7e84ceeaa05a9a37f50ee2fc1381b4d8b730ff28e015213dc5403ca583391d4c9cb457d5
+  metadata.gz: a4ef0166e36f785139ff5efbc52c09fff386e0ca83ef83fb1e571381aa25f178cebf005305df66ac9d94ae150548b1933e9ffacf19879e0d0491af8dc4dd6114
+  data.tar.gz: 22dee0fd8c9b6a6b7af555a052c5f7fa015c3d778e32eb8a5664066865f3137a0d4e44004b8e594e21452c98c698b791a9c2e514f71cdc24ce716997df9c293c

data/Gemfile.lock

@@ -1,11 +1,18 @@
 PATH
   remote: .
   specs:
-    try-catch (1.0.0)
+    try-catch (1.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    columnize (0.3.6)
+    debugger (1.6.6)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.2)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.2)
     rake (10.2.2)
 
 PLATFORMS
@@ -13,5 +20,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  debugger
   rake
   try-catch!

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.2.0

data/lib/try-catch.rb

@@ -1,117 +1,3 @@
-module TryCatch
-  module EXT; end
-
-  module Memory
-    @@memoryspace = {}
-    class << self
-
-      def save object_id, exception
-
-        begin
-
-          unless exception.class <= Exception
-            raise ArgumentError, "invalid exception attempt to be saved"
-          end
-
-          @@memoryspace[object_id] ||= []
-
-          if @@memoryspace[object_id].count >= 100
-            @@memoryspace[object_id].shift
-          end
-
-          @@memoryspace[object_id].push exception
-
-          return true
-        rescue ArgumentError
-          return false
-        end
-
-      end
-
-
-      #loaded_exs= @@memoryspace[object_id]
-      #return nil if loaded_exs.nil?
-      #return loaded_exs.pop unless loaded_exs.class != Array
-      def load object_id
-        ( @@memoryspace[object_id] || [] ).last
-      end
-
-
-    end
-  end
-
-  module Function
-    class << self
-
-      def try( self_object, *exception_classes, &block )
-
-        exception_classes.each do |exception_class|
-          unless exception_class <= Exception
-            raise ArgumentError, "invalid Exception: #{exception_class}"
-          end
-        end
-
-        exception_classes.push(Exception) if exception_classes.empty?
-
-        begin
-          return block.call
-        rescue *exception_classes => ex
-          TryCatch::Memory.save( self_object.object_id, ex )
-          return ex
-        end
-
-      end
-
-      def catch( self_object, *exception_classes, &block )
-
-        exception_classes.each do |exception_class|
-          unless exception_class <= Exception
-            raise ArgumentError, "invalid Exception: #{exception_class}"
-          end
-        end
-
-        exception_classes.push(Exception) if exception_classes.empty?
-
-        if self_object.class <= Exception
-          exception_obj= self_object
-        else
-          exception_obj= TryCatch::Memory.load( self_object.object_id )
-        end
-
-        return nil if exception_obj.nil?
-        return exception_obj if block.nil?
-
-
-
-        if exception_classes.map{ |exc| exception_obj.class <= exc }.include?(true)
-
-          if block.parameters.empty?
-            return block.call
-          else
-            return block.call exception_obj
-          end
-
-        else
-          return exception_obj
-        end
-
-      end
-
-    end
-  end
-
-  module EXT::Object
-
-    def try *exception_classes, &block
-      ::TryCatch::Function.try self, *exception_classes, &block
-    end
-
-    def catch *exception_classes, &block
-      ::TryCatch::Function.catch self, *exception_classes, &block
-    end
-
-  end
-
-end
-
-Object.__send__ :include, TryCatch::EXT::Object
+require 'try-catch/memory'
+require 'try-catch/functions'
+require 'try-catch/syntax'

data/lib/try-catch/functions.rb

@@ -0,0 +1,64 @@
+module TryCatch
+
+  module Function
+    class << self
+
+      def try( self_object, *exception_classes, &block )
+
+        exception_classes.each do |exception_class|
+          unless exception_class <= Exception
+            raise ArgumentError, "invalid Exception: #{exception_class}"
+          end
+        end
+
+        exception_classes.push(Exception) if exception_classes.empty?
+
+        begin
+          return block.call
+        rescue *exception_classes => ex
+          TryCatch::Memory.save( self_object.object_id, ex )
+          TryCatch::Memory.memory_agent
+
+          return ex
+
+        end
+
+      end
+
+      def catch( self_object, *exception_classes, &block )
+
+        exception_classes.each do |exception_class|
+          unless exception_class <= Exception
+            raise ArgumentError, "invalid Exception: #{exception_class}"
+          end
+        end
+
+        exception_classes.push(Exception) if exception_classes.empty?
+
+        if self_object.class <= Exception
+          exception_obj= self_object
+        else
+          exception_obj= TryCatch::Memory.load( self_object.object_id )
+        end
+
+        return nil if exception_obj.nil?
+        return exception_obj if block.nil?
+
+        if exception_classes.map{ |exc| exception_obj.class <= exc }.include?(true)
+
+          if block.parameters.empty?
+            return block.call
+          else
+            return block.call exception_obj
+          end
+
+        else
+          return exception_obj
+        end
+
+      end
+
+    end
+  end
+
+end

data/lib/try-catch/memory.rb

@@ -0,0 +1,95 @@
+module TryCatch
+
+  module Memory
+    @@memoryspace = {}
+    class << self
+
+      def init_memory_allocation opts={}
+        raise(ArgumentError) unless opts.class <= Hash
+
+        opts[:thread]     ||= opts.delete(:t) || Thread.current
+        opts[:object_id]  ||= opts.delete(:o) || opts.delete(:object)
+
+        @@memoryspace[opts[:thread]] ||= {}
+        unless opts[:object_id].nil?
+          @@memoryspace[opts[:thread]][opts[:object_id]] ||= []
+        end
+
+        return nil
+      end
+
+      def save object_id, exception
+
+        begin
+
+          init_memory_allocation o: object_id
+          @@memoryspace[Thread.current][object_id].push exception
+
+          return true
+        rescue ArgumentError
+          return false
+        end
+
+      end
+
+      #loaded_exs= @@memoryspace[object_id]
+      #return nil if loaded_exs.nil?
+      #return loaded_exs.pop unless loaded_exs.class != Array
+      def load object_id
+        
+        return nil if @@memoryspace[Thread.current].nil?
+        return @@memoryspace[Thread.current][object_id].last
+        
+      end
+      
+      def pop object_id
+        
+        return nil if @@memoryspace[Thread.current].nil?
+        
+        unless @@memoryspace[Thread.current][object_id].nil?
+          @@memoryspace[Thread.current][object_id].pop 
+        end
+          
+      end
+
+      def clean_memory_by_object_id object_id, thread= Thread.current
+
+        init_memory_allocation t: thread, o: object_id
+        if @@memoryspace[thread][object_id].count >= 20
+          ( @@memoryspace[thread][object_id].count - 10 ).times{ @@memoryspace[thread][object_id].shift }
+        end
+
+      end
+
+      def clean_thread_memory thread= Thread.current
+
+        init_memory_allocation t: thread
+        @@memoryspace[thread].keys.each{ |object_id| clean_memory_by_object_id(object_id) }
+
+      end
+
+      def memory_clean
+        Thread.list.each{ |thr| clean_thread_memory(thr) }
+      end
+
+      def memory_agent
+
+        @@memory_agent ||= nil
+        if @@memory_agent.nil?
+
+          @@memory_agent= ::Thread.new{
+            loop{
+              sleep(60)
+              Memory.memory_clean
+            }
+          }
+
+        end
+        return @@memory_agent
+
+      end
+
+    end
+  end
+
+end

data/lib/try-catch/syntax.rb

@@ -0,0 +1,18 @@
+module TryCatch
+
+  EXT= Module.new
+  module EXT::Object
+
+    def try *exception_classes, &block
+      ::TryCatch::Function.try self, *exception_classes, &block
+    end
+
+    def catch *exception_classes, &block
+      ::TryCatch::Function.catch self, *exception_classes, &block
+    end
+
+  end
+
+end
+
+Object.__send__ :include, TryCatch::EXT::Object

data/test/try_catch.rb

@@ -1,3 +1,8 @@
-require_relative '../lib/try-catch'
+require_relative '../lib/try-catch/memory'
+require_relative '../lib/try-catch/functions'
+require_relative '../lib/try-catch/syntax'
 
-catch(NoMethodError) { |ex| puts ex.to_s.upcase  }
+require 'debugger'
+
+try { puts("hello world".z) }
+catch(NoMethodError) { |ex| puts ex.to_s.upcase }

data/try-catch.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  %W[ rake bundler ].each{ |gem_name| spec.add_development_dependency(gem_name) }
+  %W[ rake bundler debugger ].each{ |gem_name| spec.add_development_dependency(gem_name) }
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: try-catch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: " try catch blocks for Ruby! "
 email:
 - adamluzsi@gmail.com
@@ -53,6 +67,9 @@ files:
 - VERSION
 - files.rb
 - lib/try-catch.rb
+- lib/try-catch/functions.rb
+- lib/try-catch/memory.rb
+- lib/try-catch/syntax.rb
 - test/try_catch.rb
 - try-catch.gemspec
 homepage: https://github.com/adamluzsi/try-catch