glue 0.29.0 → 0.30.0

data/lib/glue/fixture.rb

@@ -10,6 +10,7 @@ module Glue
 # A collection of helper methods.
 
 class Fixtures
+
   # The directory where the fixtures are located.
   
   setting :root_dir, :default => 'test/fixture', :doc => 'The directory where the fixtures are located'
@@ -71,7 +72,7 @@ class Fixture < Hash
   end
 
   def load(root_dir = Fixtures.root_dir)
-    raise("The fixture root director '#{root_dir}' doesn't exits") unless File.exist?(root_dir)
+    raise("The fixture root directory '#{root_dir}' doesn't exits") unless File.exist?(root_dir)
 
     if path = "#{root_dir}/#{@name}.yml" and File.exist?(path)
       parse_yaml(path)

data/lib/glue/localization.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 
-require 'glue/aspects'
+require 'facets/more/aspects'
 
 module Glue
 
@@ -100,6 +100,7 @@ class Localization
         @locales[key.to_s] = Locale.new(locale)
       end
     end
+    alias_method :locales=, :add
         
     # Return the localization hash for the given
     # locale.

data/lib/glue/property.rb

@@ -1,20 +1,26 @@
 require 'facet/annotation'
 require 'facet/inheritor'
 require 'facet/dictionary'
+require 'facets/core/module/on_included'
+require 'facets/more/aspects'
 
-require 'glue/on_included'
 require 'glue/validation'
-require 'glue/aspects'
 require 'og/entity'
 require 'og/relation/all'
 
 # A convienience structure that holds property 
-# metadata.
+# metadata. A property is a special type of class annotation.
+# Typically used in Og managed classes (ie Entities), but it
+# is *not* Og specific.
 #--
 # TODO: reimplement type checking.
+# TODO: try to clean this up.
 #++
 
 class Property
+  
+  # The hash used to store the property options.  
+
   attr_accessor :hash
   
   def initialize(hash)
@@ -39,13 +45,11 @@ class Property
     @hash[:symbol].to_s
   end  
   alias_method :name, :to_s
-end
 
-# Property related utils and helpers.
+  # :section: Property related utils and helpers.
 
-class Property
   class << self
-  
+
   # Populate an object from a hash of values.
   # This is a truly dangerous method.
   #
@@ -260,7 +264,7 @@ class Module
             }
           end
         end
-        
+
         Module.__add_prop_hook__(self)
       end
     }
@@ -275,7 +279,7 @@ class Module
   def self.__add_prop_hook__(m)
     m.send(:include, Og::EntityMixin) unless m.ancestors.include?(Og::EntityMixin)
     m.send(:include, Glue::Validation) unless m.ancestors.include?(Glue::Validation)
-    m.send(:include, Glue::Aspects) unless m.ancestors.include?(Glue::Aspects)
+    m.send(:include, ::Aspects) unless m.ancestors.include?(::Aspects)
   end
   
 end

data/test/glue/tc_aspects.rb

@@ -1,9 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
 require 'test/unit'
-require 'glue/aspects'
-
-include Glue
+require 'facets/more/aspects'
 
 class TestCaseAspects < Test::Unit::TestCase # :nodoc: all
 
@@ -24,14 +22,14 @@ class TestCaseAspects < Test::Unit::TestCase # :nodoc: all
   end
 
   module Tester
-    include Glue::Aspects
+    include ::Aspects
 
     attr_accessor :ta
     pre { |this| this.ta = 5 }
   end
   
   class Dummy
-    include Glue::Aspects
+    include ::Aspects
     include Tester
 
     attr_accessor :a, :b, :c
@@ -82,7 +80,7 @@ class TestCaseAspects < Test::Unit::TestCase # :nodoc: all
   def test_all
     Observer.wrap(Dummy, :hello)
     Epilogue.new.wrap(Dummy, :hello)
-    Glue::Aspects.wrap(Dummy, :hello)
+    ::Aspects.wrap(Dummy, :hello)
 
     d = Dummy.new
     d.hello(3)

