csv_query 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8cc10e4acf7a8a4c739e8c9c8aa3ad9f652567e6
+  data.tar.gz: 78abb583938228f9c3f69f8f9c35c08f31b607cb
+SHA512:
+  metadata.gz: 85ef2a10afd195da6f9a2164d46ea45d6af53d5c5ced3f5f425e24cbea4f0879e4027513918b4a279c500532d1cadd6efc881c39fb7119633cc895d025a1e1e4
+  data.tar.gz: e950e74458b94be36b289465136a804c44e95b775a9cff04ec26805d2e68266ac4e658da703375797dcb4ac5dbe60956e4210920f1ae5380ae2306d44716da67

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
+  - 2.2.0
+  - 2.1.5
+  - 2.0.0
   - 1.9.3
-  - rbx-19mode

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Change log
+
+## [1.0.4] - 2015-01-10
+
+### Fixed
+
+- Actually take user supplied options like `delimiter` and `select` into account instead of always overriding them with the defaults.
+
+[1.0.4]: https://github.com/koppen/csv_query/compare/v1.0.3...v1.0.4

data/Gemfile

@@ -3,4 +3,5 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in csv_query.gemspec
 gemspec
 
+gem "minitest"
 gem "rake"

data/lib/csv_query/database.rb

@@ -0,0 +1,37 @@
+require 'sqlite3'
+
+module CsvQuery
+  # Wraps a SQLite in-memory database with a single table named csv.
+  class Database
+    attr_reader :database
+
+    def initialize(csv)
+      @database = SQLite3::Database.new(':memory:')
+      @columns = csv.headers
+      create_table(@columns)
+    end
+
+    def import_data_from_csv(csv)
+      columns = csv.headers
+
+      sql = "INSERT INTO csv VALUES (#{(['?'] * columns.size).join(',')})"
+      statement = database.prepare(sql)
+
+      csv.each do |row|
+        statement.execute(row.fields)
+      end
+    end
+
+    # Returns the results of sql. First row of the resultset contains the column names
+    def query(sql)
+      database.execute2(sql)
+    end
+
+    private
+
+    def create_table(column_names)
+      column_definitions = column_names.collect { |name| "\"#{name}\" VARCHAR(255)" }
+      database.execute "CREATE TABLE csv (#{column_definitions.join(", ")})"
+    end
+  end
+end

data/lib/csv_query/query.rb

@@ -2,6 +2,8 @@ require 'csv'
 require 'optparse'
 require 'sqlite3'
 
+require 'csv_query/database'
+
 module CsvQuery
   class Query
     attr_reader :csv_data, :options
@@ -14,7 +16,7 @@ module CsvQuery
     def initialize(csv_data, outputter, options = {})
       @csv_data = csv_data
       @outputter = outputter
-      @options = options.merge(DEFAULT_OPTIONS)
+      @options = DEFAULT_OPTIONS.merge(options)
     end
 
     def run
@@ -41,18 +43,9 @@ module CsvQuery
       ].join(" ")
     end
 
-    def create_database_and_table(csv)
-      database = SQLite3::Database.new(':memory:')
-
-      column_definitions = csv.headers.collect { |name| "\"#{name}\" VARCHAR(255)" }
-      database.execute "CREATE TABLE csv (#{column_definitions.join(", ")})"
-
-      database
-    end
-
     def create_database_with_data_from_csv
-      database = create_database_and_table(csv)
-      import_csv_into_database(csv, database)
+      database = CsvQuery::Database.new(csv)
+      database.import_data_from_csv(csv)
       database
     end
 
@@ -68,15 +61,6 @@ module CsvQuery
       options[:headers] || :first_row
     end
 
-    def import_csv_into_database(csv, database)
-      sql = "INSERT INTO csv VALUES (#{(['?'] * csv.headers.size).join(',')})"
-      statement = database.prepare(sql)
-
-      csv.each do |row|
-        statement.execute(row.fields)
-      end
-    end
-
     def output_results_table(results)
       @outputter.output(results)
     end
@@ -91,7 +75,7 @@ module CsvQuery
     end
 
     def run_query
-      database.execute2(sql_query)
+      database.query(sql_query)
     end
 
     def sql_query

data/lib/csv_query/version.rb

@@ -1,3 +1,3 @@
 module CsvQuery
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/csv_query/database_test.rb

@@ -0,0 +1,48 @@
+require_relative '../test_helper'
+
+require 'csv_query/database'
+
+describe CsvQuery::Database do
+
+  def csv_data
+    @csv_data ||= CSV.parse("Bar", :headers => ["Foo"])
+  end
+
+  def build_database
+    CsvQuery::Database.new(csv_data)
+  end
+
+  describe ".new" do
+    it "creates SQLite database" do
+      database = build_database
+      database.database.class.must_equal(SQLite3::Database)
+    end
+
+    it "creates a database table" do
+      database = build_database
+
+      columns = database.database.table_info("csv")
+      columns.collect { |column| column["name"] }.must_equal(["Foo"])
+    end
+  end
+
+  describe "#import_csv" do
+    it "imports data from csv" do
+      database = build_database
+      database.import_data_from_csv(csv_data)
+
+      results = database.database.query("SELECT * FROM csv")
+      results.to_a.must_equal([["Bar"]])
+    end
+  end
+
+  describe "#query" do
+    it "returns headers and results as arrays" do
+      database = build_database
+      database.import_data_from_csv(csv_data)
+
+      results = database.query("SELECT * FROM csv")
+      results.to_a.must_equal([["Foo"], ["Bar"]])
+    end
+  end
+end

data/test/csv_query/query_test.rb

@@ -11,12 +11,18 @@ describe CsvQuery::Query do
       query.csv_data.must_equal('foo')
     end
 
-    it "merges options with default options" do
+    it "uses default options" do
       query = CsvQuery::Query.new('foo', CsvQuery::Outputter, {:bar => 'baz'})
       query.options[:delimiter].must_equal(',')
       query.options[:select].must_equal('*')
     end
 
+    it "merges options with default options" do
+      query = CsvQuery::Query.new('foo', CsvQuery::Outputter, {:delimiter => ";", :select => "stuff"})
+      query.options[:delimiter].must_equal(";")
+      query.options[:select].must_equal("stuff")
+    end
+
     it "preserves extra options" do
       query = CsvQuery::Query.new('foo', CsvQuery::Outputter, {:bar => 'baz'})
       query.options[:bar].must_equal('baz')

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: csv_query
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Jakob Skjerning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: CSV Query allows you to run SQL queries against data stored in CSV files.
@@ -35,8 +32,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -45,41 +43,40 @@ files:
 - csv_query.gemspec
 - lib/csv_query.rb
 - lib/csv_query/command_line.rb
+- lib/csv_query/database.rb
 - lib/csv_query/outputter.rb
 - lib/csv_query/query.rb
 - lib/csv_query/version.rb
+- test/csv_query/database_test.rb
 - test/csv_query/outputter_test.rb
 - test/csv_query/query_test.rb
 - test/fixtures/simple.csv
 - test/test_helper.rb
 homepage: http://mentalized.net
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4047582568054347755
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use SQL to query CSV data
 test_files:
+- test/csv_query/database_test.rb
 - test/csv_query/outputter_test.rb
 - test/csv_query/query_test.rb
 - test/fixtures/simple.csv