ruby-plsql 0.2.2 → 0.2.3

data/lib/plsql/procedure.rb

@@ -82,6 +82,9 @@ module PLSQL
           }
         end
       end
+      # if procedure is without arguments then create default empty argument list for default overload
+      @arguments[0] = {} if @arguments.keys.empty?
+      
       @overloads = @arguments.keys.sort
       @overloads.each do |overload|
         @argument_list[overload] = @arguments[overload].keys.sort {|k1, k2| @arguments[overload][k1][:position] <=> @arguments[overload][k2][:position]}

data/lib/ruby_plsql.rb

@@ -20,7 +20,7 @@ else
     java.lang.Thread.currentThread.setContextClassLoader(JRuby.runtime.jruby_class_loader)
 
     ojdbc_jar = "ojdbc14.jar"
-    if ojdbc_jar_path = ENV["PATH"].split(":").find{|d| File.exists?(File.join(d,ojdbc_jar))}
+    if ojdbc_jar_path = ENV["PATH"].split(/[:;]/).find{|d| File.exists?(File.join(d,ojdbc_jar))}
       require File.join(ojdbc_jar_path,ojdbc_jar)
     else
       require ojdbc_jar
@@ -42,6 +42,6 @@ require "time"
 require "date"
 require "bigdecimal"
 
-%w(connection schema procedure package).each do |file|
+%w(connection oci_connection jdbc_connection schema procedure package).each do |file|
   require File.dirname(__FILE__) + "/plsql/#{file}"
 end

data/lib/ruby_plsql/version.rb

@@ -2,7 +2,7 @@ module RubyPlsql #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/plsql/procedure_spec.rb

@@ -355,7 +355,7 @@ describe "Function with output parameters" do
 
 end
 
-describe "Function without parameters" do
+describe "Function or procedure without parameters" do
   before(:all) do
     plsql.connection = get_connection
     plsql.connection.exec <<-EOS
@@ -366,13 +366,112 @@ describe "Function without parameters" do
         RETURN 'dummy';
       END test_no_params;
     EOS
+    plsql.connection.exec <<-EOS
+      CREATE OR REPLACE PROCEDURE test_proc_no_params
+      IS
+      BEGIN
+        NULL;
+      END test_proc_no_params;
+    EOS
   end
   
   after(:all) do
     plsql.logoff
   end
 
-  it "should return value" do
+  it "should find function" do
+    PLSQL::Procedure.find(plsql, :test_no_params).should_not be_nil
+  end
+
+  it "should return function value" do
     plsql.test_no_params.should == "dummy"
   end
-end
+
+  it "should find procedure" do
+    PLSQL::Procedure.find(plsql, :test_proc_no_params).should_not be_nil
+  end
+
+  it "should execute procedure" do
+    plsql.test_proc_no_params.should be_nil
+  end
+
+end
+
+describe "Function with CLOB parameter and return value" do
+  
+  before(:all) do
+    plsql.connection = get_connection
+    plsql.connection.exec <<-EOS
+      CREATE OR REPLACE FUNCTION test_clob
+        ( p_clob CLOB )
+        RETURN CLOB
+      IS
+      BEGIN
+        RETURN p_clob;
+      END test_clob;
+    EOS
+  end
+  
+  after(:all) do
+    plsql.logoff
+  end
+  
+  it "should find existing procedure" do
+    PLSQL::Procedure.find(plsql, :test_clob).should_not be_nil
+  end
+
+  it "should execute function and return correct value" do
+    large_text = 'ābčdēfghij' * 10_000
+    plsql.test_clob(large_text).should == large_text
+  end
+
+  unless defined?(JRUBY_VERSION)
+
+    it "should execute function with empty string and return nil (oci8 cannot pass empty CLOB parameter)" do
+      text = ''
+      plsql.test_clob(text).should be_nil
+    end
+    
+  else
+
+    it "should execute function with empty string and return empty string" do
+      text = ''
+      plsql.test_clob(text).should == text
+    end
+    
+  end
+
+  it "should execute function with nil and return nil" do
+    plsql.test_clob(nil).should be_nil
+  end
+
+end
+
+describe "Procedrue with CLOB parameter and return value" do
+  
+  before(:all) do
+    plsql.connection = get_connection
+    plsql.connection.exec <<-EOS
+      CREATE OR REPLACE PROCEDURE test_clob_proc
+        ( p_clob CLOB,
+          p_return OUT CLOB)
+      IS
+      BEGIN
+        p_return := p_clob;
+      END test_clob_proc;
+    EOS
+  end
+  
+  after(:all) do
+    plsql.logoff
+  end
+  
+  it "should find existing procedure" do
+    PLSQL::Procedure.find(plsql, :test_clob_proc).should_not be_nil
+  end
+
+  it "should execute function and return correct value" do
+    large_text = 'ābčdēfghij' * 10_000
+    plsql.test_clob_proc(large_text)[:p_return].should == large_text
+  end
+end

