csv_query 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - rbx-19mode

data/Gemfile

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

data/README.md

@@ -11,6 +11,8 @@ For example:
     --------
            1
 
+[![Build Status](https://secure.travis-ci.org/koppen/csv_query.png?branch=master)](https://travis-ci.org/koppen/csv_query)
+
 Assumptions
 -----------
 

data/Rakefile

@@ -1,2 +1,9 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+end
+
+task :default => :test

data/lib/csv_query/command_line.rb

@@ -1,3 +1,4 @@
+require 'csv_query/outputter'
 require 'csv_query/query'
 
 module CsvQuery
@@ -5,10 +6,6 @@ module CsvQuery
     def self.parse_options_from_commandline
       options = {}
 
-      # Set defaults
-      options[:delimiter] = ','
-      options[:select] = '*'
-
       OptionParser.new do |opts|
         opts.banner = "Usage: csvq [options] [CSV file]"
         opts.separator ""
@@ -16,7 +13,7 @@ module CsvQuery
         opts.on(
           "-d",
           "--delimiter DELIMITER",
-          "Sets the DELIMITER used between fields in the CSV data. Default: #{options[:delimiter].inspect}"
+          "Sets the DELIMITER used between fields in the CSV data. Default: #{Query::DEFAULT_OPTIONS[:delimiter].inspect}"
         ) do |d|
           options[:delimiter] = d
         end
@@ -37,7 +34,7 @@ module CsvQuery
         opts.on(
           "-s",
           "--select SQL",
-          "The SQL statement to select what fields to return. Unused if --query is given. Default: #{options[:select].inspect}."
+          "The SQL statement to select what fields to return. Unused if --query is given. Default: #{Query::DEFAULT_OPTIONS[:select].inspect}."
         ) do |s|
           options[:select] = s
         end
@@ -59,9 +56,10 @@ module CsvQuery
     end
 
     def self.run
+      csv_data = ARGF.read
+      outputter = CsvQuery::Outputter
       options = parse_options_from_commandline
-
-      CsvQuery::Query.new(ARGF.read, options).run
+      CsvQuery::Query.new(csv_data, outputter, options).run
     end
   end
 end

data/lib/csv_query/outputter.rb

@@ -0,0 +1,55 @@
+module CsvQuery
+  class Outputter
+    attr_reader :results
+
+    def self.output(results)
+      new(results).output
+    end
+
+    def initialize(results)
+      @results = results
+    end
+
+    def output
+      results.each_with_index do |result, index|
+        puts format_string % result
+        if index == 0
+          puts separator_line
+        end
+      end
+    end
+
+    private
+
+    def column_widths
+      return @column_widths if @column_widths
+      num_columns = if results.first
+        results.first.size
+      else
+        0
+      end
+
+      column_widths = [0] * num_columns
+      results.collect { |row|
+        row.each_with_index do |column, index|
+          width = column.size
+          column_widths[index] = width if width > column_widths[index]
+        end
+      }
+      return column_widths
+    end
+
+    def format_string
+      return @format_string if @format_string
+
+      format_strings = column_widths.collect { |width|
+        "%#{width}s"
+      }
+      @format_string = format_strings.join(" | ")
+    end
+
+    def separator_line
+      column_widths.collect { |width| '-' * width }.join('-+-')
+    end
+  end
+end

data/lib/csv_query/query.rb

@@ -6,9 +6,15 @@ module CsvQuery
   class Query
     attr_reader :csv_data, :options
 
-    def initialize(csv_data, options)
+    DEFAULT_OPTIONS = {
+      :delimiter => ',',
+      :select => '*'
+    }
+
+    def initialize(csv_data, outputter, options = {})
       @csv_data = csv_data
-      @options = options
+      @outputter = outputter
+      @options = options.merge(DEFAULT_OPTIONS)
     end
 
     def run
@@ -72,30 +78,7 @@ module CsvQuery
     end
 
     def output_results_table(results)
-      num_columns = if results.first
-        results.first.size
-      else
-        0
-      end
-      column_widths = [0] * num_columns
-      results.collect { |row|
-        row.each_with_index do |column, index|
-          width = column.size
-          column_widths[index] = width if width > column_widths[index]
-        end
-      }
-      format_strings = column_widths.collect { |width|
-        "%#{width}s"
-      }
-      format_string = format_strings.join(" | ")
-
-      results.each_with_index do |result, index|
-        puts format_string % result
-        if index == 0
-          # Seperate headers and results
-          puts column_widths.collect { |width| '-' * width }.join('-+-')
-        end
-      end
+      @outputter.output(results)
     end
 
     def parse_csv_data
@@ -104,7 +87,7 @@ module CsvQuery
         :col_sep => options[:delimiter]
       }
 
-      csv = CSV.parse(csv_data, csv_options)
+      CSV.parse(csv_data, csv_options)
     end
 
     def run_query

data/lib/csv_query/version.rb

@@ -1,3 +1,3 @@
 module CsvQuery
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/csv_query/outputter_test.rb

@@ -0,0 +1,74 @@
+require_relative '../test_helper'
+
+require 'csv_query/outputter'
+
+describe CsvQuery::Outputter do
+  describe "creating a new instance" do
+    it "stores results for later access" do
+      results = [["Foo"]]
+      CsvQuery::Outputter.new(results).results.must_equal([["Foo"]])
+    end
+  end
+
+  describe ".output" do
+    it "outputs results to STDOUT" do
+      output = capture_stdout do
+        CsvQuery::Outputter.output([['Foo']])
+      end
+      output.must_equal("Foo\n---\n")
+    end
+  end
+
+  describe "#output" do
+    it "outputs results to STDOUT" do
+      results = [
+        ["Foo", "Bar"],
+        ["Baz", "Qux"]
+      ]
+
+      output = capture_stdout do
+        CsvQuery::Outputter.output(results)
+      end
+
+      output.must_equal <<EOS
+Foo | Bar
+----+----
+Baz | Qux
+EOS
+    end
+
+    it "adapts column widths to result widths" do
+      results = [
+        ["A", "B", "Somewhat long header"],
+        ["1", "Somewhat long result", "3"]
+      ]
+
+      output = capture_stdout do
+        CsvQuery::Outputter.output(results)
+      end
+
+      output.must_equal <<EOS
+A |                    B | Somewhat long header
+--+----------------------+---------------------
+1 | Somewhat long result |                    3
+EOS
+    end
+
+    it "works with numeric results" do
+      results = [
+        ["Animal", "COUNT(*)"],
+        ["Monkeys", 12]
+      ]
+
+      output = capture_stdout do
+        CsvQuery::Outputter.output(results)
+      end
+
+      output.must_equal <<EOS
+ Animal | COUNT(*)
+--------+---------
+Monkeys |       12
+EOS
+    end
+  end
+end

data/test/csv_query/query_test.rb

@@ -0,0 +1,41 @@
+require_relative '../test_helper'
+
+require 'csv_query/query'
+require 'csv_query/outputter'
+
+describe CsvQuery::Query do
+
+  describe "creating a new instance" do
+    it "stores CSV data for later use" do
+      query = CsvQuery::Query.new('foo', CsvQuery::Outputter, {:bar => 'baz'})
+      query.csv_data.must_equal('foo')
+    end
+
+    it "merges options with default options" do
+      query = CsvQuery::Query.new('foo', CsvQuery::Outputter, {:bar => 'baz'})
+      query.options[:delimiter].must_equal(',')
+      query.options[:select].must_equal('*')
+    end
+
+    it "preserves extra options" do
+      query = CsvQuery::Query.new('foo', CsvQuery::Outputter, {:bar => 'baz'})
+      query.options[:bar].must_equal('baz')
+    end
+  end
+
+  describe "#run" do
+    it "outputs results" do
+      csv_data = "Foo\nBar"
+      results = [["Foo"], ["Bar"]]
+
+      outputter = MiniTest::Mock.new
+      outputter.expect(:output, '', [results])
+
+      query = CsvQuery::Query.new(csv_data, outputter)
+      query.run
+
+      outputter.verify
+    end
+  end
+
+end

data/test/fixtures/simple.csv

@@ -0,0 +1,2 @@
+Name,Age,Gender
+Jakob,36,Male

data/test/test_helper.rb

@@ -0,0 +1,14 @@
+require 'minitest/autorun'
+require 'stringio'
+
+# Require files from the project lib-directory
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+def capture_stdout
+  existing_stream = $stdout
+  $stdout = StringIO.new
+  yield
+  output = $stdout.string
+  $stdout = existing_stream
+  return output
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_query
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -36,6 +36,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -44,8 +45,13 @@ files:
 - csv_query.gemspec
 - lib/csv_query.rb
 - lib/csv_query/command_line.rb
+- lib/csv_query/outputter.rb
 - lib/csv_query/query.rb
 - lib/csv_query/version.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: []
 post_install_message: 
@@ -64,10 +70,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 174621903631973785
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Use SQL to query CSV data
-test_files: []
+test_files:
+- test/csv_query/outputter_test.rb
+- test/csv_query/query_test.rb
+- test/fixtures/simple.csv
+- test/test_helper.rb