glue 0.30.0 → 0.31.0

data/ProjectInfo

@@ -2,7 +2,7 @@
 
 TITLE    : &title Glue
 NAME     : &pkg glue
-VERSION  : '0.30.0'
+VERSION  : '0.31.0'
 STATUS   : beta
 
 AUTHOR   : George Moschovitis
@@ -19,7 +19,7 @@ RUBYFORGE:
   USERNAME: 'gmosx'
 
 DEPENDENCIES:
- - [ facets, '= 1.3.3' ]
+ - [ facets, '= 1.4.5' ]
  
 PACKAGE: !!package
   distribute: [ gem, tgz, zip ]

data/doc/RELEASES

@@ -1,3 +1,7 @@
+== Version 0.31.0
+
+Bugfixes. Refactored taggable.rb and removed attribute in favor of Facets's cattr which was then replaced with settings.
+
 == Version 0.30.0
 
 Cleaned up the codebase. Removed files duplicating functionality

data/lib/glue.rb

@@ -13,10 +13,10 @@ require 'pp'
 
 require 'facet/nullclass'
 require 'facets/more/paramix' # keep this before module/is
-require 'facet/module/is'
+require 'facets/core/module/is'
+require 'facets/core/class/cattr'
 
 require 'glue/property'
-require 'glue/attribute'
 
 # Glue is a collection of reusable utilities and methods to 
 # especially suited to Nitro and Og coding. We try to extract
@@ -36,7 +36,7 @@ module Glue
 
   # The version.
 
-  Version = '0.30.0'
+  Version = '0.31.0'
   
   # Library path.
 

data/lib/glue/configuration.rb

@@ -5,9 +5,6 @@ require 'facet/synchash'
 require 'facet/dictionary'
 require 'facet/string/capitalized'
 
-require 'glue/attribute'
-require 'glue/flexob'
-
 module Glue
 
 # A Configuration holds a group of Settings organized by
@@ -17,7 +14,6 @@ module Glue
 # You can pass strings, constants or symbols as keys for the
 # classes to be configured. Passing symbols you can configure
 # classes even before they are defined.
-#
 #--
 # TODO: implement with annotations.
 #++
@@ -185,7 +181,6 @@ class Configuration
     
     def method_missing(sym)
       if sym.to_s.capitalized?
-#        Flexob.new(self[sym])
          bdl = SettingCollection.new
          bdl.owner = sym
          if hash = self[sym]

data/lib/glue/logger.rb

@@ -1,10 +1,16 @@
 require 'logger'
 
-# A simple wrapper arround the Ruby logger. Mainly for 
+# A simple extension of the Ruby logger. Mainly for 
 # compatibility purposes.
 #
+# === Convention
+#
+# When using debug level logger messages always append 'if $DBG'
+# at the end. This hack is needed because Ruby does not support
+# lazy evaluation (lisp macros).
 #--
-# TODO: implement as mixin that can be added to Log4R.
+# THINK: some people think, this extension is dangerous, 
+# investigate.
 #++
 
 class Logger
@@ -76,24 +82,24 @@ class Logger
   # block should return formatted strings given severity, 
   # timestamp, msg, progname.
   #
-  # Useless example:
+  # === Example
   #
   # logger = Logger.new
-  # logger.format do |severity, timestamp, msg, progname|
+  # logger.setup_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)
+  alias_method :old_format_message, :format_message # :nodoc:
+  def format_message(*args) # :nodoc:
     @format_proc ? @format_proc.call(*args) : old_format_message(*args)
   end
 end
@@ -179,18 +185,25 @@ end
 
 module Glue
 
+# UNDER CONSTRUCTION.
+#
 # Add logging capabilities to the including class.
-# When using the log/logger variables always check 
-# for nil:
 #
-# log.info "your #{expensive_calculation} comes here" if @log
+# === Examples
 #
-# This way the expensive calculation is avoided if the 
-# logger is dissabled (@log == nil).
+# Og.log_info 'Hello' => '[Og] Hello'
+# Render.log_info ...
+# In Render:
+# log_info '...'
 
 module Logging 
-  attr_accessor :logger
-  alias_method :log, :logger
+=begin
+  def self.included base
+    [ :info, :debug ].each do |l|
+    
+    end
+  end
+=end
 end
 
 end

data/lib/glue/markup.rb

@@ -2,7 +2,7 @@ require 'singleton'
 require 'redcloth'
 require 'cgi'
 
-require 'facet/classinherit'
+require 'facets/core/module/class_extension'
 
 require 'glue/sanitize'
 
@@ -94,7 +94,7 @@ module Markup
     CGI.unescape(str.gsub(/_/, ' '))
   end      
   
-  class_inherit do
+  class_extension do
     # Helper method for manipulating the sanitize transformation.
     
     def setup_sanitize_transform(&block)

