dokkit 0.3.0 → 0.4.0

data/spec/{logger_spec.rb → dokkit/logging/logger_spec.rb}

@@ -9,34 +9,26 @@
 # spec spec/logger_spec.rb                                                  
 #                                                                          
 
-
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__),'../lib')))
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__),'../../../lib')))
 
 require 'rubygems'
 require 'spec'
 require 'dokkit'
-require 'dokkit/logger'
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'dokkit/logging/logger'
 
-describe Dokkit::Log::Logger do
+describe Dokkit::Logging::Logger do
   before do
-    @logger = Dokkit::Log::Logger.logger
+    @logger = Dokkit::Logging::Logger.new
     @observer = mock('observer')
   end
-  after do
-    Dokkit::Log::Logger.clear
-  end
-  it 'should be singleton' do
-    @logger.object_id.should == Dokkit::Log::Logger.logger.object_id
-  end
   it 'should be set with INFO log level by default' do
-    @logger.level.should == Dokkit::Log::INFO
+    @logger.level.should == Dokkit::Logging::INFO
   end
-  it 'should correct log level out of range' do
+  it 'should fix log level if out of range' do
     @logger.level = 5
-    @logger.level.should == Dokkit::Log::DEBUG
-    @logger.level = -1
-    @logger.level.should == Dokkit::Log::ERROR  
+    @logger.level.should == Dokkit::Logging::DEBUG
+    @logger.level = -2
+    @logger.level.should == Dokkit::Logging::OFF
   end
   it 'should add observer to the observers list' do
     @logger.attach(@observer).should == @observer
@@ -54,21 +46,29 @@ describe Dokkit::Log::Logger do
   end
 end
 
-describe Dokkit::Log::Logger, ' when log level changes' do
+describe Dokkit::Logging::Logger, ' when log level changes' do
   before do
-    @logger = Dokkit::Log::Logger.logger
+    @logger = Dokkit::Logging::Logger.new
   end
-  after do
-    Dokkit::Log::Logger.clear
+  describe ' to OFF' do
+    before do
+      @logger.level = Dokkit::Logging::OFF
+    end
+    it 'should disable logging' do
+      @logger.error('This is an error message.').should be_nil
+      @logger.warn('This is a warning message').should be_nil
+      @logger.info('This is an info message').should be_nil
+      @logger.debug('This is a debug message').should be_nil
+    end
   end
   describe ' to ERROR' do
     before do
-      @logger.level = Dokkit::Log::ERROR
+      @logger.level = Dokkit::Logging::ERROR
     end
     it 'should send error messages only' do
       @logger.error('This is an error message.').should == { 
         :text => 'This is an error message.', 
-        :level => Dokkit::Log::ERROR 
+        :level => Dokkit::Logging::ERROR 
       }
       @logger.warn('This is a warning message').should be_nil
       @logger.info('This is an info message').should be_nil
@@ -77,16 +77,16 @@ describe Dokkit::Log::Logger, ' when log level changes' do
   end
   describe ' to WARNING' do
     before do
-      @logger.level = Dokkit::Log::WARNING
+      @logger.level = Dokkit::Logging::WARNING
     end
     it 'should send error and warning messages only' do
       @logger.error('This is an error message.').should == { 
         :text => 'This is an error message.', 
-        :level => Dokkit::Log::ERROR 
+        :level => Dokkit::Logging::ERROR 
       }
       @logger.warn('This is a warning message.').should == { 
         :text => 'This is a warning message.', 
-        :level => Dokkit::Log::WARNING 
+        :level => Dokkit::Logging::WARNING 
       }
       @logger.info('This is an info message').should be_nil
       @logger.debug('This is a debug message').should be_nil        
@@ -94,57 +94,45 @@ describe Dokkit::Log::Logger, ' when log level changes' do
   end
   describe ' to INFO' do
     before do
-      @logger.level = Dokkit::Log::INFO
+      @logger.level = Dokkit::Logging::INFO
     end
     it 'should send error, warning and info messages only' do
       @logger.error('This is an error message.').should == { 
         :text => 'This is an error message.', 
-        :level => Dokkit::Log::ERROR 
+        :level => Dokkit::Logging::ERROR 
       }
       @logger.warn('This is a warning message.').should == { 
         :text => 'This is a warning message.', 
-        :level => Dokkit::Log::WARNING 
+        :level => Dokkit::Logging::WARNING 
       }
       @logger.info('This is an info message.').should == { 
         :text => 'This is an info message.', 
-        :level => Dokkit::Log::INFO 
+        :level => Dokkit::Logging::INFO 
       }      
       @logger.debug('This is a debug message').should be_nil        
     end  
   end    
   describe ' to DEBUG' do
     before do
-      @logger.level = Dokkit::Log::DEBUG
+      @logger.level = Dokkit::Logging::DEBUG
     end
     it 'should send all messages' do
       @logger.error('This is an error message.').should == { 
         :text => 'This is an error message.', 
-        :level => Dokkit::Log::ERROR 
+        :level => Dokkit::Logging::ERROR 
       }
       @logger.warn('This is a warning message.').should == { 
         :text => 'This is a warning message.', 
-        :level => Dokkit::Log::WARNING 
+        :level => Dokkit::Logging::WARNING 
       }
       @logger.info('This is an info message.').should == { 
         :text => 'This is an info message.', 
-        :level => Dokkit::Log::INFO 
+        :level => Dokkit::Logging::INFO 
       }      
       @logger.debug('This is a debug message.').should == { 
         :text => 'This is a debug message.', 
-        :level => Dokkit::Log::DEBUG 
+        :level => Dokkit::Logging::DEBUG 
       }      
     end  
   end      
 end
