mdb 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743fac27121ba7755e9bd504da03a4dd5067c5ee
-  data.tar.gz: 6132d6430e369e4252bc398095b66a30ec5e1f2d
+  metadata.gz: 55c6c7c1cdcb9921dfebf67418cd17e2fdac1bb1
+  data.tar.gz: ddc03a93b64636f6db253f639e49030429864c11
 SHA512:
-  metadata.gz: ace168b10d293ad77f5527730ade2d549f4869ebfc73baafcb6220d4d4f42f8257575e601202df3204dbcf11be335e91204e6fc7eb09b8af10b3ba2f523fa679
-  data.tar.gz: 39a9b268a36d122bc14005a64ee5448e8e43f076699b1b3e79bf1da538781e8f74a7d8deb5f6cfdabaee908db9b830ab02ff94c7d629ff7a9cecfd70536eddde
+  metadata.gz: 2b456701c7e7d5868ffe856f5b3330a551d357e52b63e902b40f903dcdf64f0fdcbba8c0a5a0c62695164ff050dbb5cb8f32c4873d3340e8caf7dfba1ed7ae8f
+  data.tar.gz: 6186198dc546f16abea449e60e384e941be21339174c655b467e7e9df609062a1376296f5be7610c74b058e354151caf0a9e70767d75d0974d7ebd8299edbf3c

data/README.md

@@ -31,6 +31,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.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/lib/mdb/database.rb

@@ -1,48 +1,54 @@
-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|
+        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)
+      end
     end
-    
-    
-    
+
+
+
     def read_csv(table)
-      csv = execute "mdb-export -D '%F %T' -d \\| #{file_name} #{table}"
+      csv = execute "mdb-export -D '%F %T' -d \\| #{file_name} #{Shellwords.escape(table)}"
       empty_table!(table) if csv.empty?
       csv
     end
-    
-    
-    
+
+
+
     # Yields a hash for each record
     def each_record(table, &block)
       columns = nil
@@ -55,9 +61,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 +72,64 @@ 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 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
-    
-    
-    
+
+
+
     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)
+      command = "mdb-export -D '%F %T' -d #{Shellwords.escape(delimiter)} #{file_name} #{Shellwords.escape(table)}"
+      execute(command) 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")
-      end
-      
-      stdout
+      file = Tempfile.new("mdb")
+      system "#{command} > #{file.path} 2> /dev/null"
+      return file.read unless block_given?
+      yield file
+    ensure
+      file.close
+      file.unlink
     end
-    
-    
-    
+
+
+
   end
 end

data/lib/mdb/version.rb

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

data/mdb.gemspec

@@ -20,7 +20,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"
+  spec.add_development_dependency "rails", ">= 3.2.0", "< 4.1.0"
   spec.add_development_dependency "turn"
   spec.add_development_dependency "pry"
 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,57 @@ class MdbTest < ActiveSupport::TestCase
       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 +100,5 @@ private
       ENV.replace(old_env)
     end
   end
-  
+
 end

metadata

@@ -1,83 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: mdb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Robert Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2016-04-05 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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: turn
   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'
 description: A library for reading Microsoft Access databases
@@ -87,8 +93,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -111,17 +117,17 @@ 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
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Wraps mdb-tools for reading and Microsoft Access databases (MDB)