glue 0.24.0 → 0.25.0

data/ProjectInfo

@@ -2,7 +2,7 @@
 
 TITLE    : &title Glue
 NAME     : &pkg glue
-VERSION  : '0.24.0'
+VERSION  : '0.25.0'
 STATUS   : beta
 
 AUTHOR   : George Moschovitis
@@ -15,7 +15,7 @@ DESCRIPTION: >
   Utility methods and classes for Nitro.
 
 DEPENDENCIES:
- - [ facets, '= 2005.10.15' ]
+ - [ facets, '= 2005.10.30' ]
  - [ cmdparse, '= 2.0.0' ]
  
 DISTRIBUTE: [ gem, tgz, zip ]
@@ -39,9 +39,6 @@ ANNOUNCE:
   sectype: tls # ~, tls, ssl (tls is broke)
   file: ANN
   slogan: Glue
-  
-  
-  
   links:
     - http://www.nitrohq.com
 

data/doc/RELEASES

@@ -1,3 +1,11 @@
+== Version 0.25.0
+
+This is the first in a series of releases focused on stability 
+and refinement. Many bugs where fixed, the high level api was 
+improved where needed, and we still got some small but incredibly
+useful new features. Enjoy!
+
+
 == Version 0.24.0
 
 * Totaly recoded annotation / property system. The property

data/lib/glue.rb

@@ -12,14 +12,22 @@ require 'English'
 require 'pp'
 
 require 'mega/null'
+require 'mega/dynamod'
+require 'nano/module/is'
 
 require 'glue/property'
 require 'glue/attribute'
 
-# Fix for Mega.
+module Glue
+
+  # The version.
+
+  Version = '0.25.0'
+  
+  # Library path.
+
+  LibPath = File.dirname(__FILE__)
 
-class NullClass
-  def [](key); nil; end
 end
 
 class NilClass
@@ -60,18 +68,6 @@ module Kernel
   end
 end
 
-module Glue
-
-  # The version.
-
-  Version = '0.24.0'
-  
-  # Library path.
-
-  LibPath = File.dirname(__FILE__)
-
-end
-
 # Include in the top level binding for easy access.
 
 include Glue

data/lib/glue/builder/xml.rb

@@ -1,8 +1,8 @@
 require 'glue/builder'
 
-require 'nitro/mixin/xhtml'
-require 'nitro/mixin/form'
-require 'nitro/mixin/table'
+require 'nitro/helper/xhtml'
+require 'nitro/helper/form'
+require 'nitro/helper/table'
 
 module Glue
 
@@ -12,9 +12,9 @@ module Glue
 #++
 
 class XmlBuilder < Builder
-  include_builder Nitro::XhtmlMixin
-  include_builder Nitro::TableMixin
-  include_builder Nitro::FormMixin
+  include_builder Nitro::XhtmlHelper
+  include_builder Nitro::TableHelper
+  include_builder Nitro::FormHelper
   
   def method_missing(tag, *args, &block)
     self.class.module_eval <<-"end_eval", __FILE__, __LINE__

data/lib/glue/{mixins.rb → expirable.rb}

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: mixins.rb 182 2005-07-22 10:07:50Z gmosx $
-
 module Glue 
 
 # Generic expiring functionality mixin. 
@@ -34,3 +30,5 @@ module Expirable
 end
 
 end
+
+# * George Moschovitis  <gm@navel.gr>

data/lib/glue/markup.rb

