glue 0.28.0 → 0.29.0

data/ProjectInfo

@@ -2,7 +2,7 @@
 
 TITLE    : &title Glue
 NAME     : &pkg glue
-VERSION  : '0.28.0'
+VERSION  : '0.29.0'
 STATUS   : beta
 
 AUTHOR   : George Moschovitis
@@ -15,7 +15,7 @@ DESCRIPTION: >
   Utility methods and classes for Nitro.
 
 DEPENDENCIES:
- - [ facets, '= 1.0.2' ]
+ - [ facets, '= 1.0.3' ]
  - [ cmdparse, '= 2.0.0' ]
  
 DISTRIBUTE: [ gem, tgz, zip ]

data/README

@@ -1,4 +1,4 @@
-= Glue 0.28.0 README
+= Glue 0.29.0 README
 
 Useful utilites and methods.
 

data/Rakefile

@@ -35,7 +35,7 @@ Rake::TestTask.new do |t|
   %w[glue nitro og].each do |dir|
     t.libs << File.join(cwd, dir, 'lib')
   end
-  t.test_files = FileList['test/**/*.rb']
+  t.test_files = FileList['test/**/tc*.rb']
   t.verbose = true
 end
 

data/doc/RELEASES

@@ -1,3 +1,11 @@
+== Version 0.29.0
+
+* MemCache store for the generalized caching system.
+
+* Many, many bugfixes and small improvements.
+
+* Updated for facets 1.0.3
+
 == Version 0.28.0
 
 * New generalized caching system. The caching code is refactored

data/lib/glue.rb

@@ -36,7 +36,7 @@ module Glue
 
   # The version.
 
-  Version = '0.28.0'
+  Version = '0.29.0'
   
   # Library path.
 

data/lib/glue/aspects.rb

@@ -7,7 +7,7 @@ module Glue
 class Aspect
   class << self 
     def wrap(target, methods = target.instance_methods, pre = :pre, post = :post)
-      target.send(:include, Aspects) unless target.ancestors.include?(Aspects)
+      target.send(:include, Glue::Aspects) unless target.ancestors.include?(Glue::Aspects)
       target.wrap(self, :pre => pre, :post => post)
     end
 
@@ -15,7 +15,7 @@ class Aspect
   end
 
   def wrap(target, methods = target.instance_methods, pre = :pre, post = :post)
-    target.send(:include, Aspects) unless target.ancestors.include?(Aspects)
+    target.send(:include, Glue::Aspects) unless target.ancestors.include?(Glue::Aspects)
     target.wrap(self, :pre => pre, :post => post)
   end
   alias_method :observe, :wrap

data/lib/glue/autoreload.rb

@@ -33,11 +33,11 @@ module Kernel
           $autoreload_dirty = true
           need_reload.each_pair do |file,mtime|
             file_mtime[file] = mtime
-            STDERR.puts "File '#{ file }' reloaded"
+            Logger.debug "File '#{ file }' reloaded"
             begin
               load(file)
             rescue Exception => e
-              STDERR.puts e.inspect
+              Logger.info e.inspect
             end
           end
         end
@@ -48,7 +48,7 @@ module Kernel
           if File.exists?(file) and (mtime = File.stat(file).mtime) > (file_mtime[file] || start_time)
             $autoreload_dirty = true
             file_mtime[file] = mtime
-            STDERR.puts "File '#{ file }' changed"
+            Logger.debug "File '#{ file }' changed"
           end
         end
       

data/lib/glue/cache.rb

@@ -12,6 +12,11 @@ end
 # scoped variables and more.
 
 class Cache
+
+  def update(hash)
+    hash.each { |key, value| self[key] = value }
+  end
+  
 end
 
 end

data/lib/glue/cache/drb.rb

@@ -33,13 +33,18 @@ class DrbCache < MemoryCache
   # :address = The address of the DRb cache object.
   # :port = The port of the DRb cache object.
   
-  def initialize(options = {})
-    c = {
-      :address => '127.0.0.1',
-      :port => 9080,
-    }.update(options)
 
