dynaload 0.1.1 → 0.2.0

data/lib/dynaload-0.2.0.rb

@@ -0,0 +1,81 @@
+module Dynaload
+  VERSION = '0.2.0'
+
+  class ExportError < ::StandardError; end
+
+  class Exported < ::Hash
+    THINGS = %w( classes modules objects )
+    def initialize(*a, &b)
+      super
+      THINGS.each{|thing| self[thing] = []}
+    end
+    def method_missing(m,*a,&b)
+      self[m] || self["#{ m }"] || super
+    end
+    def empty?
+      THINGS.map{|thing| self[thing].empty?}.all?
+    end
+    def clear!
+      THINGS.each{|thing| self[thing].clear}
+      self
+    end
+    def 
+          case thing 
+            when Class
+              dyna_exported.classes << [thing, attributes]
+            when Module
+              dyna_exported.modules << [thing, attributes]
+            else
+              dyna_exported.objects << [thing, attributes]
+          end
+  end
+
+  module Dynaloadable
+    module ClassMethods
+      def dyna_exported
+        ::Dynaload::exported ||= ::Dynaload::Exported::new 
+      end
+      def dyna_export *args
+        things, attribute_hashes = args.partition{|arg| not Hash === arg} 
+        raise ArgumentError, "nothing given to dyna_export!" if things.empty?
+        attributes = attribute_hashes.inject({}){|h,ah| h.update ah}
+        things.each do |thing|
+          case thing 
+            when Class
+              dyna_exported.classes << [thing, attributes]
+            when Module
+              dyna_exported.modules << [thing, attributes]
+            else
+              dyna_exported.objects << [thing, attributes]
+          end
+        end
+        dyna_exported.classes.uniq!
+        dyna_exported.modules.uniq!
+        dyna_exported.objects.uniq!
+        dyna_exported
+      end
+      alias_method "export", "dyna_export"
+      alias_method "exported", "dyna_exported"
+    end
+    module InstanceMethods; end
+    extend ClassMethods
+    def self::included other 
+      other.extend ClassMethods
+      other.module_eval{ include InstanceMethods }
+    end
+  end
+
+  class Dynaloader
+    def dynaload path
+      ::Kernel::load path, true 
+      raise ExportError, "no dynamic exports from <#{ path }>!" if Dynaload::exported.empty?
+      Dynaload::exported
+    end
+  end
+
+  include Dynaloadable
+
+  def self::dynaload(*a, &b)
+    (@dynaloader ||= Dynaloader::new).dynaload(*a, &b)
+  end
+end

data/lib/dynaload.rb

@@ -1,110 +1,67 @@
 module Dynaload
-#--{{{
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
+
+  require "sync"
+
+  extend Sync_m
+
   class ExportError < ::StandardError; end
+
   class Exported < ::Hash
-#--{{{
-    def initialize(*a, &b)
-#--{{{
+    THINGS = %w( classes modules objects )
+    def initialize *a, &b
       super
-      self['classes'] = []
-      self['modules'] = []
-      self['objects'] = []
-#--}}}
+      THINGS.each{|thing| self[thing] = []}
     end
-    def method_missing(m,*a,&b)
-#--{{{
-      self[m] || self["#{ m }"] || super
-#--}}}
+    def method_missing m, *a, &b
+      self["#{ m }"] || super
     end
-#--}}}
-  end
-  module DynaloadableMethods
-#--{{{
-    def dyna_exported
-#--{{{
-      Dynaload::exported ||= Exported::new 
-#--}}}
+    def empty?
+      THINGS.map{|thing| self[thing].empty?}.all?
     end
-    def dyna_export(*args)
-#--{{{
-     things, attribute_hashes = args.partition{|arg| not Hash === arg} 
-     raise ArgumentError, "nothing given to dyna_export!" if things.empty?
-     attributes = attribute_hashes.inject({}){|h,ah| h.update ah}
-      things.each do |thing|
-        case thing 
-          when Class
-            dyna_exported.classes << [thing, attributes]
-          when Module
-            dyna_exported.modules << [thing, attributes]
-          else
-            dyna_exported.objects << [thing, attributes]
-        end
-      end
-      dyna_exported.classes.uniq!
-      dyna_exported.modules.uniq!
-      dyna_exported.objects.uniq!
-      dyna_exported
-#--}}}
+    def clear!
+      THINGS.each{|thing| self[thing].clear}
+      self
     end
-    alias export dyna_export
-    alias exported dyna_exported
-#--}}}
-  end
-  module Dynaloadable
-#--{{{
-    include DynaloadableMethods
-    class << self
-#--{{{
-      include DynaloadableMethods
-      def append_features klass
-#--{{{
-        klass.extend DynaloadableMethods
-        super
-#--}}}
+    def export thing, attributes 
+      case thing 
+        when Class
+          (self['classes'] << [thing, attributes]).uniq!
+        when Module
+          (self['modules'] << [thing, attributes]).uniq!
+        else
+          (self['objects'] << [thing, attributes]).uniq!
       end
-#--}}}
+      self
     end
