glue 0.22.0 → 0.23.0

data/README

@@ -1,4 +1,4 @@
-= Glue 0.22.0 README
+= Glue 0.23.0 README
 
 Useful utilites and methods.
 
@@ -6,14 +6,14 @@ Useful utilites and methods.
 == Purpose
 
 Useful libraries are stored here. An attempt is made to 
-graduate smaller libraries to the more general Facets
+graduate smaller libraries to the more general Nano/Mega
 ruby project.
 
 
 == Licence
 
-Copyright (c) 2004-2005, George 'gmosx' Moschovitis (http://www.gmosx.com)
 Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
+Copyright (c) 2004-2005, George 'gmosx' Moschovitis (http://www.gmosx.com)
 
 Glue (http://www.rubyforge.org/projects/nitro) is copyrighted free 
 software created and maintained by George Moschovitis (mailto:gm@navel.gr)

data/Rakefile

@@ -55,14 +55,14 @@ spec = Gem::Specification.new do |s|
   end
   s.summary = 'Glue utilities'
   s.description = 'A collection of utilities and useful classes'
-  s.add_dependency 'facets', '>= 0.7.2'
-  #s.add_dependency 'flexmock', '>= 0.0.3'
+  s.add_dependency 'nano', '>= 0.8.2'
+  s.add_dependency 'mega', '>= 0.3.1'
 
   s.required_ruby_version = '>= 1.8.2'
 
   s.files = FileList[
     '[A-Z]*', 'install.rb', '{doc,lib,test,vendor}/**/*' 
-  ].exclude('.svn/**/*').exclude('**/*.log').to_a
+  ].exclude("_darcs").exclude("_darcs/**/*").exclude('**/*.log').to_a
 
   s.require_path = 'lib'
   s.autorequire = 'glue'

data/doc/RELEASES

@@ -1,3 +1,13 @@
+== Version 0.23.0
+
+Major cleanup, this release marks a bold step towards Nano/Nitro
+integration.
+
+* Moved some files to the Nano/Mega project.
+
+* Dreprecated functionality already available in Nano/Mega.
+
+
 == Version 0.22.0
 
 * New mailer implementation.

data/lib/glue.rb

@@ -1,13 +1,12 @@
 # = Glue
 #
-# General libraries used by various projects.
-#
-# Copyright (c) 2004-2005, George Moschovitis (http://www.gmosx.com)
 # Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
+# Copyright (c) 2004-2005, George Moschovitis (http://www.gmosx.com)
 #
-# Glue is copyrighted free software created and maintained by 
-# George Moschovitis (mailto:gm@navel.gr) and released under the 
-# standard BSD Licence. For details consult the file doc/LICENCE.
+# Glue (http://www.nitrohq.com) is copyrighted free software 
+# created and maintained by George Moschovitis (mailto:gm@navel.gr) 
+# and released under the standard BSD Licence. For details 
+# consult the file doc/LICENCE.
 
 require 'English'
 require 'pp'
@@ -16,7 +15,6 @@ require 'glue/property'
 require 'glue/attribute'
 
 class NilClass
-
   # quite usefull for error tolerant apps.
   # a bit dangerous? Will have to rethink this.
   
@@ -26,8 +24,7 @@ class NilClass
   
   def blank?
     true
-  end
-  
+  end  
 end
 
 class Class
@@ -41,7 +38,6 @@ class Class
 end
 
 module Kernel
-
   # Pretty prints an exception/error object
   # usefull for helpfull debug messages
   #
@@ -54,14 +50,13 @@ module Kernel
   def pp_exception(ex)
     return %{#{ex.message}\n  #{ex.backtrace.join("\n  ")}\n  LOGGED FROM: #{caller[0]}}
   end
-
 end
 
 module Glue
 
   # The version.
 
-  Version = '0.22.0'
+  Version = '0.23.0'
   
   # Library path.
 

data/lib/glue/configuration.rb

@@ -1,9 +1,9 @@
 require 'yaml'
 
-require 'facet/object/constant'
+require 'nano/object/constant'
+require 'mega/synchash'
 
 require 'glue/attribute'
-require 'glue/hash'
 require 'glue/flexob'
 
 # A Configuration holds a group of Settings organized by
@@ -20,7 +20,7 @@ class Configuration
   # TODO: find a better name.
   #++
     
-  @@owners = Glue::SafeHash.new  
+  @@owners = SyncHash.new  
 
   # A datastructure to store Settings metadata.
   
@@ -107,7 +107,7 @@ class Configuration
     alias_method :[], :settings
 
     def method_missing(sym)
-      if sym.to_s =~ /[A-Z]/ # facet's capitalized? is buggy at the moment.
+      if sym.to_s =~ /[A-Z]/ # nano's capitalized? is buggy at the moment.
         Flexob.new(self[constant(sym)])
       end
     end

data/lib/glue/fixture.rb

@@ -1,6 +1,6 @@
-require 'facet/object/constant'
-require 'facet/string/underscore'
-require 'facet/string/demodulize'
+require 'nano/object/constant'
+
+require 'mega/orm_support'
 
 require 'glue/configuration'
 require 'glue/template'
@@ -63,7 +63,6 @@ class Fixture < Hash
   
   attr_accessor :objects
   
-  
   def initialize(klass, options = { } )
     @klass = klass
     @name = class_to_name(klass)

data/lib/glue/helper.rb

@@ -1,6 +1,5 @@
-require 'facet/module/by_name'
+require 'nano/module/by_name'
 
-require 'glue/object'
 require 'glue/attribute'
 
 module Glue

data/lib/glue/logger.rb

@@ -43,7 +43,7 @@ class Logger
     unless expr.respond_to? :to_str
       warn "trace: Can't evaluate the given value: #{caller.first}"
     else
-      require 'facet/binding-of-caller'
+      require 'nano/binding/of_caller'
 
       Binding.of_caller do |b|
         value = b.eval(expr.to_str)
@@ -71,21 +71,57 @@ class Logger
     :inspect => :inspect, :to_yaml => :to_yaml 
   )
 
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # Global logger interface. 
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Dictate the way in which this logger should format the 
+  # messages it displays. This method requires a block. The 
+  # block should return formatted strings given severity, 
+  # timestamp, msg, progname.
+  #
+  # Useless example:
+  #
+  # logger = Logger.new
+  # logger.format do |severity, timestamp, msg, progname|
+  #   "#{progname}@#{timestamp} - #{severity}::#{msg}"
+  # end
+  
+  def setup_format(&format_proc)
+    raise 'Formating block needed' unless format_proc
+    @format_proc = format_proc
+  end
 
-  # Override the logger with your custom version.
+private
   
-  @@global_logger = Logger.new(STDERR)
+  # hackish use of *args, give me some love.
+  
+  def format_message(*args)
+    @format_proc ? @format_proc.call(*args) : super(*args)
+  end
+
+end
+
+# Global logger interface. This provides an alternative 
+# Singleton interface to the Logger.
+
+class Logger
 
+   SIMPLE_FORMAT = "%5s: %s\n"
+  @@global_logger = Logger.new(STDERR)
+  @@global_logger.setup_format do |severity, timestamp, msg, progname|
+    SIMPLE_FORMAT % [severity, msg]
+  end
+  
   # Set the global Logger.
   
   def self.set(logger)
     if logger.is_a?(String)
       @@global_logger = Logger.new(logger)
+      @@global_logger.setup_format do |severity, timestamp, msg, progname|
+        SIMPLE_FORMAT % [severity, msg]
+      end
     elsif logger.is_a?(Logger)
       @@global_logger = logger
+      @@global_logger.setup_format do |severity, timestamp, msg, progname|
+        SIMPLE_FORMAT % [severity, msg]
+      end
     else
       raise ArgumentError.new
     end
@@ -119,7 +155,7 @@ class Logger
     unless expr.respond_to? :to_str
       warn "trace: Can't evaluate the given value: #{caller.first}"
     else
-      require 'facet/binding-of-caller'
+      require 'nano/binding/of_caller'
 
       Binding.of_caller do |b|
         value = eval(expr.to_str, b)
@@ -139,22 +175,6 @@ class Logger
       end
     end
   end
-  
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  
-  private
-    
-  # the default Ruby logger has a hardwired silly format.
-  # we use some Ruby magic to fix it!
-
-  remove_const "Format"
-
-  Format = "%5s: %s\n"
-
-  def format_message(severity, timestamp, msg, progname)
-    Format % [severity, msg]
-  end
-
 end
 
 module Glue

data/lib/glue/metadata.rb

@@ -0,0 +1,60 @@
+require 'glue/flexob'
+
+# WARNING: this is under construction, DON'T use yet.
+
+module MetadataUtils
+end
+
+# Include this module to classes to add metadata/annotation
+# functionality.
+
+module MetadataMixin
+  def self.included(base)
+    base.module_eval do
+      @metadata = Flexob.new
+      @metadata[:self] = Flexob.new
+      
+      class << self
+        def metadata
+          @metadata
+        end
+        
+        def selmetadata=(md)
+          @metadata = md
+        end
+      end
+    end
+    
+=begin
+    case base
+      when Class:
+        base.module_eval do
+          def self.inherited(child)
+            MetadataUtils.enchant(child)
+            MetadataUtils.copy(self, child)
+            # gmosx: super must stay at the end.
+            super
+          end
+        end      
+      when Module:
+    end
+=end    
+  end
+end
+
+class Module
+  # Annotate (define metadata) for the given symbol/class.
+  
+  def ann(*args)
+    if args.first.is_a? Symbol
+      key = args.shift
+    else
+      key = :self
+    end
+    unless args.empty?
+      self.metadata[key] = Flexob.new(args.first)
+    end
+  end  
+end
+
+# * George Moschovitis <gm@navel.r>

data/lib/glue/mock.rb

@@ -0,0 +1,40 @@
+require 'ostruct'
+
+# A simple mocking facility. Typically used in test cases.
+#
+# === Example:
+#
+#  class ContextMock < Mock
+#    mock :response_headers, {}
+#    mock :host_url, 'http://www.nitrohq.com'
+#  end
+#
+# ctx = ContextMock.new
+# ctx.response_headers['location'] = url
+# ctx.host_url
+  
+class Mock < OpenStruct
+  class << self
+    attr :mocks
+
+    # Mock a symbol, val is the default values. Useful
+    # for mocking structured variables like arrays and
+    # hashes.
+      
+    def mock(sym, val)
+      @mocks ||= {}
+      @mocks[sym] = val
+      attr_accessor sym
+    end
+  end
+      
+  def initialize
+    super
+    
+    for sym, val in self.class.mocks
+      unless val.is_a? Proc
+        instance_variable_set "@#{sym}", val
+      end
+    end
+  end
+end

data/lib/glue/property.rb

@@ -1,7 +1,10 @@
+require 'mega/synchash'
+require 'mega/syncarray'
+
+require 'nano/time/change'
+
 require 'glue/attribute'
 require 'glue/flexob'
-require 'glue/array'
-require 'glue/hash'
 
 module Glue
 
@@ -49,11 +52,16 @@ class Property
   # You can use this mechanism to add your own, custom,
   # metadata.
   
-  attr_accessor :meta
-
-  def initialize(symbol, klass, meta = {})
+  attr_accessor :metadata
+  
+  # Support legacy code, will be deprecated.
+  
+  alias_method :meta, :metadata
+  alias_method :meta=, :metadata=
+  
+  def initialize(symbol, klass, metadata = {})
     @symbol, @klass = symbol, klass
-    @meta = meta
+    @metadata = metadata
   end
   
   def ==(other)
@@ -63,7 +71,6 @@ class Property
   def to_s
     return @symbol.to_s 
   end
-
 end
 
 # A collection of Property related utility methods.
@@ -84,7 +91,7 @@ module PropertyUtils
     unless target.instance_variables.include?('@__props')
       # FIXME: should be thread safe here!
       target.instance_variable_set('@__meta', Flexob.new)
-      target.instance_variable_set('@__props', SafeArray.new)
+      target.instance_variable_set('@__props', SyncArray.new)
 
       # gmosx: Ruby surprises and amazes me! We are in the Metaclass
       # when defining methods and attributes so @__props is really
@@ -201,7 +208,7 @@ module PropertyUtils
     # overrides.
 
     if prop.meta[:writer]
-      target.module_eval %{
+      code = %{
         #{prop_setter(prop)}
         
         def __force_#{s}(val)
@@ -220,7 +227,24 @@ module PropertyUtils
                 "val"
             end + %{) 
         end
+        
+        def __force_hash_#{s}(hash)          
       }
+        
+      case klass.name
+        when Time.name
+          code << %{
+            ihash = {}
+            hash = hash.map { |k, v| ihash[k.intern] = v.to_i }
+            @#{s} = @#{s}.change(ihash)
+          }
+      end
+
+      code << %{
+        end             
+      }
+      
+      target.module_eval(code)
     end
   end