-    @hash = DRbObject.new(nil, "druby://#{options[:address]}:#{options[:port]}") 
+  # The address of the Session cache / store (if distibuted).
+ 
+  setting :address, :default => '127.0.0.1', :doc => 'The address of the Session cache'
+  
+  # The port of the Session DRb cache / store (if distributed).
+ 
+  setting :port, :default => 9069, :doc => 'The port of the Session cache'
+  
+  
+  def initialize
+    @hash = DRbObject.new(nil, "druby://#{DrbCache.address}:#{DrbCache.port}") 
   end
   
 end

data/lib/glue/cache/file.rb

@@ -1,15 +1,14 @@
+require 'uri'
 require 'fileutils'
 require 'tmpdir'
 
 module Glue
  
-  # TODO: safe locking of files, because Nitro can be multiprocess
-  
   class FileCache
 
     setting :basedir, :default => "#{Dir.tmpdir}/nitro_file_cache", :doc => 'The directory to store files'
 
-    def initialize(name, keepalive = nil)
+    def initialize(name = "cache", keepalive = nil)
       @path = File.join(FileCache.basedir, name)
       @keepalive = keepalive
 
@@ -17,16 +16,23 @@ module Glue
     end
 
     def []=(k,v)
-      fn = File.join(@path, k.to_s)
+      fn = File.join(@path, escape_filename(k.to_s) )
       encode_file(fn, v)
     end
+    alias :set :[]=
 
     def [](k)
-      fn = File.join(@path, k.to_s)
+      fn = File.join(@path, escape_filename(k.to_s) )
       return nil unless File.exists?(fn)
       decode_file(fn)
     end
+    alias :get :[]
 
+    def delete(k)
+      f = File.join(@path, escape_filename(k.to_s))
+      File.delete(f) if File.exists?(f)
+    end
+    
     def gc!
       return unless @keepalive
 
@@ -44,16 +50,29 @@ module Glue
     private
 
     def decode_file(fn)
-      Marshal.load( File.read(fn) )
+      val = nil
+      File.open(fn,"r") do |f|
+        f.flock(File::LOCK_EX)
+        val = Marshal.load( File.read(fn) )
+        f.flock(File::LOCK_UN)
+      end
+      return val
     end
 
     def encode_file(fn, value)
       File.open(fn, "w") do |f| 
+        f.flock(File::LOCK_EX)
         f.chmod(0600)
         f.write(Marshal.dump(value))
+        f.flock(File::LOCK_UN)
       end
     end
 
