sequel_oracle_extensions 0.5.2 → 0.5.3

data/spec/sequel/oracle_extensions/hints_spec.rb

@@ -1,157 +1,157 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require 'sequel/oracle_extensions/merge'
-require 'sequel/oracle_extensions/hints'
-
-describe "Sequel::OracleExtensions::Hints" do
-
-  CLAUSES = %w(SELECT INSERT UPDATE DELETE MERGE)
-  TYPES = CLAUSES.map{|clause| clause.downcase.intern}
-
-  before(:all) do
-    @db = Sequel.connect(DATABASE_URL)
-  end
-
-	def apply_hints!(*args)
-	  @old_hints = @ds.opts[:hints]
-	  @new_ds    = @ds.__send__(@method, *args)
-	
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'sequel/oracle_extensions/merge'
+require 'sequel/oracle_extensions/hints'
+
+describe "Sequel::OracleExtensions::Hints" do
+
+  CLAUSES = %w(SELECT INSERT UPDATE DELETE MERGE)
+  TYPES = CLAUSES.map{|clause| clause.downcase.intern}
+
+  before(:all) do
+    @db = Sequel.connect(DATABASE_URL)
+  end
+
+	def apply_hints!(*args)
+	  @old_hints = @ds.opts[:hints]
+	  @new_ds    = @ds.__send__(@method, *args)
+	
 	  @new_ds.should be_kind_of(Sequel::Dataset)
-	  @new_ds.opts[:hints].should_not be_empty
-	end
-  
-  it "hooks into dataset clause methods" do
-    [Sequel::Dataset, Sequel::Oracle::DatasetMethods].each do |klass|
-	    CLAUSES.each do |clause|
-	      next unless klass.const_defined?(k = :"#{clause}_CLAUSE_METHODS")
-		    klass.const_get(k).first.should == "#{clause.downcase}_hint_sql".intern
-		  end
-	  end
-  end
-
-  share_examples_for "dataset modifying" do
-    after(:each) do
+	  @new_ds.opts[:hints].should_not be_empty
+	end
+  
+  it "hooks into dataset clause methods" do
+    [Sequel::Dataset, Sequel::Oracle::DatasetMethods].each do |klass|
+	    CLAUSES.each do |clause|
+	      next unless klass.const_defined?(k = :"#{clause}_CLAUSE_METHODS")
+		    klass.const_get(k).first.should == "#{clause.downcase}_hint_sql".intern
+		  end
+	  end
+  end
+
+  share_examples_for "dataset modifying" do
+    after(:each) do
 		  @ds.should equal(@new_ds)
-		  @ds.opts[:hints].should_not == @old_hints
-    end
-  end
-  
-  share_examples_for "dataset cloning" do
-    after(:each) do
+		  @ds.opts[:hints].should_not == @old_hints
+    end
+  end
+  
+  share_examples_for "dataset cloning" do
+    after(:each) do
 		  @ds.should_not equal(@new_ds)
-		  @ds.opts[:hints].should == @old_hints
-    end
-  end
-  
-  share_examples_for "standard callspec" do
-	  it "callspec (String) applies :select hints" do
-	    apply_hints! @hints.first
+		  @ds.opts[:hints].should == @old_hints
+    end
+  end
+  
+  share_examples_for "standard callspec" do
+	  it "callspec (String) applies :select hints" do
+	    apply_hints! @hints.first
       hints_to_check(@new_ds, :select, @hints[0,1]).should == @hints[0,1]
-	  end
-	  it "callspec (String, ...) applies :select hints" do
-	    apply_hints! *@hints
+	  end
+	  it "callspec (String, ...) applies :select hints" do
+	    apply_hints! *@hints
       hints_to_check(@new_ds, :select, @hints).should == @hints
-	  end
-	  it "callspec (clause, String) applies clause hints" do
-	    TYPES.each do |type|
-        apply_hints! type, @hints.first
+	  end
+	  it "callspec (clause, String) applies clause hints" do
+	    TYPES.each do |type|
+        apply_hints! type, @hints.first
 	      hints_to_check(@new_ds, type, @hints[0,1]).should == @hints[0,1]
-	    end
-	  end
-	  it "callspec (clause, String, ...) applies clause hints" do
-	    TYPES.each do |type|
-        apply_hints! type, *@hints
+	    end
+	  end
+	  it "callspec (clause, String, ...) applies clause hints" do
+	    TYPES.each do |type|
+        apply_hints! type, *@hints
 	      hints_to_check(@new_ds, type, @hints).should == @hints
