mdb 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 743fac27121ba7755e9bd504da03a4dd5067c5ee
-  data.tar.gz: 6132d6430e369e4252bc398095b66a30ec5e1f2d
+SHA256:
+  metadata.gz: fdd6834b543dd5e1397818e9c532ab083034a1d15e0d8b1203359efbd615ca16
+  data.tar.gz: a7adfc129d17d6350e920a9e253ce3374c3806d943a0da3253cc76ad32432618
 SHA512:
-  metadata.gz: ace168b10d293ad77f5527730ade2d549f4869ebfc73baafcb6220d4d4f42f8257575e601202df3204dbcf11be335e91204e6fc7eb09b8af10b3ba2f523fa679
-  data.tar.gz: 39a9b268a36d122bc14005a64ee5448e8e43f076699b1b3e79bf1da538781e8f74a7d8deb5f6cfdabaee908db9b830ab02ff94c7d629ff7a9cecfd70536eddde
+  metadata.gz: c467566e7ecff206ae4c1d26b894c5661355f6f47926bab1c7463d49430f786b0db80fd2fa86c23f0dde81ccf35af66f5fe7ba73c822cc30be71c7a2893c3783
+  data.tar.gz: e0d160c33ed133e5a086a022c57a14a128b0ea82c3c4fbc790a23960c7488abfbf319beb2b42f24ec0e8eed9dfe6b9edc40aadc84af0733b9626d6a000ddb077

data/.github/workflows/ci.yml

@@ -0,0 +1,18 @@
+name: Tests
+on: [push]
+
+jobs:
+  ruby:
+    name: Ruby Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Install mdbtools
+        run: sudo apt-get -yqq install mdbtools
+      - name: Run tests
+        run: bundle exec rake test

data/.ruby-version

@@ -0,0 +1 @@
+2.6.6

data/CHANGELOG.md

@@ -0,0 +1,46 @@
+# Change Log
+
+## Unreleased
+
+ - None
+
+## 0.5.0 (2021-10-19)
+
+ - Fixed compatibility with newer versions of mdbtools which require specifying date and time formats separately
+
+## 0.4.1 (2017-03-23)
+
+ - Filled in homepage in mdb.gemspec
+
+## 0.4.0 (2017-03-21)
+
+ - Raised `Mdb::MdbToolsNotInstalledError` when shelling out to `mdb-export` or `mdb-tables` exits with 127 rather than shelling out to check `which mdb-export`
+ - Raised `Mdb::Error` when shelling out to `mdb-export` or `mdb-tables` exits nonzero
+
+## 0.3.2 (2016-04-05)
+
+No docs yet. Contributions welcome!
+
+## 0.3.1 (2014-02-06)
+
+No docs yet. Contributions welcome!
+
+## 0.3.0 (2013-11-20)
+
+No docs yet. Contributions welcome!
+
+## 0.0.3.rc2 (2013-10-30)
+
+No docs yet. Contributions welcome!
+
+## 0.0.3.rc1 (2013-10-25)
+
+No docs yet. Contributions welcome!
+
+## 0.0.2 (2013-05-08)
+
+No docs yet. Contributions welcome!
+
+## 0.0.1 (2013-05-07)
+
+No docs yet. Contributions welcome!

data/README.md

@@ -1,7 +1,8 @@
 # Mdb
 