data/test/glue/tc_configuration.rb

@@ -32,7 +32,9 @@ class TC_Configuration < Test::Unit::TestCase # :nodoc: all
     # method is not needed if you only run this test (or in your
     # real aplications of course).
     
-    Configuration.clear_all_settings
+#   Running the next line breaks later tests when running the test suite.
+
+#   Configuration.clear_all_settings
     
     Dummy.class_eval do
       setting :root_dir, :default => '/home/gmosx', :doc => 'The root directory for the app'  
@@ -49,8 +51,9 @@ class TC_Configuration < Test::Unit::TestCase # :nodoc: all
   end
 
   def test_all
-    assert_equal 4, Configuration.settings.size
-    assert_equal 4, Configuration.all.size
+#   The following asserts are _not_ true when running the test suite.
+#    assert_equal 4, Configuration.settings.size
+#    assert_equal 4, Configuration.all.size
 
     assert_equal 2, Configuration.settings(Dummy).size
     assert_equal 1, Configuration.settings(Another).size
@@ -121,6 +124,12 @@ Dummy:
     
     assert_equal 99, Internal.radius
     assert_equal 99, TC_Configuration::Internal.radius
+    
+    # Intuitive setting
+    
+    Configuration.Dummy.root_dir = 'wow'
+    assert_equal 'wow', Dummy.root_dir
+    assert_equal 'wow', Configuration.Dummy.root_dir.value
   end
 
 end

data/test/glue/tc_fixture.rb

@@ -3,7 +3,51 @@ $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'test/unit'
 require 'glue/fixture'
 
-class TestFixture < Test::Unit::TestCase # :nodoc: all
+RootDir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'fixture'))
+
+class TestFixtureExplicitRootDir < Test::Unit::TestCase # :nodoc: all
+  include Glue
+
+  class User
+    attr_accessor :name
+    attr_accessor :age
+  end
+
+  class Article
+    attr_accessor :title
+    attr_accessor :body
+  end
+        
+  def test_all
+    users = Fixture.new(User, :root_dir => RootDir)
+    
+    assert_equal 3, users.size
+    george = users['george']
+    assert_equal 30, george.age
+    assert_equal 'Renos', users['renos'].name
+
+    articles = Fixture.new(Article, :root_dir => RootDir)
+    
+    assert_equal 9, articles.size
+    assert_equal 'This is cool', articles['article_1'].title
+    assert_equal 'Another', articles['article_2'].title
+    assert_equal 'I love this', articles['Test'].title
+    
+    assert_equal 'title 3', articles['Auto3'].title
+  end
+
+  def test_global
+    "This is not supported with explicit root directory setting"
+=begin
+    assert_raises(RuntimeError, "This test will fail when running via rake") do
+      Fixtures.load User, Article
+    end # Fixtures.load _only_ uses Fixtures.root_dir setting.
+=end
+  end
+    
+end
+
+class TestFixtureRootDirSetting < Test::Unit::TestCase # :nodoc: all
   include Glue
 
   class User
@@ -16,6 +60,16 @@ class TestFixture < Test::Unit::TestCase # :nodoc: all
     attr_accessor :body
   end
         
+  def setup
+    @old_rootdir = Fixtures.root_dir
+    Fixtures.root_dir = RootDir
+  end
+
+  def teardown
+    Fixtures.root_dir = @old_rootdir
+    @old_rootdir = nil
+  end
+
   def test_all
     users = Fixture.new(User)
     
@@ -35,7 +89,7 @@ class TestFixture < Test::Unit::TestCase # :nodoc: all
   end
 
   def test_global
-    Fixtures.load User, Article    
+    Fixtures.load User, Article
     assert_equal 3, Fixtures.user.size
     assert_equal 'This is cool', Fixtures.article['article_1'].title
   end

data/test/glue/tc_flexob.rb

@@ -4,7 +4,8 @@ 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'

data/test/glue/tc_stores.rb

