unidata 0.0.1 → 0.0.2

data/README.md

@@ -1,4 +1,4 @@
-UniData ORM
+UniData ORM [![Build Status](https://secure.travis-ci.org/jisraelsen/unidata.png?branch=master)](http://travis-ci.org/jisraelsen/unidata)
 ===========
 
 A simple ORM for Rocket's UniData database.
@@ -91,9 +91,9 @@ COVERAGE=on rake spec
 Issues
 ------
 
-Please use GitHub's [issue tracker](http://github.com/totalcareauto/unidata/issues).
+Please use GitHub's [issue tracker](http://github.com/jisraelsen/unidata/issues).
 
-Authors
--------
+Author
+------
 
 [Jeremy Israelsen](http://github.com/jisraelsen)

data/lib/unidata/connection.rb

@@ -14,11 +14,13 @@ module Unidata
     end
 
     def open
-      @session = UDJrb::Session.new user, password, host, data_dir
+      @session = Unidata.unijava.open_session
+      @session.set_data_source_type "UNIDATA"
+      @session.connect(host, user, password, data_dir)
     end
 
     def close
-      @session.disconnect if @session
+      Unidata.unijava.close_session @session
       @session = nil
     end
 
@@ -29,7 +31,7 @@ module Unidata
         begin
           file.read_field(record_id, 0)
           exists = true
-        rescue Java::AsjavaUniobjects::UniFileException
+        rescue Unidata::UniFileException
         end
       end
 
@@ -41,8 +43,8 @@ module Unidata
 
       open_file(filename) do |file|
         begin
-          record = Java::AsjavaUniclientlibs::UniDynArray.new(file.read(record_id))
-        rescue Java::AsjavaUniobjects::UniFileException
+          record = Unidata::UniDynArray.new(file.read(record_id))
+        rescue Unidata::UniFileException
         end
       end
 
@@ -55,7 +57,7 @@ module Unidata
       open_file(filename) do |file|
         begin
           value = file.read_field(record_id, field).to_s
-        rescue Java::AsjavaUniobjects::UniFileException
+        rescue Unidata::UniFileException
         end
       end
 
@@ -63,7 +65,7 @@ module Unidata
     end
 
     def write(filename, record_id, record)
-      record = record.to_unidata unless record.kind_of?(Java::AsjavaUniclientlibs::UniDynArray)
+      record = record.to_unidata unless record.kind_of?(Unidata::UniDynArray)
 
       open_file(filename) do |file|
         file.write(record_id, record)
@@ -82,7 +84,7 @@ module Unidata
         begin
           file.lock_record(record_id, lock_flag)
           yield
-        rescue Java::AsjavaUniobjects::UniFileException
+        rescue Unidata::UniFileException
           # try to obtain a record lock at most 3 times, then give up
           if retry_count < 2
             sleep 5

data/lib/unidata/extensions/big_decimal.rb

@@ -1,3 +1,5 @@
+require 'bigdecimal'
+
 module Unidata
   module Extensions
     module BigDecimal

data/lib/unidata/extensions/date.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module Unidata
   module Extensions
     module Date

data/lib/unidata/extensions/time.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Unidata
   module Extensions
     module Time

data/lib/unidata/model.rb

@@ -26,7 +26,7 @@ module Unidata
       end
 
       def to_unidata(instance)
-        record = Java::AsjavaUniclientlibs::UniDynArray.new
+        record = Unidata::UniDynArray.new
 
         instance.attributes.each do |key, value|
           next if key == :id

data/lib/unidata/version.rb

@@ -1,3 +1,3 @@
 module Unidata
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/unidata.rb

@@ -1,7 +1,5 @@
-require 'udjrb'
-require 'time'
-require 'date'
-require 'bigdecimal'
+require 'java'
+require 'unidata/asjava.jar'
 require 'unidata/extensions'
 require 'unidata/connection'
 require 'unidata/field'
@@ -9,9 +7,16 @@ require 'unidata/model'
 require "unidata/version"
 
 module Unidata
+  include_package 'asjava.uniobjects'
+  include_package 'asjava.uniclientlibs'
+
   class << self
     attr_reader :connection
 
+    def unijava
+      @unijava ||= Unidata::UniJava.new
+    end
+
     def prepare_connection(config={})
       @connection = Connection.new(config[:user], config[:password], config[:host], config[:data_dir])
     end
@@ -30,4 +35,3 @@ module Unidata
     end
   end
 end
-

data/spec/unidata/connection_spec.rb

@@ -3,6 +3,13 @@ require 'spec_helper'
 describe Unidata::Connection do
   let(:connection) { Unidata::Connection.new('test', 'secret', 'localhost', 'tmp') }
 
+  before(:each) do
+    @session = double('UniSession', :set_data_source_type => nil, :connect => nil)
+
+    Unidata.unijava.stub(:open_session).and_return(@session)
+    Unidata.unijava.stub(:close_session)
+  end
+
   describe '#initialize' do
     it 'captures and assigns arguments' do
       connection.user.should == 'test'
@@ -15,7 +22,8 @@ describe Unidata::Connection do
   describe '#open?' do
     context 'with existing active session' do
       it 'returns true' do
-        UDJrb::Session.stub(:new).and_return(double('UDJrb::Session', :is_active => true))
+        @session.stub(:is_active).and_return(true)
+
         connection.open
         connection.open?.should == true
       end
@@ -23,7 +31,8 @@ describe Unidata::Connection do
 
     context 'with existing inactive session' do
       it 'returns false' do
-        UDJrb::Session.stub(:new).and_return(double('UDJrb::Session', :is_active => false))
+        @session.stub(:is_active).and_return(false)
+
         connection.open
         connection.open?.should == false
       end
@@ -37,19 +46,27 @@ describe Unidata::Connection do
   end
 
   describe '#open' do
-    it 'creates a new session with config params' do
-      UDJrb::Session.should_receive(:new).with(connection.user, connection.password, connection.host, connection.data_dir)
+    it 'opens a new session' do
+      Unidata.unijava.should_receive(:open_session)
+      connection.open
+    end
+
+    it 'sets data source type to UNIDATA' do
+      @session.should_receive(:set_data_source_type).with('UNIDATA')
+      connection.open
+    end
+
+    it 'connects the session' do
+      @session.should_receive(:connect).with(connection.host, connection.user, connection.password, connection.data_dir)
       connection.open
     end
   end
 
   describe '#close' do
-    it 'disconnects the session' do
-      session = double('UDJrb::Session', :disconnect => nil)
-      UDJrb::Session.stub(:new).and_return(session)
+    it 'closes the session' do
       connection.open
 
-      session.should_receive(:disconnect)
+      Unidata.unijava.should_receive(:close_session).with(@session)
       connection.close
     end
   end
@@ -57,9 +74,8 @@ describe Unidata::Connection do
   describe '#exists?' do
     before(:each) do
       @file = double('UniFile', :close => nil, :read_field => nil)
-      @session = double('UDJrb::Session', :open => @file)
+      @session.stub(:open).and_return(@file)
 
-      UDJrb::Session.stub(:new).and_return(@session)
       connection.open
     end
 
@@ -87,7 +103,7 @@ describe Unidata::Connection do
 
     context 'when file has no given record_id' do
       it 'returns false' do
-        uni_file_exception = package_local_constructor Java::AsjavaUniobjects::UniFileException
+        uni_file_exception = package_local_constructor Unidata::UniFileException
 
         @file.stub(:read_field).and_raise(uni_file_exception)
         connection.exists?('TEST', 123).should == false
@@ -98,9 +114,8 @@ describe Unidata::Connection do
   describe '#read' do
     before(:each) do
       @file = double('UniFile', :close => nil, :read => nil)
-      @session = double('UDJrb::Session', :open => @file)
+      @session.stub(:open).and_return(@file)
 
-      UDJrb::Session.stub(:new).and_return(@session)
       connection.open
     end
 
@@ -120,15 +135,15 @@ describe Unidata::Connection do
     end
 
     context 'when record exists' do
-      it 'returns record as a Java::AsjavaUniclientlibs::UniDynArray' do
+      it 'returns record as a Unidata::UniDynArray' do
         @file.stub(:read).and_return('')
-        connection.read('TEST', 123).should be_kind_of(Java::AsjavaUniclientlibs::UniDynArray)
+        connection.read('TEST', 123).should be_kind_of(Unidata::UniDynArray)
       end
     end
 
     context 'when record does not exist' do
       it 'returns nil' do
-        uni_file_exception = package_local_constructor Java::AsjavaUniobjects::UniFileException
+        uni_file_exception = package_local_constructor Unidata::UniFileException
 
         @file.stub(:read).and_raise(uni_file_exception)
         connection.read('TEST', 123).should be_nil
@@ -139,9 +154,8 @@ describe Unidata::Connection do
   describe '#read_field' do
     before(:each) do
       @file = double('UniFile', :close => nil, :read_field => nil)
-      @session = double('UDJrb::Session', :open => @file)
+      @session.stub(:open).and_return(@file)
 
-      UDJrb::Session.stub(:new).and_return(@session)
       connection.open
     end
 
@@ -169,7 +183,7 @@ describe Unidata::Connection do
 
     context 'when field does not exist' do
       it 'returns nil' do
-        uni_file_exception = package_local_constructor Java::AsjavaUniobjects::UniFileException
+        uni_file_exception = package_local_constructor Unidata::UniFileException
 
         @file.stub(:read_field).and_raise(uni_file_exception)
         connection.read_field('TEST', 123, 5).should be_nil
@@ -180,10 +194,9 @@ describe Unidata::Connection do
   describe '#write' do
     before(:each) do
       @file = double('UniFile', :close => nil, :write => nil)
-      @session = double('UDJrb::Session', :open => @file)
-      @record = Java::AsjavaUniclientlibs::UniDynArray.new
+      @session.stub(:open).and_return(@file)
+      @record = Unidata::UniDynArray.new
 
-      UDJrb::Session.stub(:new).and_return(@session)
       connection.open
     end
 
@@ -192,9 +205,9 @@ describe Unidata::Connection do
       connection.write('TEST', 123, @record)
     end
 
-    it 'calls to_unidata on record if record not a Java::AsjavaUniclientlibs::UniDynArray' do
+    it 'calls to_unidata on record if record not a Unidata::UniDynArray' do
       record = double('Record')
-      record.should_receive(:to_unidata).and_return(Java::AsjavaUniclientlibs::UniDynArray.new)
+      record.should_receive(:to_unidata).and_return(Unidata::UniDynArray.new)
 
       connection.write('TEST', 123, record)
     end
@@ -213,9 +226,8 @@ describe Unidata::Connection do
   describe '#write_field' do
     before(:each) do
       @file = double('UniFile', :close => nil, :write_field => nil)
-      @session = double('UDJrb::Session', :open => @file)
+      @session.stub(:open).and_return(@file)
 
-      UDJrb::Session.stub(:new).and_return(@session)
       connection.open
     end
 

data/spec/unidata/model_spec.rb

@@ -67,7 +67,7 @@ describe Unidata::Model do
 
   describe '.from_unidata' do
     before(:each) do
-      @record = Java::AsjavaUniclientlibs::UniDynArray.new
+      @record = Unidata::UniDynArray.new
       @record.replace 0, 123
       @record.replace 1, 'JOHN DOE'
       @record.replace 2, 25
@@ -113,7 +113,7 @@ describe Unidata::Model do
 
   describe '.find' do
     before(:each) do
-      @record = Java::AsjavaUniclientlibs::UniDynArray.new
+      @record = Unidata::UniDynArray.new
       @record.replace 1, 'JOHN DOE'
       @record.replace 2, 25
       @record.replace 3, Date.to_unidata(Date.today)
@@ -169,7 +169,7 @@ describe Unidata::Model do
         :salary     => BigDecimal.new('60_000.00')
       )
 
-      record = Java::AsjavaUniclientlibs::UniDynArray.new
+      record = Unidata::UniDynArray.new
       record.replace 1, 'JOHN DOE'
       record.replace 2, 25
       record.replace 3, Date.to_unidata(Date.today)

metadata

@@ -2,7 +2,7 @@
 name: unidata
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jeremy Israelsen
@@ -11,22 +11,6 @@ bindir: bin
 cert_chain: []
 date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: udjrb
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/unidata.rb
+- lib/unidata/asjava.jar
 - lib/unidata/connection.rb
 - lib/unidata/extensions.rb
 - lib/unidata/extensions/big_decimal.rb
@@ -101,7 +86,7 @@ files:
 - spec/unidata/field_spec.rb
 - spec/unidata/model_spec.rb
 - spec/unidata_spec.rb
-homepage: http://github.com/totalcareauto/unidata
+homepage: http://github.com/jisraelsen/unidata
 licenses: []
 post_install_message:
 rdoc_options: []