glue 0.23.0 → 0.24.0

data/ProjectInfo

@@ -0,0 +1,57 @@
+--- %YAML:1.0
+
+TITLE    : &title Glue
+NAME     : &pkg glue
+VERSION  : '0.24.0'
+STATUS   : beta
+
+AUTHOR   : George Moschovitis
+EMAIL    : &email gm@navel.gr
+HOMEPAGE : "http://www.nitrohq.com"
+
+SUMMARY: Utility methods and classes for Nitro.
+
+DESCRIPTION: >
+  Utility methods and classes for Nitro.
+
+DEPENDENCIES:
+ - [ facets, '= 2005.10.15' ]
+ - [ cmdparse, '= 2.0.0' ]
+ 
+DISTRIBUTE: [ gem, tgz, zip ]
+
+RUBYFORGE:
+  PROJECT: 'nitro'
+  USERNAME: 'gmosx'
+
+# Anything to require upfront?
+#TEST:
+#  fixture: ''
+
+ANNOUNCE:
+  to: george.moschovitis@gmail.com
+  from: gm@navel.gr
+  domain: navel.gr
+  server: mail
+  port: 25 #587
+  account: gm@navel.gr
+  authtype: login  #cram_md5 #plain
+  sectype: tls # ~, tls, ssl (tls is broke)
+  file: ANN
+  slogan: Glue
+  
+  
+  
+  links:
+    - http://www.nitrohq.com
+
+
+
+
+
+
+
+
+
+
+

data/README

@@ -1,4 +1,4 @@
-= Glue 0.23.0 README
+= Glue 0.24.0 README
 
 Useful utilites and methods.
 

data/Rakefile

@@ -55,8 +55,8 @@ spec = Gem::Specification.new do |s|
   end
   s.summary = 'Glue utilities'
   s.description = 'A collection of utilities and useful classes'
-  s.add_dependency 'nano', '>= 0.8.2'
-  s.add_dependency 'mega', '>= 0.3.1'
+# s.add_dependency 'facets', '= 0.8.2'
+# s.add_dependency 'cmdparse', '= 2.0.0'
 
   s.required_ruby_version = '>= 1.8.2'
 

data/doc/RELEASES

@@ -1,3 +1,19 @@
+== Version 0.24.0
+
+* Totaly recoded annotation / property system. The property
+  system is now based on Facet annotations and inheritors.
+  You can now annotate every object, attribute or method
+  in Nitro. For example you can annotate your actions with
+  routing rules or sitemap strings etc, etc. One unified
+  system for annotations and metadata is used throughout
+  the whole Framework.
+
+* Fixed minor Ruby 1.8.3 compatibility issues.
+
+* Even better integration with Ruby Facets.
+
+* Tons of bug fixes and small but useful features.
+
 == Version 0.23.0
 
 Major cleanup, this release marks a bold step towards Nano/Nitro

data/lib/glue.rb

@@ -11,9 +11,17 @@
 require 'English'
 require 'pp'
 
+require 'mega/null'
+
 require 'glue/property'
 require 'glue/attribute'
 
+# Fix for Mega.
+
+class NullClass
+  def [](key); nil; end
+end
+
 class NilClass
   # quite usefull for error tolerant apps.
   # a bit dangerous? Will have to rethink this.
@@ -56,7 +64,7 @@ module Glue
 
   # The version.
 
-  Version = '0.23.0'
+  Version = '0.24.0'
   
   # Library path.
 

data/lib/glue/aspects.rb

@@ -1,4 +1,4 @@
-require 'glue/property'
+require 'mega/inheritor'
 
 module Glue
 
@@ -33,8 +33,8 @@ end
 # 
 # module Timestamped
 #   pre :on => :og_insert { |this| this.create_time = Time.now }
-#    pre :on => :og_update { |this| this.update_time = Time.now }
-#    pre :on => [:og_insert, :og_update] { |this| this.create_time = Time.now }
+#   pre :on => :og_update { |this| this.update_time = Time.now }
+#   pre :on => [:og_insert, :og_update] { |this| this.create_time = Time.now }
 # end
 
 module Aspects