-	    end
-	  end
-  end
-
-  share_examples_for "clause-specific callspec" do
-	  it "callspec (String) applies hints" do
-	    apply_hints! @hints.first
+	    end
+	  end
+  end
+
+  share_examples_for "clause-specific callspec" do
+	  it "callspec (String) applies hints" do
+	    apply_hints! @hints.first
       hints_to_check(@new_ds, @clause, @hints[0,1]).should == @hints[0,1]
-	  end
-	  it "callspec (String, ...) applies hints" do
-	    apply_hints! *@hints
+	  end
+	  it "callspec (String, ...) applies hints" do
+	    apply_hints! *@hints
       hints_to_check(@new_ds, @clause, @hints).should == @hints
-	  end
-  end
-  
-  describe "hints" do
-    before(:each){ @ds, @hints = @db[:dual], ['foo', 'bar'] }
-    
-    COMMON_GROUP_BODY = Proc.new do |group,name|
-      group.class_eval do
-			  describe "##{name}" do
-		      before(:each){ @method = :"#{name}" }
-			    it_should_behave_like "dataset cloning"
-			    it_should_behave_like "standard callspec"
-			  end
-			  describe "##{name}!" do
-		      before(:each){ @method = :"#{name}!" }
-			    it_should_behave_like "dataset modifying"
-			    it_should_behave_like "standard callspec"
-			  end
-			  TYPES.each do |clause|
-				  describe "##{clause}_#{name}" do
-			      before(:each){ @clause, @method = clause, :"#{clause}_#{name}"}
-				    it_should_behave_like "dataset cloning"
-				    it_should_behave_like "clause-specific callspec"
-				  end
-				  describe "##{clause}_#{name}!" do
-			      before(:each){ @clause, @method = clause, :"#{clause}_#{name}!"}
-				    it_should_behave_like "dataset modifying"
-				    it_should_behave_like "clause-specific callspec"
-				  end
-			  end
-		  end
-    end
-	    
-	  describe "adding hints" do
-	    def hints_to_check(ds, type, input)
-	      ds.opts[:hints][type][(@orig_hints[type].length rescue 0), input.length]
-	    end
-	    COMMON_GROUP_BODY.call self, :hint
-	  end
-	  
-	  describe "overwriting hints" do
-	    def hints_to_check(ds, type, input)
-	      ds.opts[:hints][type]
-	    end
-	    COMMON_GROUP_BODY.call self, :hints
-	  end
-	  
-    describe "#hint_sql" do
-	    it "generates clause-specific hint SQL" do
-	      # set them all up front so we can test whether they get mixed up.
-        TYPES.each do |type| @ds.hints! type, "hint for #{type}" end
-	      TYPES.each do |type|
-	        sql = (clause = type.to_s.upcase).dup
-	        @ds.hint_sql(type, sql).should equal(sql)
-	        sql.should == "#{clause} /*+ hint for #{type} */"
-	      end
-	    end
-	    
-	    it "skips empty hints" do
-	      TYPES.each do |type|
-	        sql = (clause = type.to_s.upcase).dup
-	        @ds.hint_sql(type, sql).should be_nil
-	        sql.should == clause
-	      end
-	    end
-	    
-      TYPES.each do |type|
-		    it "is called by ##{type}_hint_sql" do
-	        clause = type.to_s.upcase
-		      @ds.should_receive(:hint_sql).with(type, clause)
-		      @ds.__send__ :"#{type}_hint_sql", clause
-		    end
-		    it "is called by ##{type}_sql" do
-	        args, clause = [], type.to_s.upcase
-		      @ds.should_receive(:hint_sql).with(type, clause)
-		      args.push :dual, :dual, :x if type == :merge
-		      @ds.__send__ :"#{type}_sql", *args
-		    end
-	    end
-    end
-  end
-end
+	  end
+  end
+  
+  describe "hints" do
+    before(:each){ @ds, @hints = @db[:dual], ['foo', 'bar'] }
+    
+    COMMON_GROUP_BODY = Proc.new do |group,name|
+      group.class_eval do
+			  describe "##{name}" do
+		      before(:each){ @method = :"#{name}" }
+			    it_should_behave_like "dataset cloning"
+			    it_should_behave_like "standard callspec"
+			  end
+			  describe "##{name}!" do
+		      before(:each){ @method = :"#{name}!" }
+			    it_should_behave_like "dataset modifying"
+			    it_should_behave_like "standard callspec"
+			  end
+			  TYPES.each do |clause|
+				  describe "##{clause}_#{name}" do
+			      before(:each){ @clause, @method = clause, :"#{clause}_#{name}"}
+				    it_should_behave_like "dataset cloning"
+				    it_should_behave_like "clause-specific callspec"
+				  end
+				  describe "##{clause}_#{name}!" do
+			      before(:each){ @clause, @method = clause, :"#{clause}_#{name}!"}
+				    it_should_behave_like "dataset modifying"
+				    it_should_behave_like "clause-specific callspec"
+				  end
+			  end
+		  end
+    end
+	    
+	  describe "adding hints" do
+	    def hints_to_check(ds, type, input)
+	      ds.opts[:hints][type][(@orig_hints[type].length rescue 0), input.length]
+	    end
+	    COMMON_GROUP_BODY.call self, :hint
+	  end
+	  
+	  describe "overwriting hints" do
+	    def hints_to_check(ds, type, input)
+	      ds.opts[:hints][type]
+	    end
+	    COMMON_GROUP_BODY.call self, :hints
+	  end
+	  
+    describe "#hint_sql" do
+	    it "generates clause-specific hint SQL" do
+	      # set them all up front so we can test whether they get mixed up.
+        TYPES.each do |type| @ds.hints! type, "hint for #{type}" end
+	      TYPES.each do |type|
+	        sql = (clause = type.to_s.upcase).dup
+	        @ds.hint_sql(type, sql).should equal(sql)
+	        sql.should == "#{clause} /*+ hint for #{type} */"
+	      end
+	    end
+	    
+	    it "skips empty hints" do
+	      TYPES.each do |type|
+	        sql = (clause = type.to_s.upcase).dup
+	        @ds.hint_sql(type, sql).should be_nil
+	        sql.should == clause
+	      end
+	    end
+	    
+      TYPES.each do |type|
+		    it "is called by ##{type}_hint_sql" do
+	        clause = type.to_s.upcase
+		      @ds.should_receive(:hint_sql).with(type, clause)
+		      @ds.__send__ :"#{type}_hint_sql", clause
+		    end
+		    it "is called by ##{type}_sql" do
+	        args, clause = [], type.to_s.upcase
+		      @ds.should_receive(:hint_sql).with(type, clause)
+		      args.push :dual, :dual, :x if type == :merge
+		      @ds.__send__ :"#{type}_sql", *args
+		    end
+	    end
+    end
+  end
+end