data/spec/spec_helper.rb

@@ -10,8 +10,20 @@ require File.expand_path(File.dirname(__FILE__) + "/../lib/ruby_plsql")
 
 def get_connection
   unless defined?(JRUBY_VERSION)
-    OCI8.new("hr","hr","xe")
+    begin
+      OCI8.new("hr","hr","xe")
+    # if connection fails then sleep 5 seconds and retry
+    rescue OCIError
+      sleep 5
+      OCI8.new("hr","hr","xe")
+    end
   else
-    DriverManager.getConnection("jdbc:oracle:thin:@ubuntu710:1521:XE","hr","hr")
+    begin
+      DriverManager.getConnection("jdbc:oracle:thin:@ubuntu710:1521:XE","hr","hr")
+    # if connection fails then sleep 5 seconds and retry
+    rescue NativeException
+      sleep 5
+      DriverManager.getConnection("jdbc:oracle:thin:@ubuntu710:1521:XE","hr","hr")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-plsql
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-20 00:00:00 +03:00
+date: 2008-10-17 00:00:00 +03:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: ruby-plsql gem provides simple Ruby API for calling Oracle PL/SQL procedures.
 email: 
 - raymonds72@gmail.com
@@ -23,43 +32,25 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - License.txt
-- Manifest.txt
 - README.txt
-- website/index.txt
 files: 
 - History.txt
 - License.txt
-- Manifest.txt
 - README.txt
-- Rakefile
-- config/hoe.rb
-- config/requirements.rb
 - lib/oradate_patch.rb
 - lib/plsql/connection.rb
+- lib/plsql/jdbc_connection.rb
+- lib/plsql/oci_connection.rb
 - lib/plsql/package.rb
 - lib/plsql/procedure.rb
 - lib/plsql/schema.rb
 - lib/ruby_plsql.rb
 - lib/ruby_plsql/version.rb
-- log/debug.log
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
 - spec/plsql/package_spec.rb
 - spec/plsql/procedure_spec.rb
 - spec/plsql/schema_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/rspec.rake
-- tasks/website.rake
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.rhtml
 has_rdoc: true
 homepage: http://ruby-plsql.rubyforge.org
 post_install_message: 

data/Manifest.txt

@@ -1,33 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-config/hoe.rb
-config/requirements.rb
-lib/oradate_patch.rb
-lib/plsql/connection.rb
-lib/plsql/package.rb
-lib/plsql/procedure.rb
-lib/plsql/schema.rb
-lib/ruby_plsql.rb
-lib/ruby_plsql/version.rb
-log/debug.log
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-spec/plsql/package_spec.rb
-spec/plsql/procedure_spec.rb
-spec/plsql/schema_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/rspec.rake
-tasks/website.rake
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml

data/Rakefile

@@ -1,4 +0,0 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }

data/config/hoe.rb

@@ -1,70 +0,0 @@
-require 'ruby_plsql/version'
-
-AUTHOR = 'Raimonds Simanovskis'  # can also be an array of Authors
-EMAIL = "raymonds72@gmail.com"
-DESCRIPTION = "ruby-plsql gem provides simple Ruby API for calling Oracle PL/SQL procedures."
-GEM_NAME = 'ruby-plsql' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'ruby-plsql' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
-VERS = RubyPlsql::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'ruby_plsql documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
-    @extra_deps
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  
-end
-
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-hoe.rsync_args = '-av --delete --ignore-errors'

data/config/requirements.rb

@@ -1,17 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
-
-require 'ruby_plsql'

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/script/txt2html

@@ -1,74 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-begin
-  require 'newgem'
-rescue LoadError
-  puts "\n\nGenerating the website requires the newgem RubyGem"
-  puts "Install: gem install newgem\n\n"
-  exit(1)
-end
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-require File.dirname(__FILE__) + '/../lib/ruby_plsql/version.rb'
-
-version  = RubyPlsql::VERSION::STRING
-download = 'http://rubyforge.org/projects/ruby-plsql'
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1: return 'st'
-    when 2: return 'nd'
-    when 3: return 'rd'
-    else    return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.join(File.dirname(__FILE__), '/../website/template.rhtml')
-  
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text = fsrc.read
-  syntax_items = []
-  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
-    ident = syntax_items.length
-    element, syntax, source = $1, $2, $3
-    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
-    "syntax-temp-#{ident}"
-  }
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text).to_html
-  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)