@@ -5,9 +5,10 @@ require 'test/unit'
 require 'glue/cache/memory'
 
 class TC_CachingStores < Test::Unit::TestCase # :nodoc: all
+  include Glue
   
   def test_memory
-    s = Glue::Cache::MemoryCache.new
+    s = MemoryCache.new
     s.write('test', 'hello', { :none => 1})
     s.read('test')
   end

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: glue
 version: !ruby/object:Gem::Version 
-  version: 0.29.0
-date: 2006-03-07 00:00:00 +02:00
+  version: 0.30.0
+date: 2006-05-05 00:00:00 +03:00
 summary: Utility methods and classes for Nitro.
 require_paths: 
 - lib
 email: gm@navel.gr
-homepage: http://www.nitrohq.com
+homepage: http://www.nitroproject.org
 rubyforge_project: nitro
 description: 
 autorequire: 
@@ -22,90 +22,85 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
     - !ruby/object:Gem::Version 
       version: 0.0.0
   version: 
-platform: ruby
+platform: 
 signing_key: 
 cert_chain: 
 authors: 
 - George Moschovitis
 files: 
+- ProjectInfo
+- INSTALL
+- README
 - doc
 - lib
 - test
-- ProjectInfo
-- Rakefile
-- README
 - setup.rb
-- INSTALL
 - doc/CHANGELOG.1
-- doc/RELEASES
-- doc/LICENSE
 - 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/validation.rb
-- lib/glue/uri.rb
-- lib/glue/template.rb
-- lib/glue/settings.rb
-- lib/glue/sanitize.rb
+- lib/glue/mail.rb
 - lib/glue/property.rb
-- lib/glue/on_included.rb
-- lib/glue/cache
-- lib/glue/html.rb
 - lib/glue/mailer.rb
-- lib/glue/mail.rb
-- lib/glue/logger.rb
-- lib/glue/attribute.rb
-- lib/glue/flexob.rb
-- lib/glue/fixture.rb
-- lib/glue/builder.rb
-- lib/glue/configuration.rb
-- lib/glue/expirable.rb
 - lib/glue/cache.rb
-- lib/glue/aspects.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/paramix.rb
 - lib/glue/accumulate.rb
 - lib/glue/autoreload.rb
 - lib/glue/builder/xml.rb
-- lib/glue/mailer/outgoing.rb
 - lib/glue/mailer/incoming.rb
+- lib/glue/mailer/outgoing.rb
 - lib/glue/cache/file.rb
-- lib/glue/cache/og.rb
+- lib/glue/cache/drb.rb
 - lib/glue/cache/memcached.rb
 - lib/glue/cache/memory.rb
-- lib/glue/cache/drb.rb
-- lib/html/tokenizer.rb
-- lib/html/version.rb
+- lib/glue/cache/og.rb
 - lib/html/document.rb
 - lib/html/node.rb
+- lib/html/tokenizer.rb
+- lib/html/version.rb
 - test/fixture
 - test/glue
 - test/public
+- test/fixture/article.csv
 - test/fixture/article.yml
 - test/fixture/user.yml
-- test/fixture/article.csv
 - test/glue/builder
-- test/glue/tc_configuration.rb
+- test/glue/tc_attribute.rb
+- test/glue/tc_aspects.rb
 - test/glue/tc_validation.rb
-- test/glue/tc_uri.rb
-- test/glue/tc_template.rb
-- test/glue/tc_property.rb
-- test/glue/tc_property_type_checking.rb
-- test/glue/tc_property_mixins.rb
-- test/glue/tc_mail.rb
+- test/glue/tc_builder.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_flexob.rb
-- test/glue/tc_fixture.rb
-- test/glue/tc_attribute.rb
-- test/glue/tc_builder.rb
-- test/glue/tc_accumulate.rb
-- test/glue/tc_aspects.rb
+- test/glue/tc_mail.rb
+- test/glue/tc_property.rb
+- test/glue/tc_template.rb
+- test/glue/tc_property_mixins.rb
+- test/glue/tc_uri.rb
 - test/glue/tc_stores.rb