-[![Build Status](https://travis-ci.org/concordia-publishing-house/mdb.png?branch=master)](https://travis-ci.org/concordia-publishing-house/mdb)
-[![Code Climate](https://codeclimate.com/github/concordia-publishing-house/mdb.png)](https://codeclimate.com/github/concordia-publishing-house/mdb)
+[![Gem Version](https://badge.fury.io/rb/mdb.svg)](https://rubygems.org/gems/mdb)
+[![Code Climate](https://codeclimate.com/github/cph/mdb.svg)](https://codeclimate.com/github/cph/mdb)
+[![Build Status](https://travis-ci.org/cph/mdb.svg)](https://travis-ci.org/cph/mdb)
 
 Wraps [mdb-tools](https://github.com/brianb/mdbtools) for reading Microsoft Access databases
 
@@ -31,6 +32,14 @@ database.tables
 database[:Movies]
 ```
 
+## Heroku
+
+mdb-tools on heroku requires a custom buildpack.
+
+Here is a sample project using this gem on heroku with configuration instructions:
+
+https://github.com/jkotchoff/heroku_rails_microsoft_access_mdb_example
+
 ## Contributing
 
 1. Fork it

data/lib/mdb/database.rb

@@ -1,48 +1,51 @@
-require 'tempfile'
-require 'shellwords'
-require 'open3'
-require 'csv'
+require "tempfile"
+require "shellwords"
+require "csv"
 
 
 module Mdb
   class Database
-    
-    
-    
+
+
+
     def initialize(file, options={})
       file = file.to_path if file.respond_to?(:to_path)
       raise FileDoesNotExistError, "\"#{file}\" does not exist" unless File.exist?(file)
-      
+
       @file = file
-      @delimiter = options.fetch :delimiter, '|'
+      @delimiter = options.fetch :delimiter, "|"
     end
-    
-    
-    
+
+
+
     attr_reader :file, :delimiter
-    
-    
-    
+
+
+
     def tables
       @tables ||= execute("mdb-tables -1 #{file_name}").scan(/[^\n]+/)
     end
-    
-    
-    
+
+
+
     def columns(table)
-      open_csv(table) { |csv| csv.readline.map(&:to_sym) }
+      open_csv(table) do |csv|
+        (csv.readline || []).map(&:to_sym)
+      end
     end
-    
-    
-    
-    def read_csv(table)
-      csv = execute "mdb-export -D '%F %T' -d \\| #{file_name} #{table}"
-      empty_table!(table) if csv.empty?
-      csv
+
+
+
+    def read_csv(table, &block)
+      table = table.to_s
+      raise TableDoesNotExistError, "#{table.inspect} does not exist in #{file_name.inspect}" unless tables.member?(table)
+      date_flags = "-D '%F %T'"
+      date_flags << " -T '%F %T'" if supports_datetime?
+      execute "mdb-export #{date_flags} -d #{Shellwords.escape(delimiter)} #{file_name} #{Shellwords.escape(table)}", &block
     end
-    
-    
-    
+
+
+
     # Yields a hash for each record
     def each_record(table, &block)
       columns = nil
@@ -55,9 +58,9 @@ module Mdb
       end
     end
     alias :each :each_record
-    
-    
-    
+
+
+
     # Returns an array of hashes. Each hash represents a record
     def read_records(table)
       hashes = []
@@ -66,66 +69,65 @@ module Mdb
     end
     alias :read :read_records
     alias :[] :read_records
-    
-    
-    
+
+
+
   private
-    
-    
-    
+
+
+
     def read_each(table, &block)
       count = 0
-      
+
       open_csv(table) do |csv|
         while line = csv.readline
           yield line
           count += 1
         end
       end
-      
-      empty_table!(table) if count == 0
-      
+
       count
     end
-    
-    
-    
-    def empty_table!(table)
-      raise MdbToolsNotInstalledError if `which mdb-export 2> /dev/null`.empty?
-      raise TableDoesNotExistError, "#{table.inspect} does not exist in #{file_name.inspect}" if !tables.member?(table.to_s)
-      raise Error, "An error occurred when reading #{table.inspect} in #{file_name.inspect}"
-    end
-    
-    
-    
+
+
+
     def file_name
       Shellwords.escape(file)
     end
-    
-    
-    
+
+
+
     def open_csv(table)
-      command = "mdb-export -D '%F %T' -d #{Shellwords.escape(delimiter)} #{file_name} #{table}"
-      Open3.popen3(command) do |stdin, stdout, stderr|
-        yield CSV.new(stdout, col_sep: delimiter)
+      read_csv(table) do |file|
+        yield CSV.new(file, col_sep: delimiter)
       end
     end
-    
-    
-    
+
+
+
     def execute(command)
-      stdout = `#{command} 2> /dev/null`
-      
-      # !todo: add fixture data and a test to prove this code
-      if stdout.respond_to?(:force_encoding)
-        stdout.force_encoding("Windows-1252")
-        stdout.encode!("utf-8")
+      file = Tempfile.new("mdb")
+      unless system "#{command} > #{file.path} 2> /dev/null"
+        raise MdbToolsNotInstalledError if $?.exitstatus == 127
+        raise Error, "#{command[/^\S+/]} exited with status #{$?.exitstatus}"
       end
-      
-      stdout
+      return file.read unless block_given?
+      yield file
+    ensure
+      file.close
+      file.unlink
+    end
+
+
+
+    def supports_datetime?
+      return @supports_datetime if instance_variable_defined?(:@supports_datetime)
+
+      version = Gem::Version.new(`mdb-ver -M`.gsub(/mdbtools v/, ""))
+      @supports_datetime = version >= Gem::Version.new("0.9.0")
     end
-    
-    
-    
+
+
+
   end
 end

data/lib/mdb/version.rb

@@ -1,3 +1,3 @@
 module Mdb
-  VERSION = "0.3.1"
+  VERSION = "0.5.0"
 end

data/lib/mdb.rb

@@ -2,7 +2,7 @@ require "mdb/version"
 require "mdb/database"
 
 module Mdb
-  
+
   class FileDoesNotExistError < ArgumentError; end
   class TableDoesNotExistError < ArgumentError; end
   class MdbToolsNotInstalledError < ArgumentError
@@ -11,9 +11,9 @@ module Mdb
     end
   end
   class Error < RuntimeError; end
-  
+
   def self.open(file)
     Mdb::Database.new(file)
   end
-  
+
 end

data/mdb.gemspec

@@ -1,16 +1,17 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mdb/version'
+require "mdb/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "mdb"
   spec.version       = Mdb::VERSION
   spec.authors       = ["Robert Lail"]
   spec.email         = ["robert.lail@cph.org"]
+
   spec.description   = %q{A library for reading Microsoft Access databases}
   spec.summary       = %q{Wraps mdb-tools for reading and Microsoft Access databases (MDB)}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/cph/mdb"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,9 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rails", ">= 3.2.0"
-  spec.add_development_dependency "turn"
+  spec.add_development_dependency "rails", "< 7.0"
+  spec.add_development_dependency "shoulda-context"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "minitest-reporters-turn_reporter"
 end

data/test/database_test.rb

@@ -1,37 +1,37 @@
 require "test_helper"
 
 class MdbTest < ActiveSupport::TestCase
-  
-  
+
+
   { "Access 2000" => "Example2000.mdb",
     "Acesss 2003" => "Example2003.mdb" }.each do |format, file|
     path = "#{File.dirname(__FILE__)}/data/#{file}"
-    
+
     test "should identify three tables in #{file} (#{format})" do
       database = Mdb.open(path)
       assert_equal %w{Actors EmptyTable Movies}, database.tables.sort
     end
-    
+
     test "should find all the rows in each table (#{format})" do
       database = Mdb.open(path)
-      
+
       expected_counts = {
-        :Actors => 4,
+        :Actors => 5,
         :Movies => 7 }
       expected_counts.each do |table, expected_count|
         assert_equal expected_count, database[table].count, "The count of '#{table}' is off"
       end
     end
   end
-  
-  
-  
+
+
+
   test "should raise an exception when instatiated with a missing database" do
     assert_raises(Mdb::FileDoesNotExistError) do
       Mdb.open "#{File.dirname(__FILE__)}/data/nope.mdb"
     end
   end
-  
+
   test "should raise an exception when mdb-tools is not installed" do
     assert_raises(Mdb::MdbToolsNotInstalledError) do
       database = Mdb.open "#{File.dirname(__FILE__)}/data/Example2000.mdb"
@@ -40,44 +40,74 @@ class MdbTest < ActiveSupport::TestCase
       end
     end
   end
-  
+
+  context "without permission to read the file" do
+    setup do
+      system "chmod u-r #{File.dirname(__FILE__)}/data/Protected.mdb"
+    end
+
+    teardown do
+      system "chmod u+r #{File.dirname(__FILE__)}/data/Protected.mdb"
+    end
+
+    should "raise an exception if mdb-tools fails for other reasons" do
+      assert_raises(Mdb::Error) do
+        database = Mdb.open "#{File.dirname(__FILE__)}/data/Protected.mdb"
+        database.read :Actors
+      end
+    end
+  end
+
   test "should raise an exception if a table is not found" do
     database = Mdb.open "#{File.dirname(__FILE__)}/data/Example2000.mdb"
     assert_raises(Mdb::TableDoesNotExistError) do
       database.read :Villains
     end
   end
-  
+
   test "should return an empty array if a table is empty" do
     database = Mdb.open "#{File.dirname(__FILE__)}/data/Example2000.mdb"
     assert_equal [], database.read(:EmptyTable)
   end
-  
-  
-  
+
+
+
   test "should return an array of columns for at able" do
     database = Mdb.open "#{File.dirname(__FILE__)}/data/Example2000.mdb"
     assert_equal [:ID, :FirstName, :LastName, :Birthdate], database.columns(:Actors)
   end
-  
+
+  test "should raise an exception if asked for the columns of a nonexistent table" do
+    database = Mdb.open "#{File.dirname(__FILE__)}/data/Example2000.mdb"
+    assert_raises(Mdb::TableDoesNotExistError) do
+      database.columns :Directors
+    end
+  end
+
   test "should treat quotation marks correctly" do
     database = Mdb.open "#{File.dirname(__FILE__)}/data/Example2000.mdb"
     actor = database.read(:Actors).first
     assert_equal "Chris", actor[:FirstName] # as opposed to "\"Chris\""
   end
-  
-  
-  
+
+  test "should treat non-ASCII characters correctly" do
+    database = Mdb.open "#{File.dirname(__FILE__)}/data/Example2000.mdb"
+    actor = database.read(:Actors).last
+    assert_equal "Skarsgård", actor[:LastName]
+  end
+
+
+
   test "should format dates ISO 8601" do
     database = Mdb.open "#{File.dirname(__FILE__)}/data/Example2000.mdb"
     actor = database.read(:Actors).first
     assert_equal "1981-06-13 00:00:00", actor[:Birthdate]
   end
-  
-  
-  
+
+
+
 private
-  
+
   def with_env(new_env)
     begin
       old_env = ENV.to_hash
@@ -87,5 +117,5 @@ private
       ENV.replace(old_env)
     end
   end
-  
+
 end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require "rails"
 require "rails/test_help"
-require "turn"
+require "minitest/reporters/turn_reporter"
+require "shoulda/context"
 require "pry"
 require "mdb"

metadata

@@ -1,83 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: mdb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Robert Lail
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters-turn_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A library for reading Microsoft Access databases
@@ -87,8 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".github/workflows/ci.yml"
+- ".gitignore"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -99,34 +129,35 @@ files:
 - mdb.gemspec
 - test/data/Example2000.mdb
 - test/data/Example2003.mdb
+- test/data/Protected.mdb
 - test/database_test.rb
 - test/test_helper.rb
-homepage: ''
+homepage: https://github.com/cph/mdb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Wraps mdb-tools for reading and Microsoft Access databases (MDB)
 test_files:
 - test/data/Example2000.mdb
 - test/data/Example2003.mdb
+- test/data/Protected.mdb
 - test/database_test.rb
 - test/test_helper.rb

data/.travis.yml

@@ -1,8 +0,0 @@
-# .travis.yml
-language: ruby
-rvm:
-  - 2.0.0
-script:
-  - bundle exec rake test
-before_install:
-  - sudo apt-get install mdbtools