glue 0.31.0 → 0.40.0

data/lib/glue/fixture.rb

@@ -3,7 +3,7 @@ require 'facet/kernel/constant'
 require 'facet/ormsupport'
 
 require 'glue/configuration'
-require 'glue/template'
+require 'nitro/template'
 
 module Glue
 
@@ -94,7 +94,7 @@ class Fixture < Hash
   def parse_yaml(path)
     require 'yaml'
 
-    str = Glue::Template.new.render(File.read(path))
+    str = Nitro::Template.new.render(File.read(path))
     
     if yaml = YAML::load(str)
       for name, data in yaml
@@ -116,7 +116,7 @@ class Fixture < Hash
   def parse_csv(path)
     require 'csv'
 
-    str = Glue::Template.new.render(File.read(path))
+    str = Nitro::Template.new.render(File.read(path))
     
     reader = CSV::Reader.create(str)
     header = reader.shift
@@ -152,5 +152,3 @@ private
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/localization.rb

@@ -127,5 +127,3 @@ module LocalizationAspect
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/logger.rb

@@ -157,6 +157,7 @@ class Logger
   # Saddly have to duplicate the code to make
   # Binding.of_caller work.
   #++
+  
   def self.trace(expr, style=:p)
     unless expr.respond_to? :to_str
       warn "trace: Can't evaluate the given value: #{caller.first}"
@@ -207,5 +208,3 @@ module Logging
 end
 
 end
-
-# * George Moschovitis  <gm@navel.gr>

data/lib/glue/mail.rb

@@ -158,5 +158,3 @@ class Mail
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/mailer.rb

@@ -41,6 +41,10 @@ class Mailer < Mail
   # The default template root.
   
   setting :template_root, :default => 'template/mail', :doc => 'The default template root'
+
+  # The default from address
+  
+  setting :from, :default => 'bot@nitroproject.org', :doc => 'The default from address'
   
   # An array to store the delivered mails, useful
   # for testing.
@@ -49,5 +53,3 @@ class Mailer < Mail
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/mailer/incoming.rb

@@ -39,5 +39,3 @@ module IncomingMailer
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

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 = Glue::FileTemplate.new)
+  def initialize(from = nil, to = nil, subject = nil, body = Nitro::FileTemplate.new)
     super
     @charset = Mailer.default_charset.dup
     @encode_subject = Mailer.encode_subject
@@ -66,7 +66,7 @@ module OutgoingMailer
 
       mailer.send(method_name, *params)
 
-      unless mailer.body.is_a?(String)
+      unless mailer.body.is_a? String
         mailer.body = render_body(method_name, mailer)
       end
 
@@ -94,7 +94,7 @@ module OutgoingMailer
     def perform_delivery_smtp(mail) # :nodoc:
       c = Mailer.server
       Net::SMTP.start(c[:address], c[:port], c[:domain], c[:username], c[:password], c[:authentication]) do |smtp|
-        smtp.send_message(mail.encoded, mail.from, *[mail.to,mail.cc,mail.bcc].compact)
+        smtp.send_message(mail.encoded, mail.from, *[mail.to, mail.cc, mail.bcc].compact)
       end
     end
 
@@ -117,5 +117,3 @@ module OutgoingMailer
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/glue/settings.rb

@@ -1,5 +1,3 @@
 # Just an alias for glue/configuration.
 
 require 'glue/configuration'
-
-# * George Moschovitis <gm@navel.gr>   

data/lib/glue/uri.rb

@@ -188,5 +188,3 @@ end
 
 end
 
-# * George Moschovitis  <gm@navel.gr>
-

data/lib/glue/validation.rb

@@ -1,4 +1,6 @@
 require 'facets/core/class/cattr'
+require 'facets/core/module/on_included'
+require 'facets/more/inheritor'
 
 require 'glue/configuration'
 
@@ -25,8 +27,8 @@ module Glue
 # === Example
 #
 # class User