@@ -0,0 +1,121 @@
+require 'singleton'
+require 'redcloth'
+require 'cgi'
+
+require 'glue/sanitize'
+
+module Glue
+
+# Generalised Markup transformations.
+#
+# The expand methods evaluate (expand) the markup
+# code to produce the final content. The compact
+# methods reverse this process to create the original
+# markup code. Not all markup transformations are
+# reversible.
+#
+# When this library is included, the default PropertyUtils 
+# implementation is overriden to add markup support.
+#
+# === Examples
+#
+# Define your custom markup methods like this:
+#
+# module Markup
+#   def markup_simple
+#      ...
+#    end
+#    def markup_special
+#      ...
+#    end
+#
+#   # maps the {{..}} macro
+#    alias_method :sanitize, :markup_simple
+#    # maps the {|..|} macro
+#    alias_method :markup, :markup_special
+#  end
+#
+# here comes the #{obj.body} # => prints the expanded version.
+#
+#  obj.body = markup(@params['body'])  
+
+module Markup
+  # The default markup method. You should override this method 
+  # in your application to call your custom markup 
+  # methods.
+
+  def expand(str)
+    if str
+      xstr = str.dup
+      xstr.gsub!(/</, '&lt;')    
+      xstr.gsub!(/>/, '&gt;')
+      xstr.gsub!(/\n/m, '<br/>')
+      return String.sanitize(xstr)
+    end
+    return nil
+  end
+  alias_method :sanitize, :expand
+
+  # ...
+  
+  def expand_redcloth(str)
+    if str
+      return RedCloth.new(expand(str)).to_html
+    end
+    return nil
+  end
+  alias_method :markup, :expand_redcloth
+      
+  # Compact (reverse) the content to the origial markup
+  # code. Not all markup transformations are reversible.
+  # You should override this method in your application 
+  # to call your custom markup methods.
+  #
+  # NOT IMPLEMENTED.
+  
+  def compact(str, meth = nil)
+  end
+
+  # Remove markup code from the input string.
+  #
+  # NOT IMPLEMENTED.
+  
+  def clear(str)
+  end  
+  
+  def escape(str)
+    return nil unless str
+    CGI.escape(str.gsub(/ /, '_'))
+  end
+
+  def unescape(str)
+    CGI.unescape(str.gsub(/_/, ' '))
+  end      
+  
+  class << self
+    # Helper method for manipulating the sanitize transformation.
+    
+    def setup_sanitize_transform(&block)
+      self.send :define_method, :sanitize, block
+    end
+    alias_method :setup_sanitize_transformation, :setup_sanitize_transform
+
+    # Helper method for manipulating the markup transformation.
+    
+    def setup_markup_transform(&block)
+      self.send :define_method, :markup, block
+    end
+    alias_method :setup_markup_transformation, :setup_markup_transform
+  end  
+end
+
+# An abstract Markup class.
+
+class MarkupKit
+  extend Markup
+  include Markup
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/glue/property.rb

@@ -1,6 +1,6 @@
 require 'mega/annotation'
 require 'mega/inheritor'
-require 'mega/ohash'
+require 'mega/dictionary'
 
 require 'glue/on_included'
 require 'og/entity'
@@ -69,7 +69,7 @@ class Property
         # if incoming file then read contents into a string.
         
         prop_value = values[prop_name]
-        prop_value.read if prop_value.respond_to?(:read)
+        #TODO remove this? prop_value.read if prop_value.respond_to?(:read)
         prop_value = prop_value.to_s unless prop_value.is_a?(Hash) or prop_value.is_a?(Array)        
         
         # If property is a Blob dont overwrite current property's data if "".
@@ -84,20 +84,7 @@ class Property
         # Only enabled if force_boolean == true.
         
         obj.send("__force_#{prop_name}", 0)
-      else
-        # check if there is a hashed version of the property (in the form values[symbol.part])
         
-        property_parts = Hash.new
-        values.each do |k,v|
-          if k =~ /^#{prop_name}\./
-            part_key = k.sub("#{prop_name}.", "")
-            property_parts[part_key.to_sym] = values[k].to_s
-          end
-        end
-        
-        # pass the hashed version to __force_hash_ for processing.
-        
-        obj.send("__force_hash_#{prop_name}", property_parts) unless property_parts.empty?
       end
     end
 
@@ -116,7 +103,7 @@ class Property
           if foreign_oid = values[rel_name]
             foreign_oid = nil if foreign_oid == 'nil' or foreign_oid == 'none'
           end