data/lib/glue/template.rb

@@ -1,4 +1,4 @@
-require 'glue/flexob'
+require 'facets/more/openobject'
 require 'glue/configuration'
 
 module Glue
@@ -164,14 +164,14 @@ class Template
   setting :strip_xml_comments, :default => false, :doc => 'Strip xml comments from templates?'
 
   class << self
-    include Glue::TemplateMixin
+    include TemplateMixin
     alias_method :compile, :compile_template
     alias_method :transform, :compile_template
     alias_method :evaluate, :evaluate_template
     alias_method :process, :process_template
   end
   
-  include Glue::TemplateMixin
+  include TemplateMixin
   
   # Helper.
   
@@ -187,8 +187,8 @@ end
 # An intuitive binding mechanism provides the
 # expansion environment.
 
-class FileTemplate < Flexob
-  include Glue::TemplateMixin
+class FileTemplate < OpenObject
+  include TemplateMixin
 
   @@compiled_template_cache = {}
 

data/lib/glue/validation.rb

@@ -1,4 +1,5 @@
-require 'glue/attribute'
+require 'facets/core/class/cattr'
+
 require 'glue/configuration'
 
 module Glue 
@@ -70,16 +71,16 @@ module Validation
   class Errors
     attr_accessor :errors 
 
-    cattr_accessor :no_value, 'No value provided'
-    cattr_accessor :no_confirmation, 'Invalid confirmation'
-    cattr_accessor :invalid_format, 'Invalid format'
-    cattr_accessor :too_short, 'Too short, must be more than %d characters long'
-    cattr_accessor :too_long, 'Too long, must be less than %d characters long'
-    cattr_accessor :invalid_length, 'Must be %d characters long'
-    cattr_accessor :no_inclusion, 'The value is invalid'
-    cattr_accessor :no_numeric, 'The value must be numeric'
-    cattr_accessor :not_unique, 'The value is already used'
-
+    setting :no_value, :default => 'No value provided'
+    setting :no_confirmation, :default => 'Invalid confirmation'
+    setting :invalid_format, :default => 'Invalid format'
+    setting :too_short, :default => 'Too short, must be more than %d characters long'
+    setting :too_long, :default => 'Too long, must be less than %d characters long'
+    setting :invalid_length, :default => 'Must be %d characters long'
+    setting :no_inclusion, :default => 'The value is invalid'
+    setting :no_numeric, :default => 'The value must be numeric'
+    setting :not_unique, :default => 'The value is already used'
+    
     def initialize
       @errors = {}
     end
@@ -199,7 +200,7 @@ module Validation
       params.each do |field|
         define_validation(:value, field, c[:on]) do |obj|
           value = obj.send(field)
-          obj.errors.add(field, c[:msg]) if value.nil? || (value.respond_to?(:empty) && value.empty?)
+          obj.errors.add(field, c[:msg]) if value.nil? || (value.respond_to?(:empty?) && value.empty?)
         end
       end
     end

data/test/glue/tc_logger.rb

@@ -14,7 +14,6 @@ class TC_Logger < Test::Unit::TestCase # :nodoc: all
   end
 
   def test_logger
-=begin
     Logger.info 'hello'
     assert_equal(" INFO: hello\n", @io.string)
 
@@ -39,7 +38,6 @@ class TC_Logger < Test::Unit::TestCase # :nodoc: all
     # 
     Logger.set('hello.log')
     assert_instance_of(Logger, Logger.get)
-=end
   end
 
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: glue
 version: !ruby/object:Gem::Version 
-  version: 0.30.0
-date: 2006-05-05 00:00:00 +03:00
+  version: 0.31.0
+date: 2006-07-20 00:00:00 -07:00
 summary: Utility methods and classes for Nitro.
 require_paths: 
 - lib
 email: gm@navel.gr
 homepage: http://www.nitroproject.org
-rubyforge_project: nitro
+rubyforge_project: 
 description: 
 autorequire: 
 default_executable: 
@@ -22,88 +22,84 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
     - !ruby/object:Gem::Version 
       version: 0.0.0
   version: 
-platform: 
+platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - George Moschovitis
 files: 
-- ProjectInfo
-- INSTALL
-- README
 - doc
 - lib
 - test
-- setup.rb
-- doc/CHANGELOG.1
-- doc/AUTHORS
-- doc/LICENSE
-- doc/RELEASES
+- .
 - lib/glue
 - lib/html
-- lib/glue.rb
-- lib/glue/attribute.rb
-- lib/glue/builder
-- lib/glue/html.rb
-- lib/glue/mailer
-- lib/glue/builder.rb
-- lib/glue/fixture.rb
-- lib/glue/configuration.rb
-- lib/glue/flexob.rb
 - lib/glue/cache
