data_objects 0.9.5 → 0.9.6

data/Manifest.txt

@@ -14,6 +14,7 @@ lib/data_objects/reader.rb
 lib/data_objects/result.rb
 lib/data_objects/support/pooling.rb
 lib/data_objects/transaction.rb
+lib/data_objects/uri.rb
 lib/data_objects/version.rb
 spec/command_spec.rb
 spec/connection_spec.rb

data/Rakefile

@@ -38,17 +38,52 @@ end
 
 # Specs
 
-desc 'Run specifications'
 Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob(Pathname.new(__FILE__).dirname + 'spec/**/*_spec.rb')
+  t.spec_opts << '--format' << 'specdoc' << '--colour'
+  t.spec_opts << '--loadby' << 'random'
+  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb')
+
+  begin
+    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
+    t.rcov_opts << '--exclude' << 'spec'
+    t.rcov_opts << '--text-summary'
+    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+  rescue Exception
+    # rcov not installed
+  end
 end
 
 # JRuby
-
 namespace :jruby do
   desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
   task :install => [ :package ] do
     sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
   end
 end
+
+namespace :ci do
+
+  task :prepare do
+    rm_rf ROOT + "ci"
+    mkdir_p ROOT + "ci"
+    mkdir_p ROOT + "ci/doc"
+    mkdir_p ROOT + "ci/cyclomatic"
+    mkdir_p ROOT + "ci/token"
+  end
+
+  task :publish do
+    out = ENV['CC_BUILD_ARTIFACTS'] || "out"
+    mkdir_p out unless File.directory? out
+
+    mv "ci/rspec_report.html", "#{out}/rspec_report.html"
+    mv "ci/coverage", "#{out}/coverage"
+  end
+
+  task :spec => :prepare do
+    Rake::Task[:spec].invoke
+    mv ROOT + "coverage", ROOT + "ci/coverage"
+  end
+
+end
+
+task :ci => ["ci:spec"]

data/lib/data_objects.rb

@@ -6,6 +6,7 @@ require 'extlib'
 require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'support', 'pooling'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'logger'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'connection'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'uri'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'transaction'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'command'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'result'))
@@ -13,6 +14,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'read
 require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'field'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'quoting'))
 
+if RUBY_PLATFORM =~ /java/
+  require 'do_jdbc'
+end
+
 module DataObjects
   class LengthMismatchError < StandardError; end
 

data/lib/data_objects/connection.rb

@@ -1,4 +1,3 @@
-require 'addressable/uri'
 require 'set'
 
 begin
@@ -10,7 +9,7 @@ module DataObjects
   class Connection
 
     def self.new(uri)
-      uri = uri.is_a?(String) ? Addressable::URI::parse(uri) : uri
+      uri = DataObjects::URI::parse(uri)
 
       if uri.scheme == 'jdbc'
         driver_name = uri.path.split(':').first

data/lib/data_objects/uri.rb

@@ -0,0 +1,29 @@
+require 'addressable/uri'
+
+module DataObjects
+  URI = Struct.new(:scheme, :user, :password, :host, :port, :specified_port, :path, :query, :fragment) 
+
+  class URI
+    def self.parse(uri)
+      return uri if uri.kind_of?(self)
+      uri = Addressable::URI::parse(uri) unless uri.kind_of?(Addressable::URI)
+      self.new(uri.scheme, uri.user, uri.password, uri.host, uri.port, uri.specified_port, uri.path, uri.query, uri.fragment)
+    end
+
+    def to_s
+      string = ""
+      string << "#{scheme}://"       if scheme
+      if user
+        string << "#{user}"
+        string << ":#{password}"     if password
+        string << "@"
+      end
+      string << "#{host}"            if host
+      string << ":#{specified_port}" if specified_port
+      string << path.to_s
+      string << "?#{query}"          if query
+      string << "##{fragment}"       if fragment
+      string
+    end
+  end
+end

data/lib/data_objects/version.rb

@@ -1,3 +1,3 @@
 module DataObjects
-  VERSION = "0.9.5" unless defined?(DataObjects::VERSION)
+  VERSION = "0.9.6" unless defined?(DataObjects::VERSION)
 end

data/spec/command_spec.rb

@@ -6,6 +6,10 @@ describe DataObjects::Command do
     @command = DataObjects::Command.new(@connection, 'SQL STRING')
   end
 