-#--}}}
-  end
-  class Dynaloader
-#--{{{
-    def dynaload path, opts = {}
-#--{{{
-        wrap = true 
-        wrap = opts[:wrap] if opts.has_key? :wrap
-        wrap = opts['wrap'] if opts.has_key? 'wrap'
-        Dynaload::exported = nil
-        Kernel::load path, wrap
-        raise ExportError, "no dynamic exports from <#{ path }>!" unless Exported === Dynaload::exported
-        Dynaload::exported
-#--}}}
+    def dup
+      THINGS.inject({}){|h,t| h[t] = self[t].dup}
     end
-    alias dyna_load dynaload 
-    alias load dynaload
-#--}}}
   end
+
   class << self
-#--{{{
-    def dynaload(*a, &b)
-#--{{{
-      (@dynaloader ||= Dynaloader::new).dynaload(*a, &b)
-#--}}}
-    end
-    alias dyna_load dynaload 
-    alias load dynaload
     def exported
-#--{{{
-      @exported ||= Exported::new 
-#--}}}
+      synchronize{ @exported ||= Exported::new }
+    end
+
+    def export thing, attributes = {}
+      synchronize{ exported.export thing, attributes }
     end
-    def exported= e
-#--{{{
-      @exported = e 
-#--}}}
+
+    def dynaload path, opts = {"wrap" => true}
+      ret = nil
+      synchronize do
+        begin
+          @exported = Exported::new
+          ::Kernel::load(path, opts["wrap"] || opts[:wrap]) 
+          raise ExportError, "no dynamic exports from <#{ path }>!" if 
+            @exported.nil? or @exported.empty?
+          ret = @exported
+        ensure
+          @exported = nil
+        end
+      end
+      ret
     end
-#--}}}
   end
-  include Dynaloadable
-#--}}}
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: dynaload
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2005-12-09 00:00:00.000000 -07:00
+  version: 0.2.0
+date: 2005-12-12 00:00:00 -07:00
 summary: dynaload
 require_paths: 
   - lib
@@ -29,8 +29,8 @@ cert_chain:
 authors: 
   - Ara T. Howard
 files: 
+  - lib/dynaload-0.2.0.rb
   - lib/dynaload.rb
-  - lib/dynaload-0.1.1.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []

data/lib/dynaload-0.1.1.rb

@@ -1,110 +0,0 @@
-module Dynaload
-#--{{{
-  VERSION = '0.1.1'
-  class ExportError < ::StandardError; end
-  class Exported < ::Hash
-#--{{{
-    def initialize(*a, &b)
-#--{{{
-      super
-      self['classes'] = []
-      self['modules'] = []
-      self['objects'] = []
-#--}}}
-    end
-    def method_missing(m,*a,&b)
-#--{{{
-      self[m] || self["#{ m }"] || super
-#--}}}
-    end
-#--}}}
-  end
-  module DynaloadableMethods
-#--{{{
-    def dyna_exported
-#--{{{
-      Dynaload::exported ||= Exported::new 
-#--}}}
-    end
-    def dyna_export(*args)
-#--{{{
-     things, attribute_hashes = args.partition{|arg| not Hash === arg} 
-     raise ArgumentError, "nothing given to dyna_export!" if things.empty?
-     attributes = attribute_hashes.inject({}){|h,ah| h.update ah}
-      things.each do |thing|
-        case thing 
-          when Class
-            dyna_exported.classes << [thing, attributes]
-          when Module
-            dyna_exported.modules << [thing, attributes]
-          else
-            dyna_exported.objects << [thing, attributes]
-        end
-      end
-      dyna_exported.classes.uniq!
-      dyna_exported.modules.uniq!
-      dyna_exported.objects.uniq!
-      dyna_exported
-#--}}}
-    end
-    alias export dyna_export
-    alias exported dyna_exported
-#--}}}
-  end
-  module Dynaloadable
-#--{{{
-    include DynaloadableMethods
-    class << self
-#--{{{
-      include DynaloadableMethods
-      def append_features klass
-#--{{{
-        klass.extend DynaloadableMethods
-        super
-#--}}}
-      end
-#--}}}
-    end
-#--}}}
-  end
-  class Dynaloader
-#--{{{
-    def dynaload path, opts = {}
-#--{{{
-        wrap = true 
-        wrap = opts[:wrap] if opts.has_key? :wrap
-        wrap = opts['wrap'] if opts.has_key? 'wrap'
-        Dynaload::exported = nil
-        Kernel::load path, wrap
-        raise ExportError, "no dynamic exports from <#{ path }>!" unless Exported === Dynaload::exported
-        Dynaload::exported
-#--}}}
-    end
-    alias dyna_load dynaload 
-    alias load dynaload
-#--}}}
-  end
-  class << self
-#--{{{
-    def dynaload(*a, &b)
-#--{{{
-      (@dynaloader ||= Dynaloader::new).dynaload(*a, &b)
-#--}}}
-    end
-    alias dyna_load dynaload 
-    alias load dynaload
-    def exported
-#--{{{
-      @exported ||= Exported::new 
-#--}}}
-    end
-    def exported= e
-#--{{{
-      @exported = e 
-#--}}}
-    end
-#--}}}
-  end
-  include Dynaloadable
-#--}}}
-end