-
-describe Dokkit::Log::LogMessage do
-  before do
-    @message = Dokkit::Log::LogMessage.new('This is a message', Dokkit::Log::INFO)
-  end
-  it 'should be initialized with a message string' do
-    @message.text.should == 'This is a message'
-  end
-  it 'should be initialized with a log level' do
-    @message.level.should == Dokkit::Log::INFO
-  end
-end

data/spec/{consolelog_spec.rb → dokkit/logging/observers/console_spec.rb}

@@ -2,7 +2,7 @@
 # File 'consolelog_spec.rb' created on 23 feb 2008 at 16:40:31.                    
 # See 'dokkit.rb' or +LICENSE+ for licence information.                      
 #                                                                          
-# (c)2008 Andrea Fazzi <andrea.fazzi@alca.le.it> (and contributors). 
+# (c) 2006, 2007, 2008 Andrea Fazzi <andrea.fazzi@alca.le.it> (and contributors). 
 #                                                                          
 # To execute this spec run:                                            
 #                                                                          
@@ -10,40 +10,39 @@
 #                                                                          
 
 
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__),'../lib')))
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__),'../../../../lib')))
 
 require 'rubygems'
 require 'spec'
 require 'dokkit'
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'dokkit/logging/observers/console'
+require 'spec/spec_helper.rb'
 
-require 'dokkit/consolelog'
-
-describe Dokkit::Log::ConsoleLog, ' when initialized' do
+describe Dokkit::Logging::Observer::Console, ' when initialized' do
   it 'should reference to a logger instance and attach to it' do
     @logger = mock('logger')
     @logger.should_receive(:attach)
-    @consolelog = Dokkit::Log::ConsoleLog.new(@logger)    
+    @consolelog = Dokkit::Logging::Observer::Console.new(@logger)    
     @consolelog.logger.should_not be_nil
   end
 end
 
-describe Dokkit::Log::ConsoleLog, ' when logger notifies' do
-  include CaptureStdout
+describe Dokkit::Logging::Observer::Console, ' when logger notifies' do
+  include SpecHelper::CaptureOutput
   before do
     @logger = mock('logger')
-    @logger.should_receive(:attach)
-    @consolelog = Dokkit::Log::ConsoleLog.new(@logger)
+    @logger.stub!(:attach)
+    @consolelog = Dokkit::Logging::Observer::Console.new(@logger)
   end
   describe ' an error message' do
     it 'should send the error message to the console' do
-      @logger.should_receive(:last_message).and_return({ :text => 'error message', :level => Dokkit::Log::ERROR })
+      @logger.stub!(:last_message).and_return({ :text => 'error message', :level => Dokkit::Logging::ERROR })
       lambda { @consolelog.update }.should raise_error(RuntimeError, /\[ERROR\] error message/)
     end
   end
   describe ' a warning message' do
     it 'should send the warning message to the console' do
-      @logger.should_receive(:last_message).and_return({ :text => 'warning message', :level => Dokkit::Log::WARNING })
+      @logger.stub!(:last_message).and_return({ :text => 'warning message', :level => Dokkit::Logging::WARNING })
       capture_stderr do
         @consolelog.update
       end.should match(/\[WARNING\] warning message/)
@@ -51,7 +50,7 @@ describe Dokkit::Log::ConsoleLog, ' when logger notifies' do
   end
   describe ' an info message' do
     it 'should send the info message to the console' do
-      @logger.should_receive(:last_message).and_return({ :text => 'info message', :level => Dokkit::Log::INFO })
+      @logger.stub!(:last_message).and_return({ :text => 'info message', :level => Dokkit::Logging::INFO })
       capture_stdout do
         @consolelog.update
       end.should match(/\[INFO\] info message/)
@@ -59,7 +58,7 @@ describe Dokkit::Log::ConsoleLog, ' when logger notifies' do
   end  
   describe ' a debug message' do
     it 'should send the debug message the console' do
-      @logger.should_receive(:last_message).and_return({ :text => 'debug message', :level => Dokkit::Log::DEBUG })
+      @logger.stub!(:last_message).and_return({ :text => 'debug message', :level => Dokkit::Logging::DEBUG })
       capture_stdout do
         @consolelog.update
       end.should match(/\[DEBUG\] debug message/)

data/spec/dokkit/resource/data_spec.rb

@@ -0,0 +1,32 @@
+#                                                                          
+# File 'data_spec.rb' created on 16 apr 2008 at 20:03:08.                    
+# See 'dokkit.rb' or +LICENSE+ for licence information.                      
+#                                                                          
+# (c)2006, 2007, 2008 Andrea Fazzi <andrea.fazzi@alca.le.it> (and contributors). 
+#                                                                          
+# To execute this spec run:                                            
+#                                                                          
+# spec spec/data_spec.rb                                                  
+#                                                                          
+
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__),'../../../lib')))
+
+require 'rubygems'
+require 'spec'
+require 'dokkit/resource/data'
+require 'spec/spec_helper.rb'
+
+describe Dokkit::Resource::Data do
+  before do
+    @data = Dokkit::Resource::Data.new('doc/data/data_1')
+  end
+  it 'should respond to :source_fn' do
+    @data.should respond_to(:source_fn)
+  end
+  it 'should respond to :configuration' do
+    @data.should respond_to(:configuration)
+  end
+  it 'should return the target filename' do
+    @data.target_fn.should == 'output/data_1'
+  end
+end