@@ -72,6 +72,9 @@ module Aspects
   # Include Modules that define advices.
 
   def self.include_advice_modules(target)
+    add_advices = []
+    del_advices = []
+    
     for a in target.advices
       if a.code.is_a?(Module) and (!a.code.class.ancestors.include?(Class))
         target.module_eval %{ include #{a.code} }
@@ -81,22 +84,28 @@ module Aspects
         method = (a.options[:pre] || 'pre').to_s
         if a.code.instance_methods.include?(method)
           options.update(:where => :prepend, :join => :pre)
-          target.advices << Advice.new(method, options)  
+          add_advices <<  Advice.new(method.to_sym, options)
         end
         
         method = (a.options[:post] || 'post').to_s
         if a.code.instance_methods.include?(method)
           options.update(:where => :append, :join => :post)
-          target.advices << Advice.new(method, options)  
+          add_advices <<  Advice.new(method.to_sym, options)
         end
+        
+        del_advices << a
       end
     end
 
-    # Remove the original advice.
-
-    target.advices.delete_if do |a| 
-      a.code.is_a?(Module) and (!a.code.class.ancestors.include?(Class))
+    # Delete the original advices.
+    
+    for a in del_advices
+      target.advices!.delete(a)
     end
+    
+    # Add the new advices.
+    
+    target.advices!.concat(add_advices)
   end
 
   # Generates the code to call the aspects.
@@ -142,18 +151,7 @@ module Aspects
   def self.append_features(base)
     super
     base.extend(ClassMethods)
-
-    base.module_eval %{
-      Glue::PropertyUtils.enchant(self)  
-
-      def self.advices 
-        __meta[:advices] || []
-      end
-
-      def self.advices=(advices)
-        __meta[:advices] = advices
-      end
-    }
+    base.inheritor :advices, [], :+
   end
 
   module ClassMethods
@@ -168,16 +166,18 @@ module Aspects
       options.update(args.pop) if args.last.is_a?(Hash)
 
       if block_given?
-        advices = [ Advice.new(block, options) ]
+        new_advices = [ Advice.new(block, options) ]
       else
-        advices = args.collect { |a| Advice.new(a, options) }
+        new_advices = args.collect { |a| Advice.new(a, options) }
       end
-      
+=begin      
       if options[:where] == :prepend
         self.advices = advices + self.advices
       else
         self.advices = self.advices + advices
       end
+=end
+      self.advices!.concat(new_advices)
     end
     alias_method :before, :pre
     
@@ -191,16 +191,18 @@ module Aspects
       options.update(args.pop) if args.last.is_a?(Hash)
 
       if block_given?
-        advices = [ Advice.new(block, options) ]
+        new_advices = [ Advice.new(block, options) ]
       else
-        advices = args.collect { |a| Advice.new(a, options) }
+        new_advices = args.collect { |a| Advice.new(a, options) }
       end
-      
+=begin      
       if options[:where] == :prepend
         self.advices = advices + self.advices
       else
         self.advices = self.advices + advices
       end
+=end      
+      self.advices!.concat(new_advices)
     end
     alias_method :after, :post
 
@@ -215,7 +217,7 @@ module Aspects
       options.update(args.pop) if args.last.is_a?(Hash)
 
       for aspect in args
-        self.advices << Advice.new(aspect, options)
+        self.advices! << Advice.new(aspect, options)
       end
     end
     alias_method :around, :wrap

data/lib/glue/bit.rb

@@ -0,0 +1,53 @@
+# (c) 2005 George Moschovitis  <gm@navel.gr>
+
+def bitmask(bit)
+  1 << bit
+end
+
+def set_bit(num, bit)
+  mask = bitmask(bit)
+  num |= mask
+end
+
+def clear_bit(num, bit)
+  mask = bitmask(bit)
+  num &= mask
+end
+
+def test_bit(num, bit)
+  mask = bitmask(bit)
+  (num & mask) != 0
+end
+alias :bit? :test_bit
+alias :bit_set? :test_bit
+
+def set_bitmask(num, mask)
+  num |= mask
+end
+
+def test_bitmask(num, mask)
+  num &= mask
+end
+alias :bitmask? :test_bitmask
+
+if $0 == __FILE__
+  a =  1
+  m = bitmask(4)
+  a = set_bitmask(a, m)
+  p a
+  p test_bitmask(a, m)
+  p test_bit(a, 4)
+  p bit_set?(a, 4)
+  p test_bit(a, 12)
+end
+
+__END__
+
+Is it possible to get an interface like this?
+
+a = 1
+a.set_bit(3)
+if a.test_bit(3)
+
+if a.bit_set? 3
+end

data/lib/glue/configuration.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 
-require 'nano/object/constant'
+require 'nano/kernel/constant'
 require 'mega/synchash'
 
 require 'glue/attribute'

data/lib/glue/fixture.rb

@@ -1,4 +1,4 @@
-require 'nano/object/constant'
+require 'nano/kernel/constant'
 
 require 'mega/orm_support'
 

data/lib/glue/flexob.rb

@@ -11,6 +11,15 @@ class Flexob < OpenStruct
     end
   end
   alias_method :set, :update
+  alias_method :merge, :update
+
+  def fetch(key, default = nil)
+    if @table.has_key?(key)
+      @table[key.to_sym]
+    else
+      default
+    end
+  end
 
   def []=(key, val)
     @table[key.to_sym] = val
@@ -23,7 +32,10 @@ class Flexob < OpenStruct
   def each(&block)
     @table.each(&block)
   end    
-  
+
+  def has_key?(key)  
+    @table.has_key?(key)
+  end
+
 end
 
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/helper.rb

@@ -12,6 +12,7 @@ module Glue
 module Helpers
 
   def self.append_features(base)
+    super
     base.module_eval do
       def self.helper(*modules)
         for mod in modules

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 'nano/binding/of_caller'
+      require 'nano/binding/self/of_caller'
 
       Binding.of_caller do |b|
         value = b.eval(expr.to_str)
@@ -82,20 +82,20 @@ class Logger
   # 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
+#    raise 'Formating block needed' unless format_proc
+#    @format_proc = format_proc
   end
 
 private
   
   # hackish use of *args, give me some love.
   
+  alias_method :old_format_message, :format_message
   def format_message(*args)
-    @format_proc ? @format_proc.call(*args) : super(*args)
+    @format_proc ? @format_proc.call(*args) : old_format_message(*args)
   end
-
 end
 
 # Global logger interface. This provides an alternative 
@@ -103,9 +103,9 @@ end
 
 class Logger
 
-   SIMPLE_FORMAT = "%5s: %s\n"
+  SIMPLE_FORMAT = "%5s: %s\n"
   @@global_logger = Logger.new(STDERR)
-  @@global_logger.setup_format do |severity, timestamp, msg, progname|
+  @@global_logger.setup_format do |severity, timestamp, progname, msg|  
     SIMPLE_FORMAT % [severity, msg]
   end
   
@@ -114,12 +114,12 @@ class Logger
   def self.set(logger)
     if logger.is_a?(String)
       @@global_logger = Logger.new(logger)
-      @@global_logger.setup_format do |severity, timestamp, msg, progname|
+      @@global_logger.setup_format do |severity, timestamp, progname, msg|  
         SIMPLE_FORMAT % [severity, msg]
       end
     elsif logger.is_a?(Logger)
       @@global_logger = logger
-      @@global_logger.setup_format do |severity, timestamp, msg, progname|
+      @@global_logger.setup_format do |severity, timestamp, progname, msg|  
         SIMPLE_FORMAT % [severity, msg]
       end
     else
@@ -155,7 +155,7 @@ class Logger
     unless expr.respond_to? :to_str
       warn "trace: Can't evaluate the given value: #{caller.first}"
     else
-      require 'nano/binding/of_caller'
+      require 'nano/binding/self/of_caller'
 
       Binding.of_caller do |b|
         value = eval(expr.to_str, b)

data/lib/glue/mailer/incoming.rb

@@ -23,9 +23,7 @@ module Glue
 # sudo postfix start
 
 module IncomingMailer
-  def self.included(base)
-    base.extend ClassMethods
-  end
+  on_included %{ base.extend ClassMethods }  
   
   # You can overide this class for specialized handling.