-- lib/glue/logger.rb
-- lib/glue/localization.rb
-- lib/glue/mail.rb
-- lib/glue/property.rb
-- lib/glue/mailer.rb
-- lib/glue/cache.rb
-- lib/glue/sanitize.rb
-- lib/glue/settings.rb
-- lib/glue/template.rb
-- lib/glue/uri.rb
-- lib/glue/validation.rb
-- lib/glue/markup.rb
-- lib/glue/accumulate.rb
-- lib/glue/autoreload.rb
-- lib/glue/builder/xml.rb
-- lib/glue/mailer/incoming.rb
-- lib/glue/mailer/outgoing.rb
-- lib/glue/cache/file.rb
-- lib/glue/cache/drb.rb
-- lib/glue/cache/memcached.rb
-- lib/glue/cache/memory.rb
-- lib/glue/cache/og.rb
-- lib/html/document.rb
-- lib/html/node.rb
-- lib/html/tokenizer.rb
-- lib/html/version.rb
-- test/fixture
+- lib/glue/mailer
+- lib/glue/builder
 - test/glue
+- test/fixture
 - test/public
-- test/fixture/article.csv
-- test/fixture/article.yml
-- test/fixture/user.yml
 - test/glue/builder
-- test/glue/tc_attribute.rb
-- test/glue/tc_aspects.rb
-- test/glue/tc_validation.rb
+- test/public/dummy_mailer
+- test/fixture/article.csv
 - test/glue/tc_builder.rb
+- test/glue/tc_validation.rb
+- lib/glue/builder/xml.rb
+- lib/glue/mailer/incoming.rb
+- lib/glue/cache/memory.rb
+- lib/glue/cache/drb.rb
 - test/glue/tc_fixture.rb
-- test/glue/tc_configuration.rb
-- test/glue/tc_flexob.rb
-- test/glue/tc_logger.rb
-- test/glue/tc_localization.rb
-- test/glue/tc_mail.rb
-- test/glue/tc_property.rb
-- test/glue/tc_template.rb
+- lib/html/tokenizer.rb
+- lib/glue/mail.rb
+- setup.rb
+- lib/html/node.rb
+- lib/glue/configuration.rb
+- lib/glue.rb
+- test/public/dummy_mailer/registration.xhtml
 - test/glue/tc_property_mixins.rb
-- test/glue/tc_uri.rb
 - test/glue/tc_stores.rb
+- lib/glue/localization.rb
+- doc/LICENSE
+- README
+- test/glue/tc_aspects.rb
+- test/glue/tc_property.rb
 - test/glue/tc_property_type_checking.rb
-- test/glue/tc_accumulate.rb
+- lib/html/version.rb
+- lib/glue/cache/memcached.rb
+- lib/glue/settings.rb
+- doc/CHANGELOG.1
+- test/glue/tc_uri.rb
+- lib/glue/mailer/outgoing.rb
+- lib/glue/cache.rb
+- lib/glue/sanitize.rb
+- INSTALL
+- test/fixture/user.yml
 - test/glue/builder/tc_xml.rb
-- test/public/dummy_mailer
-- test/public/dummy_mailer/registration.xhtml
+- test/glue/tc_template.rb
+- lib/glue/uri.rb
+- lib/glue/autoreload.rb
+- lib/glue/markup.rb
+- test/fixture/article.yml
+- test/glue/tc_localization.rb
+- lib/glue/html.rb
+- lib/glue/property.rb
+- doc/RELEASES
+- ProjectInfo
+- lib/glue/builder.rb
+- lib/glue/logger.rb
+- test/glue/tc_logger.rb
+- test/glue/tc_mail.rb
+- test/glue/tc_configuration.rb
+- lib/html/document.rb
+- lib/glue/cache/file.rb
+- lib/glue/cache/og.rb
+- lib/glue/template.rb
+- lib/glue/fixture.rb
+- lib/glue/mailer.rb
+- lib/glue/validation.rb
+- doc/AUTHORS
 test_files: []
 
 rdoc_options: []
@@ -124,5 +120,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        version: 1.4.5
     version: 

data/lib/glue/accumulate.rb

@@ -1,21 +0,0 @@
-require 'facet/functor'
-
-module Enumerable
-
-  # Project has_many Group
-  # Group has_many User
-  # projects.groups.accumulate.users
-  #--
-  # gmosx: any idea for a better name?
-  #++
-  
-  def accumulate
-    Functor.new do |op, *args|
-      self.inject([]) { |a, x| a << x.send(op, *args) }.flatten
-    end  
-  end
-  alias_method :acc, :accumulate
-  
-end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/attribute.rb

