mdb 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c6c7c1cdcb9921dfebf67418cd17e2fdac1bb1
-  data.tar.gz: ddc03a93b64636f6db253f639e49030429864c11
+  metadata.gz: 6e145baf40a7c85a8b744fe0473673c9107f2286
+  data.tar.gz: 121f225d8c3c3fb584c3b0531571a6afa1cb89c5
 SHA512:
-  metadata.gz: 2b456701c7e7d5868ffe856f5b3330a551d357e52b63e902b40f903dcdf64f0fdcbba8c0a5a0c62695164ff050dbb5cb8f32c4873d3340e8caf7dfba1ed7ae8f
-  data.tar.gz: 6186198dc546f16abea449e60e384e941be21339174c655b467e7e9df609062a1376296f5be7610c74b058e354151caf0a9e70767d75d0974d7ebd8299edbf3c
+  metadata.gz: 8f08fe3139630d3d2dbe76a82123de4c2eec51df9457ffbb44af0b86005f47a6a9a62523e5b8510edc4be39c6ec93e98af0cf1f01c0461496a44153a42e1ff88
+  data.tar.gz: a13524dd57c47525ec1bddd5dfad2dd2e0a5045e87182b07f239930f493a093d26578a21e021bc486ce8f50f467c04efb324bece87213746e2c3103aadb2f872

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

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
 

data/lib/mdb/database.rb

@@ -30,21 +30,16 @@ module Mdb
 
     def columns(table)
       open_csv(table) do |csv|
-        line = csv.readline
-        unless line || tables.member?(table.to_s)
-          raise TableDoesNotExistError, "#{table.inspect} does not exist in #{file_name.inspect}"
-        end
-
-        (line || []).map(&:to_sym)
+        (csv.readline || []).map(&:to_sym)
       end
     end
 
 
 
-    def read_csv(table)
-      csv = execute "mdb-export -D '%F %T' -d \\| #{file_name} #{Shellwords.escape(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)
+      execute "mdb-export -D '%F %T' -d #{Shellwords.escape(delimiter)} #{file_name} #{Shellwords.escape(table)}", &block
     end
 
 
@@ -89,21 +84,11 @@ module Mdb
         end
       end
 
-      empty_table!(table) if count == 0
-
       count
     end
 
 
 
-    def empty_table!(table)
-      raise MdbToolsNotInstalledError unless system("which mdb-export")
-      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
@@ -111,8 +96,7 @@ module Mdb
 
 
     def open_csv(table)
-      command = "mdb-export -D '%F %T' -d #{Shellwords.escape(delimiter)} #{file_name} #{Shellwords.escape(table)}"
-      execute(command) do |file|
+      read_csv(table) do |file|
         yield CSV.new(file, col_sep: delimiter)
       end
     end
@@ -121,7 +105,10 @@ module Mdb
 
     def execute(command)
       file = Tempfile.new("mdb")
-      system "#{command} > #{file.path} 2> /dev/null"
+      unless system "#{command} > #{file.path} 2> /dev/null"
+        raise MdbToolsNotInstalledError if $?.exitstatus == 127
+        raise Error, "#{command[/^\S+/]} exited with status #{$?.exitstatus}"
+      end
       return file.read unless block_given?
       yield file
     ensure

data/lib/mdb/version.rb

@@ -1,3 +1,3 @@
 module Mdb
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/mdb.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rails", ">= 3.2.0", "< 4.1.0"
+  spec.add_development_dependency "shoulda-context"
   spec.add_development_dependency "turn"
   spec.add_development_dependency "pry"
 end

data/test/database_test.rb

@@ -41,6 +41,23 @@ class MdbTest < ActiveSupport::TestCase
     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

data/test/test_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.1.0
+- !ruby/object:Gem::Dependency
+  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: turn
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -105,6 +120,7 @@ files:
 - mdb.gemspec
 - test/data/Example2000.mdb
 - test/data/Example2003.mdb
+- test/data/Protected.mdb
 - test/database_test.rb
 - test/test_helper.rb
 homepage: ''
@@ -127,12 +143,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 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