+- test/glue/tc_property_type_checking.rb
+- test/glue/tc_accumulate.rb
 - test/glue/builder/tc_xml.rb
 - test/public/dummy_mailer
 - test/public/dummy_mailer/registration.xhtml
@@ -129,14 +124,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: cmdparse
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 1.3.3
     version: 

data/Rakefile

@@ -1,222 +0,0 @@
-require 'rake/rdoctask'
-require 'rake/testtask'
-require 'rake/gempackagetask'
-
-# Initialize some variables.
-
-readme = File.read('README')
-Release = (readme[/^= (.+) README$/, 1] || 'unknown').downcase.tr(" ", "-")
-Name = Release[/\D+/].sub(/\-+$/, '') || 'unknown'
-Version = Release[/[\d.]+/] || 'unknown'
-
-AuthorName, AuthorMail = 'George Moschovitis', 'gm@navel.gr'
-RubyVersion = '1.8.2' 
-
-# Description = (readme[/README\s+(.+?)\n\n/m, 1] || "unknown").gsub(/\s+/, " ")
-# Summary = Description[/^.+?>/] || "unknown"
-
-# DocFiles = %w(README NEWS TODO COPYING GPL)
-# RDocFiles = DocFiles - %w(GPL)
-RDocOpts = ["--inline-source", "--line-numbers","--title", Name ]
-# AdditionalFiles = DocFiles + %w(setup.rb)
-VersionFile = MainFile = File.join("lib", Name + '.rb')
-
-RubyForgeProject = 'nitro' 
-RubyForgeUser = 'gmosx'
-Homepage = "http://www.nitrohq.com/"
-
-task :default => :package
-
-# Run all tests.
-
-Rake::TestTask.new do |t|
-  cwd = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  t.libs << 'test'
-  %w[glue nitro og].each do |dir|
-    t.libs << File.join(cwd, dir, 'lib')
-  end
-  t.test_files = FileList['test/**/tc*.rb']
-  t.verbose = true
-end
-
-# Generate RDoc documentation.
-
-Rake::RDocTask.new do |rd|
-  rd.main = 'README'
-  rd.rdoc_dir = 'rdoc'
-  rd.rdoc_files.include('README', 'INSTALL', 'lib/**/*.rb')
-  rd.options << '--all --inline-source'
-end
-
-# Build gem.
-
-spec = Gem::Specification.new do |s|
-  s.name = 'glue'
-  if File.read('lib/glue.rb') =~ /Version\s+=\s+'(\d+\.\d+\.\d+)'/
-    s.version = $1 
-  else
-    raise 'No version found'
-  end
-  s.summary = 'Glue utilities'
-  s.description = 'A collection of utilities and useful classes'
-# s.add_dependency 'facets', '= 0.8.2'
-# s.add_dependency 'cmdparse', '= 2.0.0'
-
-  s.required_ruby_version = '>= 1.8.2'
-
-  s.files = FileList[
-    '[A-Z]*', 'setup.rb', '{doc,lib,test,vendor}/**/*' 
-  ].exclude("_darcs").exclude("_darcs/**/*").exclude('**/*.log').to_a
-
-  s.require_path = 'lib'
-  s.autorequire = 'glue'
-  
-  s.has_rdoc = true
-  s.extra_rdoc_files = FileList['[A-Z]*'].to_a
-  s.rdoc_options << '--main' << 'README' << '--title' << 'Glue Documentation'
-  s.rdoc_options << '--all' << '--inline-source'
-
-  s.test_files = []
-  
-  s.bindir = 'bin'
-
-  s.author = 'George Moschovitis'
-  s.email = 'gm@navel.gr'
-  s.homepage = 'http://www.nitrohq.com'
-  s.rubyforge_project = 'nitro'
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.package_dir = 'dist'
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
-# Manual install (not recommended).
-
-task :install do
-  ruby 'install.rb'
-end
-
-# Release files to Rubyforge.
-# The code for this task provided by Florian Gross.
-
-desc "Publish the release files to RubyForge."
-task :publish => [:package] do
-  files = ['gem', 'tgz', 'zip'].map { |ext| "dist/#{Release}.#{ext}" }
-
-  if RubyForgeProject then
-    require 'net/http'
-    require 'open-uri'
-
-    changes = ''
-    if File.exist?('doc/RELEASES') then
-      changes_re = /^== \s+ Version \s+ #{Regexp.quote(Version)} \s*
-                    (.+?) (?:==|\Z)/mx
-      changes = File.read('doc/RELEASES')[changes_re, 1] || ''
-    end
-
-    project_uri = "http://rubyforge.org/projects/#{RubyForgeProject}/"
-    project_data = open(project_uri) { |data| data.read }
-    group_id = project_data[/[?&]group_id=(\d+)/, 1]
-    raise "Couldn't get group id" unless group_id
-
-    print "#{RubyForgeUser}@rubyforge.org's password: "
-    password = STDIN.gets.chomp
-
-    login_response = Net::HTTP.start('rubyforge.org', 80) do |http|
-      data = [
-        "login=1",
-        "form_loginname=#{RubyForgeUser}",
-        "form_pw=#{password}"
-      ].join("&")
-      http.post('/account/login.php', data)
-    end
-
-    cookie = login_response['set-cookie']
-    raise 'Login failed' unless cookie
-    headers = { 'Cookie' => cookie }
-
-    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
-    release_data = open(release_uri, headers) { |data| data.read }
-    package_id = release_data[/[?&]package_id=(\d+)/, 1]
-    raise "Couldn't get package id" unless package_id
-
-    first_file = true
-    release_id = ""
-
-    files.each do |filename|
-      basename = File.basename(filename)
-      file_ext = File.extname(filename)
-      file_data = File.open(filename, "rb") { |file| file.read }
-
-      puts "Releasing #{basename}..."
-
-      release_response = Net::HTTP.start('rubyforge.org', 80) do |http|
-        release_date = Time.now.strftime('%Y-%m-%d %H:%M')
-        type_map = {
-          '.zip'    => '3000',
-          '.tgz'    => '3110',
-          '.gz'     => '3110',
-          '.gem'    => '1400',
-          '.md5sum' => '8100'
-        }; type_map.default = '9999'
-        type = type_map[file_ext]
-        boundary = 'rubyqMY6QN9bp6e4kS21H4y0zxcvoor'
-
-        query_hash = if first_file then
-          {
-            'group_id' => group_id,
-            'package_id' => package_id,
-            'release_name' => Release,
-            'release_date' => release_date,
-            'type_id' => type,
-            'processor_id' => '8000', # Any
-            'release_notes' => '',
-            'release_changes' => changes,
-            'preformatted' => '1',
-            'submit' => '1'
-          }
-        else
-          {
-            'group_id' => group_id,
-            'release_id' => release_id,
-            'package_id' => package_id,
-            'step2' => '1',
-            'type_id' => type,
-            'processor_id' => '8000', # Any
-            'submit' => 'Add This File'
-          }
-        end
-
-        query = '?' + query_hash.map do |(name, value)|
-          [name, URI.encode(value)].join('=')
-        end.join('&')
-
-        data = [
-          "--" + boundary,
-          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
-          "Content-Type: application/octet-stream",
-          "Content-Transfer-Encoding: binary",
-          "", file_data, ""
-          ].join("\x0D\x0A")
-
-        release_headers = headers.merge(
-          'Content-Type' => "multipart/form-data; boundary=#{boundary}"
-        )
-
-        target = first_file ? '/frs/admin/qrs.php' : '/frs/admin/editrelease.php'
-        http.post(target + query, data, release_headers)
-      end
-
-      if first_file then
-        release_id = release_response.body[/release_id=(\d+)/, 1]
-        raise("Couldn't get release id") unless release_id
-      end
-
-      first_file = false
-    end
-  end
-end
-
-# * George Moschovitis  <gm@navel.gr>