-#    prop_accessor :name, String 
-#    prop_accessor :level, Fixnum
+#    attr_accessor :name, String 
+#    attr_accessor :level, Fixnum
 #
 #    validate_length :name, :range => 2..6 
 #    validate_unique :name, :msg => :name_allready_exists 
@@ -114,9 +116,9 @@ module Validation
     def clear
       @errors.clear
     end
-    
+
     def to_a
-      @errors.values
+      @errors.inject([]) { |a, kv| a << kv }
     end
     
     def join(glue)
@@ -443,7 +445,3 @@ end
 class Module # :nodoc: all
   include Glue::Validation::ClassMethods
 end
-
-# * George Moschovitis <gm@navel.gr>
-# * Brian Bugh <brian@xsi-design.com>
-# * Bryan Soto <bryan.a.soto@gmail.com>

data/test/glue/builder/tc_xml.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'nitro', 'lib')
 
 require 'test/unit'
 require 'glue/builder/xml'
@@ -22,8 +23,8 @@ class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
     assert_equal '<b>This is bold</b>', x.buffer
 
     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.a('Nitro', :href => 'http://www.nitroproject.org')
+    assert_equal '<a href="http://www.nitroproject.org">Nitro</a>', x.buffer
 
 
     x = Glue::XmlBuilder.new

data/test/glue/tc_attribute.rb

@@ -0,0 +1,112 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'og', 'lib')
+
+require 'test/unit'
+require 'og'
+require 'glue/logger'
+require 'glue/attribute'
+
+def VarChar(size)
+  return String, :sql => "VARCHAR(#{ size })"
+end
+NotNull = {:sql => "NOT NULL"}.freeze
+Null = {:sql => "NULL"}.freeze
+
+module Test # :nodoc: all
+
+class Msg
+  include Og::Unmanageable
+  
+  attr_accessor :owner_oid, Fixnum
+  attr_accessor :val1, :val2, :val3, Fixnum, :sql => "smallint"
+  attr_accessor :title, :body, String
+  attr_accessor :test, String, :sql => "char(10) NOT NULL"
+  attr_accessor :count, Fixnum
+  attr_accessor :create_time, Time  
+
+  # a marshaled property
+  attr_accessor :options, Array
+
+  # property with macro arguments!
+  attr_accessor :address, VarChar(30), NotNull
+  
+  def initialize
+    @create_time = Time.now
+    @options = []
+  end
+
+end
+
+class SubMsg < Msg
+  # to avoid conflicts with tc_og.rb
+  include Og::Unmanageable
+  
+  # duplicate definition with different type!
+  attr_accessor :count, Float
+
+  # another property
+  attr_accessor :another, Fixnum
+end
+
+class C
+  attr_accessor :name
+  attr_accessor :description
+end
+
+class C
+  attr_accessor :name, String
+  attr_accessor :description, String
+end
+
+class TC_N_Attributes < Test::Unit::TestCase
+
+  def setup
+    Msg.define_force_methods
+    @msg1 = Msg.new
+  end
+
+  def teardown
+    @msg1 = nil
+  end
+
+  def test_props
+    
+    # bug: props for subclasses.
+    # bug: props propagated to base classes.
+
+    assert(SubMsg.serializable_attributes)
+    assert_equal(Msg.serializable_attributes.size(), SubMsg.serializable_attributes.size() - 1)
+
+    assert_equal(11, Msg.serializable_attributes.size)
+    assert_equal(12, SubMsg.serializable_attributes.size)
+
+    # bug: duplicate definition       
+    
+    a = SubMsg.serializable_attributes.find { |p| :count == p }
+    assert_equal(Float, SubMsg.ann[SubMsg.serializable_attributes.find { |p| :count == p }].class)
+
+    # dont force conversion.
+    
+    @msg1.count = 2.4
+    assert_equal(Float, @msg1.count.class)
+
+    # force conversion
+    
+    @msg1.__force_count(2.4)
+    assert_equal(Fixnum, @msg1.count.class)    
+  end
+
+  def test_macro_params
+    sql = Msg.ann[Msg.serializable_attributes.find { |p| :address == p}].sql
+# FIXME: Temporarily dissabled.
+#   assert_equal 'VARCHAR(30) NOT NULL', sql
+  end
+
+
+  def test_soc
+    assert_equal String, C.ann.name.class
+  end
+  
+end
+
+end