+    # need this for fat filesystems
+    def escape_filename(fn)
+      URI.escape(fn, /["\/:;|=,\[\]]/)
+    end
+
   end
 end
 

data/lib/glue/cache/memcached.rb

@@ -0,0 +1,68 @@
+# specifications:
+# http://cvs.danga.com/browse.cgi/wcmtools/memcached/doc/protocol.txt?rev=HEAD&content-type=text/plain
+#
+# very simple (= very fast) client for memcached
+#
+# i found the Ruby-MemCache library a little bit buggy and complicated, so i made my own before
+# fixing it ;)
+# 
+# TODO socket disconnection handling
+# TODO error handling
+# TODO multiple servers connections
+
+require "socket"
+
+module Glue
+
+  class MemCached
+
+    setting :address, :default => 'localhost', :doc => 'Server address'
+    setting :port, :default => 11211, :doc => 'Server port'
+
+    def initialize(name = "cache", keepalive = nil)
+      @sock = TCPSocket.new(MemCached.address, MemCached.port)
+      @name = name
+      @keepalive = keepalive
+    end
+    
+    def []=(k,v)
+      if @keepalive
+        exptime = (Time.now + @keepalive).to_i
+      else
+        exptime = 0
+      end
+
+      data = Marshal.dump(v)
+      @sock.print("set #{@name}:#{k} 0 #{exptime} #{data.size}\r\n#{data}\r\n")
+      response = @sock.gets # "STORED\r\n"
+      v
+    end
+    alias :set :[]=
+
+    def [](k)
+      @sock.print("get #{@name}:#{k}\r\n")
+      resp = @sock.gets 
+      if resp == "END\r\n"
+        return nil
+      end
+
+      #dummy, key, flags, size 
+      size = resp.split(/ /).last.to_i
+      raw_data = @sock.read(size)
+      @sock.gets # \r\n
+      @sock.gets # END\r\n
+      Marshal.load( raw_data )
+    end
+    alias :get :[]
+
+    def delete(k)
+      @sock.print("delete #{@name}:#{k}\r\n")
+      @sock.gets # "DELETED\r\n"
+    end
+
+    def gc!
+      # garbage collection is handled by the memcache server
+    end
+
+  end
+end

data/lib/glue/configuration.rb

@@ -48,9 +48,6 @@ class Configuration
       @value.to_s
     end
 
-    def <=>(other)
-      "#{owner}.#{name}" <=> "#{other.owner}.#{other.name}"
-    end
   end
   
   class << self

data/lib/glue/fixture.rb

@@ -93,7 +93,7 @@ class Fixture < Hash
   def parse_yaml(path)
     require 'yaml'
 
-    str = Template.new.render(File.read(path))
+    str = Glue::Template.new.render(File.read(path))
     
     if yaml = YAML::load(str)
       for name, data in yaml
@@ -115,7 +115,7 @@ class Fixture < Hash
   def parse_csv(path)
     require 'csv'
 
-    str = Template.new.render(File.read(path))
+    str = Glue::Template.new.render(File.read(path))
     
     reader = CSV::Reader.create(str)
     header = reader.shift

data/lib/glue/mailer/outgoing.rb

@@ -9,7 +9,7 @@ module OutgoingMailer
   
   on_included %{ base.extend ClassMethods }  
   
-  def initialize(from = nil, to = nil, subject = nil, body = FileTemplate.new)
+  def initialize(from = nil, to = nil, subject = nil, body = Glue::FileTemplate.new)
     super
     @charset = Mailer.default_charset.dup
     @encode_subject = Mailer.encode_subject

data/lib/glue/property.rb

@@ -164,7 +164,7 @@ class Property
     if prop_or_rel.on_populate && obj.respond_to?(prop_or_rel.on_populate.to_sym)
       return obj.send(prop_or_rel.on_populate.to_sym, value)
     elsif Object.const_defined? :Nitro
-      if control = Nitro::Control.fetch(obj, prop_or_rel, :default => nil) and control.respond_to?(:on_populate)
+      if control = Nitro::Form::Control.fetch(obj, prop_or_rel, :default => nil) and control.respond_to?(:on_populate)
         return control.on_populate(value)
       end
     else
@@ -181,7 +181,7 @@ class Property
           self.#{sym} = force_#{sym}(val)
         else
           self.#{sym}=(} << case klass.name
-            when Fixnum.name: 'val.nil? ? nil : val.to_i'
+            when Fixnum.name: 'val.to_s.empty? ? 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)'

data/lib/glue/template.rb

@@ -164,14 +164,14 @@ class Template
   setting :strip_xml_comments, :default => false, :doc => 'Strip xml comments from templates?'
 
   class << self
-    include TemplateMixin
+    include Glue::TemplateMixin
     alias_method :compile, :compile_template
     alias_method :transform, :compile_template
     alias_method :evaluate, :evaluate_template
     alias_method :process, :process_template
   end
   
-  include TemplateMixin
+  include Glue::TemplateMixin
   
   # Helper.
   
@@ -188,7 +188,7 @@ end
 # expansion environment.
 
 class FileTemplate < Flexob
-  include TemplateMixin
+  include Glue::TemplateMixin
 
   @@compiled_template_cache = {}
 

data/lib/glue/uri.rb

@@ -37,7 +37,7 @@ module UriUtils
 
 #      real_path = "#{$root_dir}/#{path}"
 
-      parameters = UriUtils.query_string_to_hash(query_string)
+      parameters = Glue::UriUtils.query_string_to_hash(query_string)
       path.gsub!(/\+/, " ")
 
       return [path, type, parameters, query_string]
@@ -97,7 +97,7 @@ module UriUtils
       # only encode simple classes !
 
       if value.is_a?(Numeric) or value.is_a?(String)
-        pairs << "#{param}=#{value}"
+        pairs << "#{param}=#{CGI.escape(value.to_s)}"
       end
     }
     return pairs.join(";")

data/lib/glue/validation.rb

@@ -113,6 +113,14 @@ module Validation
     def clear
       @errors.clear
     end
+    
+    def to_a
+      @errors.values
+    end
+    
+    def join(glue)
+      @errors.to_a.join(glue)
+    end
   end
 
   # A Key is used to uniquely identify a validation rule.

data/test/glue/builder/tc_xml.rb

@@ -7,7 +7,7 @@ class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
   include Glue
 
   def test_string
-    x = XmlBuilder.new
+    x = Glue::XmlBuilder.new
 
     x.start_tag!('html').
       start_tag!('title').text!('hello').end_tag!('title').
@@ -17,34 +17,34 @@ class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
   end
   
   def test_missing
-    x = XmlBuilder.new
+    x = Glue::XmlBuilder.new
     x.b('This is bold')
     assert_equal '<b>This is bold</b>', x.buffer
 
-    x = XmlBuilder.new
+    x = Glue::XmlBuilder.new
     x.a('Navel', :href => 'http://www.navel.gr')
     assert_equal '<a href="http://www.navel.gr">Navel</a>', x.buffer
 
 
-    x = XmlBuilder.new
+    x = Glue::XmlBuilder.new
     x.b { 
       x.i 'Hello', :class =>'new'
       x.p 'Paragraph'
     }
     assert_equal '<b><i class="new">Hello</i><p>Paragraph</p></b>', x.buffer
 
-    x = XmlBuilder.new
+    x = Glue::XmlBuilder.new
     x.hr
     assert_equal '<hr />', x.buffer
 
-    x = XmlBuilder.new
+    x = Glue::XmlBuilder.new
     x.hr(:style => 'height: 1px')
     assert_equal '<hr style="height: 1px" />', x.buffer
   end
 
   def test_xml_builder
     buffer = ''
-    x = XmlBuilder.new(buffer)
+    x = Glue::XmlBuilder.new(buffer)
 
     x.start_tag!('html').
       start_tag!('title').text!('hello').end_tag!('title').

data/test/glue/tc_aspects.rb

@@ -24,14 +24,14 @@ class TestCaseAspects < Test::Unit::TestCase # :nodoc: all
   end
 
   module Tester
-    include Aspects
+    include Glue::Aspects
 
     attr_accessor :ta
     pre { |this| this.ta = 5 }
   end
   
   class Dummy
-    include Aspects
+    include Glue::Aspects
     include Tester
 
     attr_accessor :a, :b, :c
@@ -82,7 +82,7 @@ class TestCaseAspects < Test::Unit::TestCase # :nodoc: all
   def test_all
     Observer.wrap(Dummy, :hello)
     Epilogue.new.wrap(Dummy, :hello)
-    Aspects.wrap(Dummy, :hello)
+    Glue::Aspects.wrap(Dummy, :hello)
 
     d = Dummy.new
     d.hello(3)

data/test/glue/tc_stores.rb

@@ -0,0 +1,17 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib')
+
+require 'test/unit'
+
+require 'glue/cache/memory'
+
+class TC_CachingStores < Test::Unit::TestCase # :nodoc: all
+  
+  def test_memory
+    s = Glue::Cache::MemoryCache.new
+    s.write('test', 'hello', { :none => 1})
+    s.read('test')
+  end
+  
+end
+
+# * George Moschovitis <gm@navel.gr>

data/test/glue/tc_template.rb

@@ -23,7 +23,7 @@ class TestTemplate < Test::Unit::TestCase # :nodoc: all
     items = %w{ nitro is really great }
     out = ''
 
-    Template.process(template, :out, binding)
+    Glue::Template.process(template, :out, binding)
 
     assert_match %r{\<li\>nitro\</li\>}, out
     assert_match %r{\<li\>really\</li\>}, out

data/test/glue/tc_uri.rb

@@ -11,22 +11,22 @@ class TC_Uri < Test::Unit::TestCase # :nodoc: all
   def test_query_string_to_hash
     # bad query string
 
-    assert_equal(0, UriUtils.query_string_to_hash("").length)
-    assert_equal(0, UriUtils.query_string_to_hash(nil).length)
+    assert_equal(0, Glue::UriUtils.query_string_to_hash("").length)
+    assert_equal(0, Glue::UriUtils.query_string_to_hash(nil).length)
 
     # single valued
 
-    parameters = UriUtils.query_string_to_hash("koko=2&lala=3")
+    parameters = Glue::UriUtils.query_string_to_hash("koko=2&lala=3")
     assert_equal("2", parameters["koko"])
     assert_equal("3", parameters["lala"])
 
-    parameters = UriUtils.query_string_to_hash("koko=2;lala=3")
+    parameters = Glue::UriUtils.query_string_to_hash("koko=2;lala=3")
     assert_equal("2", parameters["koko"])
     assert_equal("3", parameters["lala"])
 
     # multivalued
 
-    parameters = UriUtils.query_string_to_hash("koko=2;lala=3&koko=5")
+    parameters = Glue::UriUtils.query_string_to_hash("koko=2;lala=3&koko=5")
     assert_equal(2, parameters["koko"].length)
     assert_equal("2", parameters["koko"][0])
     assert_equal("3", parameters["lala"])
@@ -39,59 +39,59 @@ class TC_Uri < Test::Unit::TestCase # :nodoc: all
   def test_hash_to_query_string
     hash = { "koko" => 1, "lala" => 2}
     qs = "koko=1;lala=2"
-    assert_equal(qs, UriUtils.hash_to_query_string(hash))
+    assert_equal(qs, Glue::UriUtils.hash_to_query_string(hash))
 
-    assert_equal(nil, UriUtils.hash_to_query_string(nil))
+    assert_equal(nil, Glue::UriUtils.hash_to_query_string(nil))
 
     # bug: dont encode complex objects
     hash = { "a" => 2, "b" => 3, "c" => Dummy.new }
     qs = "a=2;b=3"
-    assert_equal(qs, UriUtils.hash_to_query_string(hash))
+    assert_equal(qs, Glue::UriUtils.hash_to_query_string(hash))
   end
 
   def test_get_query_string
     uri = "people/gmosx.sx?koko=1;lala=2"
-    assert_equal("koko=1;lala=2", UriUtils.get_query_string(uri))
+    assert_equal("koko=1;lala=2", Glue::UriUtils.get_query_string(uri))
 
     uri = "http://www.navel.gr/people/gmosx.sx?koko=1&lala=2"
-    assert_equal("koko=1&lala=2", UriUtils.get_query_string(uri))
+    assert_equal("koko=1&lala=2", Glue::UriUtils.get_query_string(uri))
 
     uri = "http://www.navel.gr:8080/people/gmosx.sx?koko=1;lala=2"
-    assert_equal("koko=1;lala=2", UriUtils.get_query_string(uri))
+    assert_equal("koko=1;lala=2", Glue::UriUtils.get_query_string(uri))
   end
 
   def test_chomp_query_string
     uri = "people/gmosx.sx"
-    assert_equal("people/gmosx.sx", UriUtils.chomp_query_string(uri))
+    assert_equal("people/gmosx.sx", Glue::UriUtils.chomp_query_string(uri))
 
     uri = "people/gmosx.sx?koko=1;lala=2"
-    assert_equal("people/gmosx.sx", UriUtils.chomp_query_string(uri))
+    assert_equal("people/gmosx.sx", Glue::UriUtils.chomp_query_string(uri))
 
     uri = "http://www.navel.gr/people/gmosx.sx?koko=1&lala=2"
-    assert_equal("http://www.navel.gr/people/gmosx.sx", UriUtils.chomp_query_string(uri))
+    assert_equal("http://www.navel.gr/people/gmosx.sx", Glue::UriUtils.chomp_query_string(uri))
 
     uri = "http://www.navel.gr:8080/people/gmosx.sx?koko=1;lala=2"
-    assert_equal("http://www.navel.gr:8080/people/gmosx.sx", UriUtils.chomp_query_string(uri))
+    assert_equal("http://www.navel.gr:8080/people/gmosx.sx", Glue::UriUtils.chomp_query_string(uri))
 
-    assert_equal(nil, UriUtils.chomp_query_string(nil))
+    assert_equal(nil, Glue::UriUtils.chomp_query_string(nil))
   end
 
   def test_update_query_string
     uri = "ko/index.sx?koko=1"
     hash = {"lala" => 2, "kaka" => 3}
-    assert_equal("ko/index.sx?koko=1;lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
+    assert_equal("ko/index.sx?koko=1;lala=2;kaka=3", Glue::UriUtils.update_query_string(uri, hash))
 
     uri = "http://www.navel.gr:8080/ko/index.sx?koko=1"
     hash = {"lala" => 2, "kaka" => 3}
-    assert_equal("http://www.navel.gr:8080/ko/index.sx?koko=1;lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
+    assert_equal("http://www.navel.gr:8080/ko/index.sx?koko=1;lala=2;kaka=3", Glue::UriUtils.update_query_string(uri, hash))
 
     uri = "http://www.navel.gr"
     hash = {"lala" => 2, "kaka" => 3}
-    assert_equal("http://www.navel.gr?lala=2;kaka=3", UriUtils.update_query_string(uri, hash))
+    assert_equal("http://www.navel.gr?lala=2;kaka=3", Glue::UriUtils.update_query_string(uri, hash))
 
     # bug: no ? when passed an empty hash
     uri = "http://www.navel.gr"
-    assert_equal("http://www.navel.gr", UriUtils.update_query_string(uri, {}))
+    assert_equal("http://www.navel.gr", Glue::UriUtils.update_query_string(uri, {}))
   end
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: glue
 version: !ruby/object:Gem::Version 
-  version: 0.28.0
-date: 2006-02-06 00:00:00 +02:00
+  version: 0.29.0
+date: 2006-03-07 00:00:00 +02:00
 summary: Utility methods and classes for Nitro.
 require_paths: 
 - lib
@@ -15,7 +15,7 @@ description:
 autorequire: 
 default_executable: 
 bindir: bin
-has_rdoc: false
+has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">"
@@ -59,7 +59,6 @@ files:
 - lib/glue/mail.rb
 - lib/glue/logger.rb
 - lib/glue/attribute.rb
-- lib/glue/paramix.rb
 - lib/glue/flexob.rb
 - lib/glue/fixture.rb
 - lib/glue/builder.rb
@@ -68,6 +67,7 @@ files:
 - lib/glue/cache.rb
 - lib/glue/aspects.rb
 - lib/glue/markup.rb
+- lib/glue/paramix.rb
 - lib/glue/accumulate.rb
 - lib/glue/autoreload.rb
 - lib/glue/builder/xml.rb
@@ -75,7 +75,7 @@ files:
 - lib/glue/mailer/incoming.rb
 - lib/glue/cache/file.rb
 - lib/glue/cache/og.rb
-- lib/glue/cache/memcache.rb
+- lib/glue/cache/memcached.rb
 - lib/glue/cache/memory.rb
 - lib/glue/cache/drb.rb
 - lib/html/tokenizer.rb
@@ -105,7 +105,7 @@ files:
 - test/glue/tc_builder.rb
 - test/glue/tc_accumulate.rb
 - test/glue/tc_aspects.rb
-- test/glue/multi_validations_model.rb
+- test/glue/tc_stores.rb
 - test/glue/builder/tc_xml.rb
 - test/public/dummy_mailer
 - test/public/dummy_mailer/registration.xhtml
@@ -129,7 +129,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: 1.0.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse

data/lib/glue/cache/memcache.rb

@@ -1,2 +0,0 @@
-# gmosx: not implemented yet, anyone wants to take over this
-# bounty?

data/test/glue/multi_validations_model.rb

@@ -1,5 +0,0 @@
-class User
-  property :name, String
-  validate_length :name, :range => 2..6 
-  validate_format :name, :format => /[a-z]*/, :msg => 'invalid format', :on => :create 
-end