doodle 0.1.3 → 0.1.4

data/spec/new_doodle_spec.rb

@@ -11,9 +11,9 @@ describe Doodle, 'simple' do
     end
     it 'should be allow instantiation' do
       foo = Foo.new 1, 2, 3
-      foo.var1.should == 1
-      foo.var2.should == 2
-      foo.var3.should == 3
+      foo.var1.should_be 1
+      foo.var2.should_be 2
+      foo.var3.should_be 3
     end
   end
 end

data/spec/singleton_spec.rb

@@ -8,11 +8,11 @@ describe Doodle, "singletons" do
           has :c1
         end
       end
-      Foo.attributes.should == OrderedHash.new
-      Foo.singleton_class.attributes.should_not == OrderedHash.new
-      Foo.singleton_class.attributes.map{ |name, attr| name }.should == [:c1]
+      Foo.attributes.should_be OrderedHash.new
+      Foo.singleton_class.attributes.should_not_be OrderedHash.new
+      Foo.singleton_class.attributes.map{ |name, attr| name }.should_be [:c1]
       Foo.c1 = 1
-      Foo.c1.should == 1
+      Foo.c1.should_be 1
     end
 
     it "should allow creating attributes on classes via module inclusion" do
@@ -22,11 +22,11 @@ describe Doodle, "singletons" do
           has :c2
         end
       end
-      Foo.attributes.should == OrderedHash.new
-      Foo.singleton_class.attributes.should_not == OrderedHash.new
-      Foo.singleton_class.attributes.map{ |name, attr| name }.should == [:c2]
+      Foo.attributes.should_be OrderedHash.new
+      Foo.singleton_class.attributes.should_not_be OrderedHash.new
+      Foo.singleton_class.attributes.map{ |name, attr| name }.should_be [:c2]
       Foo.c2 = 1
-      Foo.c2.should == 1
+      Foo.c2.should_be 1
     end
 
     it "should allow creating attributes on singletons via inheritance" do
@@ -36,11 +36,11 @@ describe Doodle, "singletons" do
       class << foo
         has :i1
       end
-      foo.attributes.keys.should == [:i1]
-      foo.singleton_class.attributes.should_not == OrderedHash.new
-      foo.singleton_class.attributes.map{ |name, attr| name }.should == [:i1]
+      foo.attributes.keys.should_be [:i1]
+      foo.singleton_class.attributes.should_not_be OrderedHash.new
+      foo.singleton_class.attributes.map{ |name, attr| name }.should_be [:i1]
       foo.i1 = 1
-      foo.i1.should == 1
+      foo.i1.should_be 1
     end
 
     it "should allow creating attributes on a singleton's singleton via module inclusion" do
@@ -53,11 +53,11 @@ describe Doodle, "singletons" do
           has :i2
         end
       end
-      foo.attributes.should == OrderedHash.new
-      foo.singleton_class.singleton_class.attributes.should_not == OrderedHash.new
-      foo.singleton_class.singleton_class.attributes.map{ |name, attr| name }.should == [:i2]
+      foo.attributes.should_be OrderedHash.new
+      foo.singleton_class.singleton_class.attributes.should_not_be OrderedHash.new
+      foo.singleton_class.singleton_class.attributes.map{ |name, attr| name }.should_be [:i2]
       foo.singleton_class.i2 = 1
-      foo.singleton_class.i2.should == 1
+      foo.singleton_class.i2.should_be 1
     end
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,16 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'doodle'
 require 'date'
 
+class Object
+  # try to get rid of those annoying warnings about useless ==
+  def should_be(other)
+    should == other
+  end
+  def should_not_be(other)
+    should_not == other
+  end
+end
+
 # functions to help clean up namespace after defining classes
 def undefine_const(*consts)
   consts.each do |const|

data/spec/specialized_attribute_class_spec.rb