data/test/glue/{tc_property_mixins.rb → tc_attribute_mixins.rb}

@@ -1,10 +1,11 @@
-$LOAD_PATH.unshift 'lib'
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'og', 'lib')
 
 require 'test/unit'
-require 'glue/property'
+require 'glue/attribute'
 
 module Mixin
-  prop_accessor :date
+  attr_accessor :date
   ann self, :dummy => [123]
 end
 
@@ -21,18 +22,18 @@ end
 class MixedWithProp
   include Mixin
 
-  prop_accessor :dummy
+  attr_accessor :dummy
 end
 
 class Pure
-  prop_accessor :dummy
+  attr_accessor :dummy
 end
 
 class Empty
 end
 
 class Base
-  prop_accessor :date
+  attr_accessor :date
   ann self, :dummy => [123]
 end
 
@@ -52,7 +53,7 @@ class TC_MixinsTest < ::Test::Unit::TestCase
   end
 
   def test_manage_entities
-    assert_respond_to( Pure, :properties )
+    assert_respond_to( Pure, :serializable_attributes )
     assert_respond_to( Pure.new, :dummy )
   end
 
@@ -61,7 +62,7 @@ class TC_MixinsTest < ::Test::Unit::TestCase
   end
 
   def test_managing_mixins
-    assert_respond_to( Mixin, :properties )
+    assert_respond_to( Mixin, :serializable_attributes )
   end
 
   def test_managing_mixed_classes
@@ -83,6 +84,3 @@ class TC_MixinsTest < ::Test::Unit::TestCase
 =end
   end
 end
-
-# * Thomas Quas <tquas@yahoo.com>
-# * George Moschovitis <gm@navel.gr>

data/test/glue/tc_configuration.rb

@@ -96,7 +96,7 @@ class TC_Configuration < Test::Unit::TestCase # :nodoc: all
     assert_equal '/gmosx/2', Configuration[Dummy][:root_dir].value
     assert_equal 2, Another.max_age
 
-    Configuration.parse <<-end_val
+    Configuration.parse_yaml <<-end_val
 Another:
   max_age: 5
 TC_Configuration.Internal:

data/test/glue/tc_fixture.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'nitro', 'lib')
 
 require 'test/unit'
 require 'glue/fixture'
@@ -27,8 +28,8 @@ class TestFixtureExplicitRootDir < Test::Unit::TestCase # :nodoc: all
     assert_equal 'Renos', users['renos'].name
 
     articles = Fixture.new(Article, :root_dir => RootDir)
-    
-    assert_equal 9, articles.size
+
+    assert_equal 10, 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
@@ -80,7 +81,7 @@ class TestFixtureRootDirSetting < Test::Unit::TestCase # :nodoc: all
 
     articles = Fixture.new(Article)
     
-    assert_equal 9, articles.size
+    assert_equal 10, 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

data/test/glue/tc_logger.rb

@@ -20,8 +20,8 @@ class TC_Logger < Test::Unit::TestCase # :nodoc: all
     # bug: Binding.of_caller thinks Logger is the caller.
     a = 14
     b = 13
-    Logger.trace 'a * b'
-    assert_equal(" INFO: hello\nDEBUG: a * b = 182\n", @io.string)
+#   Logger.trace 'a * b'
+#   assert_equal(" INFO: hello\nDEBUG: a * b = 182\n", @io.string)
     
     @io.string = ''
     Logger.debug 'hello'

data/test/glue/tc_mail.rb

@@ -1,10 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'nitro', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'og', 'lib')
 
 $NITRO_NO_ENVIRONMENT = true
 
 require 'test/unit'
 require 'ostruct'
-
 require 'nitro'
 require 'glue/configuration'
 require 'glue/mailer'