-          obj.send("__force_#{rel.foreign_key}", foreign_oid)
+          obj.send("__force_#{rel.foreign_key}", foreign_oid.to_s)
         elsif rel.kind_of? Og::JoinsMany or rel.kind_of? Og::HasMany
           # Empty current relationships.
 
@@ -143,30 +130,20 @@ class Property
   
     code = %{
       def __force_#{sym}(val)
-        self.#{sym}=(} + case klass.name
-          when 'Fixnum': 'val.nil? ? nil : val.to_i'
-          when 'String': 'val.to_s'
-          when 'Float': 'val.nil? ? nil : val.to_f'
-          when 'Time': 'Time.parse(val.to_s)'
-          when 'TrueClass', 'FalseClass': '(val == "on" or val == "true") ? true : (val.to_i > 0)'
-          when 'Og::Blob': 'val'
-          else
-            'val'        
-        end + %{) 
-      end 
-      
-      def __force_hash_#{sym}(hash)          
-    }
-      
-    case klass.name
-        when Time.name
-          code << %{
-            self.#{sym} = Time.local(hash[:year],hash[:month],hash[:day],hash[:hour],hash[:min])
-          }
-    end
-
-    code << %{
-      end             
+        if respond_to?(:force_#{sym})
+          self.#{sym} = force_#{sym}(val)
+        else
+          self.#{sym}=(} << case klass.name
+            when Fixnum.name: 'val.nil? ? nil : val.to_i'
+            when String.name: 'val.to_s'
+            when Float.name: 'val.to_f'
+            when Time.name: 'val.is_a?(Hash) ? Time.local(val["year"],val["month"],val["day"],val["hour"],val["min"]) : Time.parse(val.to_s)'
+            when Date.name: 'val.is_a?(Hash) ? Time.local(val["year"],val["month"],val["day"]).to_date : Time.parse(val.to_s).to_date'
+            when TrueClass.name, FalseClass.name: 'val == "on" or val == "true" ? true
+            else 'val'    
+          end + %{) 
+        end
+      end        
     }
 
     m.module_eval(code)

data/lib/glue/template.rb

@@ -37,12 +37,12 @@ module TemplateMixin
     #
     # Example:    
     # <?include href="root/myfile.sx" ?>
-    
+
     text.gsub!(/<\?include href=["|'](.*?)["|'](.*)\?>/) do |match|
-      text = File.read("#{base_dir}/#$1")
-      text.gsub!(/<\?xml.*\?>/, '')
-      text.gsub!(/<\/?root(.*?)>/m, ' ');
-      text
+      itext = File.read("#{base_dir}/#$1")
+      itext.gsub!(/<\?xml.*\?>/, '')
+      itext.gsub!(/<\/?root(.*?)>/m, ' ');
+      itext
     end
 
     # Transform include instructions <include href="xxx" />
@@ -53,7 +53,7 @@ module TemplateMixin
     # add load_statically_included fixes.
 
     text.gsub!(/<include href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
-      "<?r File.read( '\#\{@dispatcher.root\}/#$1' ?>"
+      "<?r File.read( '\#{@dispatcher.root}/#$1' ?>"
     end
     
     # xform render/inject instructions <render href="xxx" />

data/lib/glue/validation.rb

@@ -7,6 +7,9 @@ module Glue
 # objects. Typically used in Validator objects but can be
 # included in managed objects too.
 #
+# Additional og-related validation macros can be found
+# in lib/og/validation.
+#
 # The following validation macros are available:
 #
 #  * validate_value
@@ -55,7 +58,6 @@ module Glue
 #
 #--
 # TODO: all validation methods should imply validate_value
-# TODO: add validate_unique
 #++
 
 module Validation

data/test/glue/tc_property_mixins.rb

@@ -5,13 +5,13 @@ require 'glue/property'
 
 module Mixin
   prop_accessor :date
-  ann :this, :dummy => [123]
+  ann self, :dummy => [123]
 end
 
 class MixedOnly
   include Mixin
-  ann.this.dummy! << 5
-  ann.this.dummy! << 3 
+  ann.self.dummy! << 5
+  ann.self.dummy! << 3 
 end
 
 class MixedOnly2
@@ -33,12 +33,12 @@ end
 
 class Base
   prop_accessor :date
-  ann :this, :dummy => [123]
+  ann self, :dummy => [123]
 end
 
 class Child1 < Base
-  ann.this.dummy!.first << 5
-  ann.this.dummy!.first << 3 
+  ann.self.dummy!.first << 5
+  ann.self.dummy!.first << 3 
 end
 
 class Child2 < Base
@@ -71,10 +71,10 @@ class TC_MixinsTest < ::Test::Unit::TestCase
   end
 
   def test_crosspolination
-    assert_equal 3, MixedOnly.ann.this[:dummy].size  
+    assert_equal 3, MixedOnly.ann.self[:dummy].size  
 # FIXME:
-#   assert_equal 1, MixedOnly2.ann.this[:dummy].size  
-#   assert_equal 1, Mixin.ann.this[:dummy].size  
+#   assert_equal 1, MixedOnly2.ann.self[:dummy].size  
+#   assert_equal 1, Mixin.ann.self[:dummy].size  
 =begin
     gmosx: THINK!
     assert_equal 3, Child1.__meta[:dummy].first.size  

data/test/glue/tc_template.rb

@@ -28,5 +28,8 @@ class TestTemplate < Test::Unit::TestCase # :nodoc: all
     assert_match %r{\<li\>nitro\</li\>}, out
     assert_match %r{\<li\>really\</li\>}, out
     assert_match %r{Hello gmosx}, out    
+    
+    # TODO: add test for static inclusion.
+    
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: glue
 version: !ruby/object:Gem::Version 
-  version: 0.24.0
-date: 2005-10-28
+  version: 0.25.0
+date: 2005-11-17
 summary: Utility methods and classes for Nitro.
 require_paths: 
   - lib
@@ -44,20 +44,18 @@ files:
   - lib/html
   - lib/glue/aspects.rb
   - lib/glue/attribute.rb
-  - lib/glue/bit.rb
   - lib/glue/builder
   - lib/glue/builder.rb
   - lib/glue/configuration.rb
+  - lib/glue/expirable.rb
   - lib/glue/fixture.rb
   - lib/glue/flexob.rb
-  - lib/glue/helper.rb
   - lib/glue/localization.rb
   - lib/glue/logger.rb
   - lib/glue/mail.rb
   - lib/glue/mailer
   - lib/glue/mailer.rb
-  - lib/glue/mixins.rb
-  - lib/glue/mock.rb
+  - lib/glue/markup.rb
   - lib/glue/on_included.rb
   - lib/glue/property.rb
   - lib/glue/sanitize.rb
@@ -112,7 +110,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 2005.10.15
+            version: 2005.10.30
       version: 
   - !ruby/object:Gem::Dependency 
     name: cmdparse

data/lib/glue/bit.rb

@@ -1,53 +0,0 @@
-# (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/helper.rb

@@ -1,31 +0,0 @@
-require 'nano/module/by_name'
-
-require 'glue/attribute'
-
-module Glue
-
-# Helpers are standard Ruby modules that contain utility 
-# methods. By using the special 'helper'
-# macro provided by HelperSupport, the utility methods are
-# included as private methods.
-
-module Helpers
-
-  def self.append_features(base)
-    super
-    base.module_eval do
-      def self.helper(*modules)
-        for mod in modules
-          symbols = mod.instance_methods.collect { |m| m.to_sym }
-          self.send(:include, mod)
-          self.send(:private, *symbols)
-        end
-      end
-    end
-  end
-  
-end
-
-end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/mock.rb

@@ -1,40 +0,0 @@
-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