@@ -0,0 +1,111 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+require 'doodle/datatypes'
+
+describe 'Doodle', 'specialized attributes' do
+  temporary_constant :Foo, :SpecializedAttribute do
+    before :each do
+      class SpecializedAttribute < Doodle::Attribute
+      end
+      
+      class Foo < Doodle
+      end
+    end
+    
+    it 'should allow :using keyword' do
+      proc {
+        Foo.class_eval do
+          has :ivar1, :kind => String, :using => SpecializedAttribute
+        end
+      }.should_not raise_error
+    end
+
+    it 'should interpret :using keyword and return a specialized attribute of correct class' do
+      class Foo < Doodle
+        rv = has(:ivar1, :kind => String, :using => SpecializedAttribute)
+        rv.class.should_be SpecializedAttribute
+      end
+    end
+
+    it 'should allow additional attributes belonging to specialized attribute of correct class' do
+      class SpecializedAttribute
+        has :flag, :kind => String
+      end
+      class Foo < Doodle
+        rv = has(:ivar1, :kind => String, :using => SpecializedAttribute, :flag => "sflag")
+        rv.class.should_be SpecializedAttribute
+        rv.flag.should_be 'sflag'
+      end
+    end
+
+    it 'should allow additional directives invoking specialized attribute of correct class' do
+      class SpecializedAttribute
+        has :flag, :kind => String
+      end
+      class Foo < Doodle
+        class << self
+          def option(*args, &block)
+            # this is how to add extra options onto args array for has
+            # - all hashes get merged into one
+            args << { :using => SpecializedAttribute }
+            has(*args, &block)
+          end
+        end
+        rv = option(:ivar1, :kind => String, :flag => "sflag")
+        rv.class.should_be SpecializedAttribute
+        rv.flag.should_be 'sflag'
+      end
+      Foo.attributes[:ivar1].flag.should_be "sflag"
+      foo = Foo.new('hi')
+      foo.attributes[:ivar1].flag.should_be "sflag"
+    end
+
+    it 'should allow using datatypes in additional directives invoking specialized attribute of correct class' do
+      class SpecializedAttribute
+        doodle do
+          string :flag, :max => 1
+        end
+      end
+      class Foo < Doodle
+        class << self
+          def option(*args, &block)
+            # this is how to add extra options onto args array for has
+            # - all hashes get merged into one
+            args << { :using => SpecializedAttribute }
+            has(*args, &block)
+          end
+        end
+        rv = option(:ivar1, :kind => String, :flag => "x")
+        rv.class.should_be SpecializedAttribute
+        rv.flag.should_be 'x'
+      end
+      Foo.attributes[:ivar1].flag.should_be "x"
+      foo = Foo.new('hi')
+      foo.attributes[:ivar1].flag.should_be "x"
+    end
+
+    it 'should allow using datatypes in additional directives invoking specialized attribute of correct class and raise error if incorrect value supplied' do
+      class SpecializedAttribute
+        doodle do
+          string :flag, :max => 1
+        end
+      end
+      class Foo < Doodle
+        class << self
+          def option(*args, &block)
+            args << { :using => SpecializedAttribute }
+            has(*args, &block)
+          end
+        end
+      end
+      proc { Foo.class_eval { option(:ivar1, :kind => String, :flag => "ab") }}.should raise_error(Doodle::ValidationError)
+    end
+
+    it 'should allow specifying name as named parameter' do
+      class Foo < Doodle
+        has :name => :ivar
+      end
+    end
+  end
+end
+

data/spec/superclass_spec.rb

@@ -16,10 +16,10 @@ describe 'Doodle', 'parents' do
       @sc.parents.should == []
     end
 
-    it "should have singleton class's singleton class parents == []" do
-      expected_parents = RUBY_VERSION <= "1.8.6" ? [] : [Module, Object, BasicObject]
-      @scc.parents.should == expected_parents
-    end
+#     it "should have singleton class's singleton class parents == []" do
+#       expected_parents = RUBY_VERSION <= "1.8.6" ? [] : [Module, Object, BasicObject]
+#       @scc.parents.should == expected_parents
+#     end
   end
 end
 

data/spec/validation_spec.rb

@@ -63,26 +63,26 @@ describe :DateRange, 'validation & conversions' do
 
     it 'should have two validations' do
       d = DateRange.new
-      d.attributes[:start_date].validations.size.should == 2    
-      d.attributes[:start_date].validations(false).size.should == 2
+      d.attributes[:start_date].validations.size.should_be 2    
+      d.attributes[:start_date].validations(false).size.should_be 2
     end
 
     it 'should have two conversions' do
       d = DateRange.new
-      d.attributes[:start_date].conversions.size.should == 3    
-      d.attributes[:start_date].conversions(false).size.should == 3
+      d.attributes[:start_date].conversions.size.should_be 3    
+      d.attributes[:start_date].conversions(false).size.should_be 3
     end
 
     it 'should convert from Array' do
       d = DateRange.new [2007,01,01], [2007,01,02]
-      d.start_date.should == Date.new(2007,01,01)
-      d.end_date.should == Date.new(2007,01,02)
+      d.start_date.should_be Date.new(2007,01,01)
+      d.end_date.should_be Date.new(2007,01,02)
     end
   
     it 'should convert Integer representing Julian date to Date' do
       d = DateRange.new 2454428, 2454429
