unidata 0.0.10 → 0.0.11

data/README.md

@@ -1,4 +1,4 @@
-UniData ORM [![Build Status](https://secure.travis-ci.org/jisraelsen/unidata.png?branch=master)](http://travis-ci.org/jisraelsen/unidata) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jisraelsen/unidata)
+UniData ORM [![Build Status](https://secure.travis-ci.org/jisraelsen/unidata.png?branch=master)](http://travis-ci.org/jisraelsen/unidata) [![Coverage Status](https://coveralls.io/repos/jisraelsen/unidata/badge.png?branch=master)](https://coveralls.io/r/jisraelsen/unidata) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jisraelsen/unidata)
 ===========
 
 A simple ORM for Rocket's UniData database.

data/lib/unidata/connection.rb

@@ -32,43 +32,33 @@ module Unidata
     end
 
     def exists?(filename, record_id)
-      exists = false
-
       open_file(filename) do |file|
         begin
-          file.read_field(record_id, 0)
-          exists = true
+          !!file.read_field(record_id, 0)
         rescue Unidata::UniFileException
+          false
         end
       end
-
-      exists
     end
 
     def read(filename, record_id)
-      record = nil
-
       open_file(filename) do |file|
         begin
-          record = Unidata::UniDynArray.new(file.read(record_id))
+          Unidata::UniDynArray.new(file.read(record_id))
         rescue Unidata::UniFileException
+          nil
         end
       end
-
-      record
     end
 
     def read_field(filename, record_id, field)
-      value = nil
-
       open_file(filename) do |file|
         begin
-          value = file.read_field(record_id, field).to_s
+          file.read_field(record_id, field).to_s
         rescue Unidata::UniFileException
+          nil
         end
       end
-
-      value
     end
 
     def write(filename, record_id, record)

data/lib/unidata/model.rb

@@ -3,17 +3,20 @@ module Unidata
     class << self
       attr_accessor :filename
 
+      def inherited(subclass)
+        subclass.instance_variable_set(:@fields, {})
+      end
+
       def connection
         Unidata.connection
       end
 
       def fields
-        unless @fields
-          @fields = {}
-          field(0, :id)
+        if self < Unidata::Model
+          superclass.fields.merge @fields
+        else
+          @fields
         end
-
-        @fields
       end
 
       def field?(name)
@@ -21,7 +24,7 @@ module Unidata
       end
 
       def field(index, name, type=String, options={})
-        fields[name.to_sym] = Field.new(index, name, type, options)
+        @fields[name.to_sym] = Field.new(index, name, type, options)
         define_attribute_accessor(name)
         define_attribute_finder(name)
       end
@@ -108,6 +111,9 @@ module Unidata
       end
     end
 
+    @fields = {}
+    field 0, :id
+
     def initialize(attributes={})
       initialize_attributes
 

data/lib/unidata/version.rb

@@ -1,3 +1,3 @@
 module Unidata
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/spec_helper.rb

@@ -1,15 +1,18 @@
-if ENV['COVERAGE']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
+require 'simplecov'
+require 'coveralls'
+
+MultiJson.engine = :json_pure
+
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter '/spec/'
 end
 
 require 'rspec'
 require 'time'
 require 'unidata'
 
-def package_local_constructor klass,*values
+def package_local_constructor klass, *values
   constructors = klass.java_class.declared_constructors
   constructors.each do |c|
     c.accessible = true
@@ -17,6 +20,8 @@ def package_local_constructor klass,*values
       return c.new_instance(*values).to_java
     rescue TypeError
       false
+    rescue ArgumentError
+      false
     end
   end
   raise TypeError,"found no matching constructor for " + klass.to_s + "(" + value.class + ")"

data/spec/unidata/connection_spec.rb

@@ -140,7 +140,7 @@ describe Unidata::Connection do
 
   describe '#read' do
     before(:each) do
-      @file = double('UniFile', :close => nil, :read => nil)
+      @file = double('UniFile', :close => nil, :read => '')
       @session.stub(:open).and_return(@file)
 
       connection.open

data/spec/unidata/model_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'set'
 
 describe Unidata::Model do
   subject { Unidata::Model }
@@ -15,6 +16,32 @@ describe Unidata::Model do
     field 5,      :status,      String,     :default => 'active'
   end
 
+  class SubclassRecord < Record
+    self.filename = 'TESTTEMP'
+
+    field 6,      :another_field
+  end
+
+  def create_field(index, name, type=String, options={})
+    Unidata::Field.new(index, name, type, options)
+  end
+
+  describe 'subclasses' do
+    it "should have the fields of it\'s superclass and it's own fields" do
+      SubclassRecord.fields.keys.to_set.should == [
+        :id,
+        :name,
+        :age,
+        :birth_date,
+        :employer,
+        :job_title,
+        :salary,
+        :status,
+        :another_field,
+      ].to_set
+    end
+  end
+
   describe '.connection' do
     it 'returns the Unidata connection' do
       Unidata.stub('connection').and_return(double('connection'))

metadata

@@ -2,57 +2,79 @@
 name: unidata
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jeremy Israelsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000Z
+date: 2013-08-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
-  version_requirements: &3630 !ruby/object:Gem::Requirement
+  version_requirements: &4664 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  requirement: *3630
+  requirement: *4664
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  version_requirements: &4682 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: *4682
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &3648 !ruby/object:Gem::Requirement
+  version_requirements: &4698 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  requirement: *3648
+  requirement: *4698
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &3664 !ruby/object:Gem::Requirement
+  version_requirements: &4714 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
     none: false
-  requirement: *3664
+  requirement: *4714
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: &3680 !ruby/object:Gem::Requirement
+  version_requirements: &4730 !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    none: false
+  requirement: *4730
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  version_requirements: &4746 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
     none: false
-  requirement: *3680
+  requirement: *4746
   prerelease: false
   type: :development
 description: A simple ORM for Rocket's UniData database