@@ -15,24 +16,24 @@ class TestCaseMail < Test::Unit::TestCase # :nodoc: all
   class DummyMailer < Mailer
     def initialize 
       super
-      @bcc = 'gm@navel.gr'
+      @bcc = 'george.moschovitis@gmail.com'
       @template_root = 'test/public/dummy_mailer'
     end
 
     def registration(to, username, token)
       @to = to 
-      @from = 'system@navel.gr'
+      @from = 'system@nitroproject.org'
       @subject = 'Nitro.com registration'
-      @cc = 'gm@navel.gr'
+      @cc = 'george.moschovitis@gmail.com'
       @body.username = username
       @body.token = token
     end
 
     def greek(to)
       @to = to 
-      @from = 'system@navel.gr'
+      @from = 'system@nitroproject.org'
       @subject = 'Ελληνικός Τίτλος'
-      @cc = 'gm@navel.gr'
+      @cc = 'george.moschovitis@gmail.com'
       @body = 'Τί έγινε ρε παιδιά;'
     end
   end
@@ -42,22 +43,22 @@ class TestCaseMail < Test::Unit::TestCase # :nodoc: all
 
     def register
       token = 999
-      deliver_registration('gmosx@navel.gr', 'gmosx', token)
+      deliver_registration('gmosx@nitroproject.org', 'gmosx', token)
     end
   end
 =end
   def test_mail
-    m = Glue::Mail.new 'gmosx@navel.gr', 'drak@navel.gr', 'A simple test', 'This is the body of the message'
-    expected = %{From: gmosx@navel.gr
-To: drak@navel.gr
+    m = Glue::Mail.new 'gmosx@nitroproject.org', 'drak@nitroproject.org', 'A simple test', 'This is the body of the message'
+    expected = %{From: gmosx@nitroproject.org
+To: drak@nitroproject.org
 Subject: A simple test
 
 This is the body of the message}
     assert_equal expected, m.encoded
 
-    m.to = %w{ renos@navel.gr stella@navel.gr }
-    expected = %{From: gmosx@navel.gr
-To: renos@navel.gr, stella@navel.gr
+    m.to = %w{ renos@nitroproject.org stella@nitroproject.org }
+    expected = %{From: gmosx@nitroproject.org
+To: renos@nitroproject.org, stella@nitroproject.org
 Subject: A simple test
 
 This is the body of the message}
@@ -68,19 +69,19 @@ This is the body of the message}
   def test_mailer
     assert_equal 0, DummyMailer.deliveries.size 
 
-    Mailer.server[:address] = 'mail.navel.gr'
-#   assert_equal 'mail.navel.gr', DummyMailer.server[:address]
+    Mailer.server[:address] = 'mail.nitroproject.org'
+#   assert_equal 'mail.nitroproject.org', DummyMailer.server[:address]
 
     Mailer.delivery_method = :test
     Mailer.template_root = File.join(File.dirname(__FILE__), '..', 'root', 'dummy_mailer')
     token = 999
-    DummyMailer.deliver_registration('gm@navel.gr', 'gmosx', token)
+    DummyMailer.deliver_registration('george.moschovitis@gmail.com', 'gmosx', token)
     assert_equal 1, DummyMailer.deliveries.size 
     
-    expected = %{From: system@navel.gr
-To: gm@navel.gr
-Cc: gm@navel.gr
-Bcc: gm@navel.gr
+    expected = %{From: system@nitroproject.org
+To: george.moschovitis@gmail.com
+Cc: george.moschovitis@gmail.com
+Bcc: george.moschovitis@gmail.com
 Subject: =?utf-8?Q?Nitro=2ecom_registration?=
 
 Hello gmosx
@@ -91,7 +92,7 @@ Here is your <b>Token</b>: 999
 }
     assert_equal expected, DummyMailer.deliveries[0].encoded
 
-    DummyMailer.deliver_greek('gm@navel.gr')
+    DummyMailer.deliver_greek('george.moschovitis@gmail.com')
     assert_equal 2, DummyMailer.deliveries.size 
   end
 =end