-      d.start_date.should == Date.new(2007,11,23)
-      d.end_date.should == Date.new(2007,11,24)
+      d.start_date.should_be Date.new(2007,11,23)
+      d.end_date.should_be Date.new(2007,11,24)
     end
   end
 end

data/tasks/deployment.rake

@@ -1,5 +1,5 @@
-desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release] do
+desc 'Release the new gem version'
+task :deploy => [:check_version, :release] do
   puts "Remember to create SVN tag:"
   puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
     "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
@@ -7,8 +7,8 @@ task :deploy => [:check_version, :website, :release] do
   puts "Tagging release #{CHANGES}"
 end
 
-desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
-task :local_deploy => [:website_generate, :install_gem]
+desc 'Runs task install_gem as a local deployment of the gem'
+task :local_deploy => [:install_gem]
 
 task :check_version do
   unless ENV['VERSION']
@@ -31,4 +31,4 @@ namespace :manifest do
   task :refresh do
     `rake check_manifest | patch -p0 > Manifest.txt`
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-01 00:00:00 +01:00
+date: 2008-05-06 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -24,36 +24,39 @@ extra_rdoc_files:
 - History.txt
 - License.txt
 - Manifest.txt
+- PostInstall.txt
 - README.txt
 files: 
+- COPYING
+- CREDITS
 - History.txt
 - License.txt
 - Manifest.txt
+- PostInstall.txt
 - README.txt
-- CREDITS
 - Rakefile
 - config/hoe.rb
 - config/requirements.rb
-- examples/smtp_tls.rb
-- examples/example-01.rdoc
-- examples/profile-options.rb
 - examples/doodle-errors.rb
 - examples/event-location.rb
-- examples/parent.rb
+- examples/example-01.rb
+- examples/example-01.rdoc
 - examples/example-02.rb
 - examples/example-02.rdoc
-- examples/example-01.rb
+- examples/mail-datatypes.rb
 - examples/mail.rb
-- examples/yaml-example2.rb
-- examples/yaml-example.rb
+- examples/parent.rb
+- examples/profile-options.rb
+- examples/smtp_tls.rb
 - examples/test-datatypes.rb
-- examples/mail-datatypes.rb
+- examples/yaml-example.rb
+- examples/yaml-example2.rb
 - lib/doodle.rb
-- lib/molic_orderedhash.rb
 - lib/doodle/datatypes.rb
 - lib/doodle/rfc822.rb
 - lib/doodle/utils.rb
 - lib/doodle/version.rb
+- lib/molic_orderedhash.rb
 - log/debug.log
 - script/console
 - script/destroy
@@ -64,6 +67,7 @@ files:
 - spec/attributes_spec.rb
 - spec/bugs_spec.rb
 - spec/class_spec.rb
+- spec/class_validation_spec.rb
 - spec/class_var_spec.rb
 - spec/collector_spec.rb
 - spec/conversion_spec.rb
@@ -73,6 +77,7 @@ files:
 - spec/extra_args_spec.rb
 - spec/factory_spec.rb
 - spec/flatten_first_level_spec.rb
+- spec/inheritance_spec.rb
 - spec/init_spec.rb
 - spec/new_doodle_spec.rb
 - spec/required_spec.rb
@@ -80,13 +85,13 @@ files:
 - spec/singleton_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/specialized_attribute_class_spec.rb
 - spec/superclass_spec.rb
-- spec/validation_spec.rb
 - spec/validation2_spec.rb
+- spec/validation_spec.rb
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/rspec.rake
-- tasks/website.rake
 has_rdoc: true
 homepage: http://doodle.rubyforge.org
 post_install_message: |
@@ -118,7 +123,9 @@ specification_version: 2
 summary: "Doodle is a gem for simplifying the definition of Ruby classes by making attributes and their properties more declarative. Doodle is eco-friendly: it does not globally modify Object, Class or Module."
 test_files: 
 - spec/bugs_spec.rb
+- spec/specialized_attribute_class_spec.rb
 - spec/class_var_spec.rb
+- spec/inheritance_spec.rb
 - spec/factory_spec.rb
 - spec/flatten_first_level_spec.rb
 - spec/new_doodle_spec.rb

data/tasks/website.rake

@@ -1,17 +0,0 @@
-desc 'Generate website files'
-task :website_generate => :ruby_env do
-  (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
-    sh %{ #{RUBY_APP} script/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
-  end
-end
-
-desc 'Upload website files to rubyforge'
-task :website_upload do
-  host = "#{rubyforge_username}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/#{PATH}/"
-  local_dir = 'website'
-  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
-end
-
-desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]