data/spec/sequel/oracle_extensions/merge_spec.rb

@@ -1,8 +1,8 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require 'sequel/oracle_extensions/merge'
-
-describe "Sequel::OracleExtensions::Merge" do
-  before(:all) do
-    @db = Sequel.connect(DATABASE_URL)
-  end
-end
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'sequel/oracle_extensions/merge'
+
+describe "Sequel::OracleExtensions::Merge" do
+  before(:all) do
+    @db = Sequel.connect(DATABASE_URL)
+  end
+end

data/spec/spec_helper.rb

@@ -1,25 +1,25 @@
-require 'rubygems'
-require 'pp'
-begin require 'win32console' and include Win32::Console::ANSI
-rescue LoadError
-end if RUBY_PLATFORM =~ /msvc|mingw|cygwin|win32/
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'sequel'
-require "rspec"
-
-DATABASE_URL = begin
-	user     = ENV['DATABASE_USER'] || 'hr'
-	password = ENV['DATABASE_PASSWORD'] || 'hr'
-	name     = ENV['DATABASE_NAME'] || 'xe'
-	host     = ENV['DATABASE_HOST'] || 'localhost'
-  port     = ':'+ENV['DATABASE_PORT'] rescue nil
-  "oracle://#{user}:#{password}@#{host}#{port}/#{name}"
+require 'rubygems'
+require 'pp'
+begin require 'win32console' and include Win32::Console::ANSI
+rescue LoadError
+end if RUBY_PLATFORM =~ /msvc|mingw|cygwin|win32/
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'sequel'
+require "rspec"
+
+DATABASE_URL = begin
+	user     = ENV['DATABASE_USER'] || 'hr'
+	password = ENV['DATABASE_PASSWORD'] || 'hr'
+	name     = ENV['DATABASE_NAME'] || 'xe'
+	host     = ENV['DATABASE_HOST'] || 'localhost'
+  port     = ':'+ENV['DATABASE_PORT'] rescue nil
+  "oracle://#{user}:#{password}@#{host}#{port}/#{name}"
+end
+
+RSpec.configure do |config|
+  require 'rspec/expectations'
+  config.include RSpec::Matchers
+  config.mock_with :rspec
 end
-
-Rspec.configure do |config|
-  require 'rspec/expectations'
-  config.include Rspec::Matchers
-  config.mock_with :rspec
-end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_oracle_extensions
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  hash: 13
+  prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Joe Khoobyar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 -04:00
+date: 2011-08-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,9 +105,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Oracle MERGE, optimizer hints, an schema extensions for Sequel
-test_files: []
-
+test_files: 
+- spec/sequel/oracle_extensions/hints_spec.rb
+- spec/sequel/oracle_extensions/merge_spec.rb
+- spec/spec_helper.rb