+  after do
+    @connection.close
+  end
+
   it "should assign the connection object to @connection" do
     @command.instance_variable_get("@connection").should == @connection
   end

data/spec/connection_spec.rb

@@ -5,6 +5,10 @@ describe DataObjects::Connection do
     @connection = DataObjects::Connection.new('mock://localhost')
   end
 
+  after do
+    @connection.release
+  end
+
   %w{dispose create_command}.each do |meth|
     it "should respond to ##{meth}" do
       @connection.should respond_to(meth.intern)
@@ -15,35 +19,12 @@ describe DataObjects::Connection do
     @connection.to_s.should == 'mock://localhost'
   end
 
-  describe "getting inherited" do
-    # HACK: Connections needs to exist under the DataObjects namespace?
-    module DataObjects
-      class MyConnection < DataObjects::Connection; end
-    end
-
-    it "should set the @connection_lock ivar to a Mutex" do
-      DataObjects::MyConnection.instance_variable_get("@connection_lock").should_not be_nil
-      DataObjects::MyConnection.instance_variable_get("@connection_lock").should be_kind_of(Mutex)
-    end
-
-    it "should set the @available_connections ivar to a Hash" do
-      DataObjects::MyConnection.instance_variable_get("@available_connections").should_not be_nil
-      DataObjects::MyConnection.instance_variable_get("@available_connections").should be_kind_of(Hash)
-    end
-
-    it "should set the @reserved_connections ivar to a Set" do
-      DataObjects::MyConnection.instance_variable_get("@reserved_connections").should_not be_nil
-      DataObjects::MyConnection.instance_variable_get("@reserved_connections").should be_kind_of(Set)
-    end
-  end
-
   describe "initialization" do
     it "should accept a regular connection uri as a String" do
       c = DataObjects::Connection.new('mock://localhost/database')
       # relying on the fact that mock connection sets @uri
       uri = c.instance_variable_get("@uri")
 
-      uri.should be_kind_of(Addressable::URI)
       uri.scheme.should == 'mock'
       uri.host.should == 'localhost'
       uri.path.should == '/database'
@@ -52,32 +33,15 @@ describe DataObjects::Connection do
     it "should accept a connection uri as a Addressable::URI" do
       c = DataObjects::Connection.new(Addressable::URI::parse('mock://localhost/database'))
       # relying on the fact that mock connection sets @uri
-      uri = c.instance_variable_get("@uri")
-
-      uri.should be_kind_of(Addressable::URI)
-      uri.to_s.should == 'mock://localhost/database'
-    end
-
-    it "should determine which DataObject adapter to use from the uri scheme" do
-      DataObjects::Mock::Connection.should_receive(:__new)
-      DataObjects::Connection.new('mock://localhost/database')
-    end
-
-    it "should determine which DataObject adapter to use from a JDBC URL scheme" do
-      DataObjects::Mock::Connection.should_receive(:__new)
-      DataObjects::Connection.new('jdbc:mock://localhost/database')
-    end
-
-    it "should acquire a connection" do
-      uri = Addressable::URI.parse('mock://localhost/database')
-      DataObjects::Mock::Connection.should_receive(:__new).with(uri)
-
-      DataObjects::Connection.new(uri)
+      c.to_s.should == 'mock://localhost/database'
     end
 
     it "should return the Connection specified by the scheme" do
       c = DataObjects::Connection.new(Addressable::URI.parse('mock://localhost/database'))
       c.should be_kind_of(DataObjects::Mock::Connection)
+
+      c = DataObjects::Connection.new(Addressable::URI.parse('jdbc:mock://localhost/database'))
+      c.should be_kind_of(DataObjects::Mock::Connection)
     end
   end
 end

data/spec/reader_spec.rb

@@ -13,6 +13,8 @@ describe DataObjects::Reader do
     reader.should respond_to(:next!)
     reader.should respond_to(:values)
     reader.should respond_to(:fields)
+
+    connection.close
   end
 
 end

data/spec/result_spec.rb

@@ -18,6 +18,7 @@ describe DataObjects::Result do
 
     # The id of the inserted row.
     result.should respond_to(:insert_id)
+    connection.close
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_objects
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -05:00
+date: 2008-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ files:
 - lib/data_objects/result.rb
 - lib/data_objects/support/pooling.rb
 - lib/data_objects/transaction.rb
+- lib/data_objects/uri.rb
 - lib/data_objects/version.rb
 - spec/command_spec.rb
 - spec/connection_spec.rb