@@ -1,79 +0,0 @@
-# Original code from Rails distribution.
-# http://www.rubyonrails.com
-
-#--
-# Extends the module object with module and instance accessors 
-# for class attributes, just like the native attr* accessors for 
-# instance attributes. Aliases for classes are also provided.
-#
-# Example:
-#
-# mattr_accessor :my_attr, 'Default value'
-#
-# FIXME: I think those methods do *not* work as expected.
-# FIXME: I should probably use @-attributes instead of 
-#        @@-attributes.
-#++
-
-class Module # :nodoc:
-
-  # A macro that creates a reader method for class/module 
-  # attributes.
-    
-  def mattr_reader(*params)
-    default = if params.last.is_a?(Symbol) then nil else params.pop end
-    
-    for sym in params
-      module_eval <<-"end_eval", __FILE__, __LINE__
-      
-        if not defined?(@@#{sym.id2name})
-          @@#{sym.id2name} = #{default.inspect}
-        end
-        
-        def self.#{sym.id2name}
-          @@#{sym}
-        end
-
-      end_eval
-    end
-  end
-  alias_method :cattr_reader, :mattr_reader
-
-  # A macro that creates a writer method for class/module 
-  # attributes.
-  
-  def mattr_writer(*params)
-    default = if params.last.is_a?(Symbol) then nil else params.pop end
-    
-    for sym in params
-      module_eval <<-"end_eval", __FILE__, __LINE__
-
-        if not defined?(@@#{sym.id2name})
-          @@#{sym.id2name} = #{default.inspect.inspect}
-        end
-        
-        def self.#{sym.id2name}=(obj)
-          @@#{sym.id2name} = obj
-        end
-
-        def self.set_#{sym.id2name}(obj)
-          @@#{sym.id2name} = obj
-        end
-
-      end_eval
-    end
-  end
-  alias_method :cattr_writer, :cattr_writer
-
-  # A macro that creates a reader and a writer method for 
-  # class/module attributes.
-  
-  def mattr_accessor(*syms)
-    mattr_reader(*syms)
-    mattr_writer(*syms)
-  end
-  alias_method :cattr_accessor, :mattr_accessor
-  
-end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/flexob.rb

@@ -1,46 +0,0 @@
-require 'ostruct'
-
-module Glue
-
-# A flexible Object.
-# Temporarily implemented as a simple OpenStruct.
-
-class Flexob < OpenStruct
-
-  def update(hash)
-    hash.each do |k, v|
-      send("#{k}=", v)
-    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
-  end  
-  
-  def [](key)
-    @table[key.to_sym]
-  end
-
-  def each(&block)
-    @table.each(&block)
-  end    
-
-  def has_key?(key)  
-    @table.has_key?(key)
-  end
-
-end
-
-end
-
-# * George Moschovitis <gm@navel.gr>

data/test/glue/tc_accumulate.rb

@@ -1,37 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-
-require 'test/unit'
-require 'glue/accumulate'
-
-class TC_Accumulate < Test::Unit::TestCase # :nodoc: all
-  
-  class Project
-    attr_accessor :groups
-  end
-
-  class Group
-    attr_accessor :users
-  end
-
-  class User
-  end
-
-  def test_all
-    pr = Project.new
-    gr1 = Group.new
-    gr2 = Group.new
-    us1 = User.new
-    us2 = User.new
-    gr1.users = [ us1 ]
-    gr2.users = [ us2 ]
-    pr.groups = [ gr1, gr2 ]
-        
-    users = pr.groups.accumulate.users
-    assert_equal 2, users.size    
-    assert_equal us1, users[0]
-    assert_equal us2, users[1]
-  end
-
-end
-
-# * George Moschovitis <gm@navel.gr>

data/test/glue/tc_attribute.rb

@@ -1,22 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-
-require 'test/unit'
-require 'glue/attribute'
-
-class TC_Attribute < Test::Unit::TestCase # :nodoc: all
-
-  class Dummy
-    cattr_accessor :value, 'Default'
-    cattr_reader :reader, 3
-  end
-
-  def test_attr
-    assert_equal 'Default', Dummy.value
-    assert_nothing_raised { Dummy.value = 2 }
-    assert_equal 2, Dummy.value
-
-    assert_equal 3, Dummy.reader
-    assert_raise(NoMethodError) { Dummy.reader = 19 }
-  end
-
-end

data/test/glue/tc_flexob.rb

@@ -1,20 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-
-require 'test/unit'
-require 'glue/flexob'
-
-class TC_Flexob < Test::Unit::TestCase # :nodoc: all
-  include Glue
-  
-  def test_all
-    f = Flexob.new
-    f.title = 'Test'
-    f[:another] = 'Another'
-    
-    assert_equal 'Test', f.title
-    assert_equal 'Another', f.another
-    assert_equal 'Another', f[:another]
-    assert_equal 'Another', f['another']    
-  end
-
-end