riddle 1.5.9 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 510b7c51b1422b3fee8d37bb3e569b218c3fafba
-  metadata.gz: 892c35de7bb285404d93abb4fc52e3c4356fa5ad
+  metadata.gz: 578f59b9c3e4a970c9ae4ec47b013ddfd711d41d
+  data.tar.gz: ebc01eb587ca1383302ea8d12731dfc86376de61
 SHA512: 
-  data.tar.gz: da219c1e7647d916b1719ea4b422072b4e16626227c29dd1df51aac11d5a329b5fc6101adc2f753a84c0395f92beb90b2cfb01be4dd605d9e27ee891f3bbc745
-  metadata.gz: abfd8ca976c29a26220402525827e623803356e67c3f11247b09473bc6c5b38e51104a3093eade7478c15a2d747c793f5d99a41eeaf3ba06a5de2de0a76c5c74
+  metadata.gz: a834cb93a23175cd949ead321b44e492e051c1c306b60959581a5db38dfccd0986a8b2b24a9578f908559123cfae7a242d6867213730f39d14ad4234c966c95a
+  data.tar.gz: e3a2e3abbb56f56bcbf8ed4e3086df21e4b903c98abb1dadc186ea939dfb0ab63c6dff5b25c3917a06b9398b304d360f56ee7c9f4b3f1898ea33b8fd1c8e9e4a

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
 before_install:
+  - sudo apt-get install postgresql-server-dev-9.1 libmysql++-dev -y
   - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-1.10_x86_64_12.04.deb
   - sudo dpkg -i fs-sphinx-1.10_x86_64_12.04.deb
-  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-2.0.4_x86_64_12.04.deb
-  - sudo dpkg -i fs-sphinx-2.0.4_x86_64_12.04.deb
-  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-2.0.6_x86_64_12.04.deb
-  - sudo dpkg -i fs-sphinx-2.0.6_x86_64_12.04.deb
+  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-2.0.9_x86_64_12.04.deb
+  - sudo dpkg -i fs-sphinx-2.0.9_x86_64_12.04.deb
+  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-2.1.4_x86_64_12.04.deb
+  - sudo dpkg -i fs-sphinx-2.1.4_x86_64_12.04.deb
 rvm:
   - 1.8.7
   - 1.9.2
@@ -13,7 +14,7 @@ rvm:
   - jruby-18mode
 env:
   - SPHINX_BIN=/usr/local/sphinx-1.10/bin SPHINX_VERSION=1.10
-  - SPHINX_BIN=/usr/local/sphinx-2.0.4/bin SPHINX_VERSION=2.0.4
-  - SPHINX_BIN=/usr/local/sphinx-2.0.6/bin SPHINX_VERSION=2.0.6
+  - SPHINX_BIN=/usr/local/sphinx-2.0.9/bin SPHINX_VERSION=2.0.9
+  - SPHINX_BIN=/usr/local/sphinx-2.1.4/bin SPHINX_VERSION=2.1.4
 before_script: killall searchd; echo ''
 after_script:  killall searchd; echo ''

data/HISTORY

@@ -1,3 +1,16 @@
+1.5.10 - January 11th 2014
+- SELECT values can be prepended as well as the existing append support.
+- New settings for Sphinx 2.2.1.
+- Template index type for Sphinx 2.2.1.
+- TSV source types for Sphinx 2.2.1.
+- Support for HAVING, GROUP-n-BEST in SELECT statements.
+- Dates in filters are converted to (UTC) timestamp integers.
+- Default to * in SELECT queries only if nothing else is supplied.
+- Fix licence, URL in gemspec (Ken Dreyer).
+- Handle empty arrays for filter elegantly (Bryan Ricker).
+- Add a contributing section to the README (Ken Dreyer).
+- Don't automatically escape function references in SphinxQL ORDER clauses.
+
 1.5.9 - October 20th 2013
 - Adding all known Sphinx settings to configuration classes as of Sphinx 2.1.2, including JSON settings.
 - Convert date objects in INSERT/REPLACE queries to timestamps, just like time objects.

data/README.textile

@@ -55,6 +55,12 @@ total number of matches (which may be greater than the maximum available), and t
 
 If you've installed the gem and wondering why there's no tests - check out the git version. I've kept the specs out of the gem as I have a decent amount of test data in there, which really isn't needed unless you want to submit patches.
 
+h2. Contributing
+
+Riddle uses the "git-flow":http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/ process for development. The "master" branch is the latest released code (in a gem). The "develop" branch is what's coming in the next release. (There may be occasional feature and hotfix branches, although these are generally not pushed to GitHub.)
+
+When submitting a patch to riddle, please submit your pull request against the "develop" branch.
+
 h2. Contributors
 
 Thanks to the following people who have contributed to Riddle in some shape or form:

data/lib/riddle/configuration.rb

@@ -9,6 +9,8 @@ require 'riddle/configuration/remote_index'
 require 'riddle/configuration/searchd'
 require 'riddle/configuration/source'
 require 'riddle/configuration/sql_source'
+require 'riddle/configuration/template_index'
+require 'riddle/configuration/tsv_source'
 require 'riddle/configuration/xml_source'
 
 require 'riddle/configuration/parser'

data/lib/riddle/configuration/index_settings.rb

@@ -15,7 +15,8 @@ module Riddle
           :inplace_reloc_factor, :inplace_write_factor, :index_exact_words,
           :overshort_step, :stopwords_step, :hitless_words, :ha_strategy,
           :bigram_freq_words, :bigram_index, :index_field_lengths,
-          :regexp_filter, :stopwords_unstemmed, :global_idf
+          :regexp_filter, :stopwords_unstemmed, :global_idf, :rlp_context,
+          :ondisk_attrs
         ]
       end
 
@@ -32,7 +33,7 @@ module Riddle
         :inplace_write_factor, :index_exact_words, :overshort_step,
         :stopwords_step, :hitless_words, :ha_strategy, :bigram_freq_words,
         :bigram_index, :index_field_lengths, :regexp_filter,
-        :stopwords_unstemmed, :global_idf
+        :stopwords_unstemmed, :global_idf, :rlp_context, :ondisk_attrs
 
       def initialize_settings
         @morphologies             = []

data/lib/riddle/configuration/indexer.rb

@@ -6,7 +6,8 @@ module Riddle
           :mem_limit, :max_iops, :max_iosize, :max_xmlpipe2_field,
           :write_buffer, :max_file_field_buffer, :on_file_field_error,
           :lemmatizer_base, :lemmatizer_cache, :json_autoconv_numbers,
-          :on_json_attr_error
+          :on_json_attr_error, :rlp_root, :rlp_environment,
+          :rlp_max_batch_size, :rlp_max_batch_docs
         ]
       end
 

data/lib/riddle/configuration/parser.rb

@@ -8,13 +8,15 @@ class Riddle::Configuration::Parser
     'mssql'    => Riddle::Configuration::SQLSource,
     'xmlpipe'  => Riddle::Configuration::XMLSource,
     'xmlpipe2' => Riddle::Configuration::XMLSource,
-    'odbc'     => Riddle::Configuration::SQLSource
+    'odbc'     => Riddle::Configuration::SQLSource,
+    'tsvpipe'  => Riddle::Configuration::TSVSource
   }
 
   INDEX_CLASSES = {
     'plain'       => Riddle::Configuration::Index,
     'distributed' => Riddle::Configuration::DistributedIndex,
-    'rt'          => Riddle::Configuration::RealtimeIndex
+    'rt'          => Riddle::Configuration::RealtimeIndex,
+    'template'    => Riddle::Configuration::TemplateIndex
   }
 
   def initialize(input)

data/lib/riddle/configuration/searchd.rb

@@ -17,7 +17,8 @@ module Riddle
           :compat_sphinxql_magics, :watchdog, :prefork_rotation_throttle,
           :sphinxql_state, :ha_ping_interval, :ha_period_karma,
           :persistent_connections_limit, :rt_merge_iops, :rt_merge_maxiosize,
-          :predicted_time_costs, :snippets_file_prefix, :client_key
+          :predicted_time_costs, :snippets_file_prefix, :shutdown_timeout,
+          :ondisk_attrs_default, :client_key
         ]
       end
 

data/lib/riddle/configuration/template_index.rb

@@ -0,0 +1,36 @@
+module Riddle
+  class Configuration
+    class TemplateIndex < Riddle::Configuration::Section
+      include Riddle::Configuration::IndexSettings
+
+      def self.settings
+        Riddle::Configuration::IndexSettings.settings
+      end
+
+      attr_accessor :parent
+
+      def initialize(name)
+        @name = name
+        @type = 'template'
+
+        initialize_settings
+      end
+
+      def render
+        raise ConfigurationError, "#{@name} #{@parent}" unless valid?
+
+        inherited_name = "#{name}"
+        inherited_name << " : #{parent}" if parent
+        (
+          ["index #{inherited_name}", "{"] +
+          settings_body +
+          ["}", ""]
+        ).join("\n")
+      end
+
+      def valid?
+        @name
+      end
+    end
+  end
+end

data/lib/riddle/configuration/tsv_source.rb

@@ -0,0 +1,19 @@
+module Riddle
+  class Configuration
+    class TSVSource < Riddle::Configuration::Source
+      def self.settings
+        [:type, :tsvpipe_command, :tsvpipe_attr_field, :tsvpipe_attr_multi]
+      end
+
+      attr_accessor *self.settings
+
+      def initialize(name, type = 'tsvpipe')
+        @name, @type = name, type
+      end
+
+      def valid?
+        super && (@tsvpipe_command || @parent)
+      end
+    end
+  end
+end

data/lib/riddle/query/select.rb

@@ -1,6 +1,6 @@
 class Riddle::Query::Select
   def initialize
-    @values                = ['*']
+    @values                = []
     @indices               = []
     @matching              = nil
     @wheres                = {}
@@ -8,6 +8,8 @@ class Riddle::Query::Select
     @where_nots            = {}
     @where_not_alls        = {}
     @group_by              = nil
+    @group_best            = nil
+    @having                = []
     @order_by              = nil
     @order_within_group_by = nil
     @offset                = nil
@@ -20,6 +22,11 @@ class Riddle::Query::Select
     self
   end
 
+  def prepend_values(*values)
+    @values.insert 0, *values
+    self
+  end
+
   def from(*indices)
     @indices += indices
     self
@@ -55,6 +62,16 @@ class Riddle::Query::Select
     self
   end
 
+  def group_best(count)
+    @group_best = count
+    self
+  end
+
+  def having(*conditions)
+    @having += conditions
+    self
+  end
+
   def order_by(order)
     @order_by = order
     self
@@ -81,13 +98,14 @@ class Riddle::Query::Select
   end
 
   def to_sql
-    sql = "SELECT #{ @values.join(', ') } FROM #{ @indices.join(', ') }"
+    sql = "SELECT #{ extended_values } FROM #{ @indices.join(', ') }"
     sql << " WHERE #{ combined_wheres }" if wheres?
-    sql << " GROUP BY #{escape_column(@group_by)}"      if !@group_by.nil?
+    sql << " #{group_prefix} #{escape_column(@group_by)}" if !@group_by.nil?
     unless @order_within_group_by.nil?
-      sql << " WITHIN GROUP ORDER BY #{escape_column(@order_within_group_by)}"
+      sql << " WITHIN GROUP ORDER BY #{escape_columns(@order_within_group_by)}"
     end
-    sql << " ORDER BY #{escape_column(@order_by)}"      if !@order_by.nil?
+    sql << " HAVING #{@having.join(' AND ')}" unless @having.empty?
+    sql << " ORDER BY #{escape_columns(@order_by)}" if !@order_by.nil?
     sql << " #{limit_clause}"   unless @limit.nil? && @offset.nil?
     sql << " #{options_clause}" unless @options.empty?
 
@@ -96,17 +114,27 @@ class Riddle::Query::Select
 
   private
 
+  def extended_values
+    @values.empty? ? '*' : @values.join(', ')
+  end
+
+  def group_prefix
+    ['GROUP', @group_best, 'BY'].compact.join(' ')
+  end
+
   def wheres?
     !(@wheres.empty? && @where_alls.empty? && @where_nots.empty? && @where_not_alls.empty? && @matching.nil?)
   end
 
   def combined_wheres
+    wheres = wheres_to_s
+
     if @matching.nil?
-      wheres_to_s
-    elsif @wheres.empty? && @where_nots.empty? && @where_alls.empty? && @where_not_alls.empty?
+      wheres
+    elsif wheres.empty?
       "MATCH(#{Riddle::Query.quote @matching})"
     else
-      "MATCH(#{Riddle::Query.quote @matching}) AND #{wheres_to_s}"
+      "MATCH(#{Riddle::Query.quote @matching}) AND #{wheres}"
     end
   end
 
@@ -128,13 +156,15 @@ class Riddle::Query::Select
           exclusive_filter_comparison_and_value key, value
         }.join(' OR ') + ')'
       }
-    ).flatten.join(' AND ')
+    ).flatten.compact.join(' AND ')
   end
 
   def filter_comparison_and_value(attribute, value)
     case value
     when Array
-      "#{escape_column(attribute)} IN (#{value.collect { |val| filter_value(val) }.join(', ')})"
+      if !value.flatten.empty?
+        "#{escape_column(attribute)} IN (#{value.collect { |val| filter_value(val) }.join(', ')})"
+      end
     when Range
       "#{escape_column(attribute)} BETWEEN #{filter_value(value.first)} AND #{filter_value(value.last)}"
     else
@@ -145,7 +175,9 @@ class Riddle::Query::Select
   def exclusive_filter_comparison_and_value(attribute, value)
     case value
     when Array
-      "#{escape_column(attribute)} NOT IN (#{value.collect { |val| filter_value(val) }.join(', ')})"
+      if !value.flatten.empty?
+        "#{escape_column(attribute)} NOT IN (#{value.collect { |val| filter_value(val) }.join(', ')})"
+      end
     when Range
       "#{escape_column(attribute)} < #{filter_value(value.first)} OR #{attribute} > #{filter_value(value.last)}"
     else
@@ -161,6 +193,8 @@ class Riddle::Query::Select
       0
     when Time
       value.to_i
+    when Date
+      Time.utc(value.year, value.month, value.day).to_i
     else
       value
     end
@@ -190,11 +224,17 @@ class Riddle::Query::Select
   end
 
   def escape_column(column)
-    if column.to_s =~ /\A[`@]/
+    if column.to_s[/\A[`@]/] || column.to_s[/\A\w+\(/]
       column
     else
       column_name, *extra = column.to_s.split(' ')
       extra.unshift("`#{column_name}`").compact.join(' ')
     end
   end
+
+  def escape_columns(columns)
+    columns.to_s.split(/,\s*/).collect { |column|
+      escape_column(column)
+    }.join(', ')
+  end
 end

data/riddle.gemspec

@@ -3,13 +3,14 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'riddle'
-  s.version     = '1.5.9'
+  s.version     = '1.5.10'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
-  s.homepage    = 'http://pat.github.com/riddle/'
+  s.homepage    = 'http://pat.github.io/riddle/'
   s.summary     = %q{An API for Sphinx, written in and for Ruby.}
   s.description = %q{A Ruby API and configuration helper for the Sphinx search service.}
+  s.license     = 'MIT'
 
   s.rubyforge_project = 'riddle'
 

data/spec/riddle/query/select_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'date'
+require 'time'
 
 describe Riddle::Query::Select do
   let(:query) { Riddle::Query::Select.new }
@@ -19,14 +21,19 @@ describe Riddle::Query::Select do
 
   it "handles custom select values" do
     query.values('@weight').from('foo_core').to_sql.
-      should == 'SELECT *, @weight FROM foo_core'
+      should == 'SELECT @weight FROM foo_core'
+  end
+
+  it "can prepend select values" do
+    query.values('@weight').prepend_values('foo').from('foo_core').to_sql.
+      should == 'SELECT foo, @weight FROM foo_core'
   end
 
   it 'handles basic queries with a search term' do
     query.from('foo_core').matching('foo').to_sql.
       should == "SELECT * FROM foo_core WHERE MATCH('foo')"
   end
-  
+
   it "escapes single quotes in the search terms" do
     query.from('foo_core').matching("fo'o").to_sql.
       should == "SELECT * FROM foo_core WHERE MATCH('fo\\'o')"
@@ -67,17 +74,33 @@ describe Riddle::Query::Select do
       should == "SELECT * FROM foo_core WHERE MATCH('foo') AND `bars` IN (1, 2)"
   end
 
+  it "ignores filters with empty arrays" do
+    query.from('foo_core').matching('foo').where(:bars => []).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo')"
+  end
+
   it "handles exclusive filters with arrays" do
     query.from('foo_core').matching('foo').where_not(:bars => [1, 2]).to_sql.
       should == "SELECT * FROM foo_core WHERE MATCH('foo') AND `bars` NOT IN (1, 2)"
   end
 
+  it "ignores exclusive filters with empty arrays" do
+    query.from('foo_core').matching('foo').where_not(:bars => []).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo')"
+  end
+
   it "handles filters with timestamps" do
     time = Time.now
     query.from('foo_core').matching('foo').where(:created_at => time).to_sql.
       should == "SELECT * FROM foo_core WHERE MATCH('foo') AND `created_at` = #{time.to_i}"
   end
 
+  it "handles filters with dates" do
+    date = Date.new 2014, 1, 1
+    query.from('foo_core').matching('foo').where(:created_at => date).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND `created_at` = #{Time.utc(2014, 1, 1).to_i}"
+  end
+
   it "handles exclusive filters with timestamps" do
     time = Time.now
     query.from('foo_core').matching('foo').where_not(:created_at => time).
@@ -94,6 +117,11 @@ describe Riddle::Query::Select do
       should == "SELECT * FROM foo_core WHERE `bars` = 1 AND `bars` = 2"
   end
 
+  it "handles filters expecting matches on all combinations of values" do
+    query.from('foo_core').where_all(:bars => [[1,2], 3]).to_sql.
+      should == "SELECT * FROM foo_core WHERE `bars` IN (1, 2) AND `bars` = 3"
+  end
+
   it "handles exclusive filters expecting matches on none of the values" do
     query.from('foo_core').where_not_all(:bars => [1, 2]).to_sql.
       should == "SELECT * FROM foo_core WHERE (`bars` <> 1 OR `bars` <> 2)"
@@ -104,6 +132,16 @@ describe Riddle::Query::Select do
       should == "SELECT * FROM foo_core GROUP BY `bar_id`"
   end
 
+  it "handles grouping n-best results" do
+    query.from('foo_core').group_by('bar_id').group_best(3).to_sql.
+      should == "SELECT * FROM foo_core GROUP 3 BY `bar_id`"
+  end
+
+  it 'handles having conditions' do
+    query.from('foo_core').group_by('bar_id').having('bar_id > 10').to_sql.
+      should == "SELECT * FROM foo_core GROUP BY `bar_id` HAVING bar_id > 10"
+  end
+
   it 'handles ordering' do
     query.from('foo_core').order_by('bar_id ASC').to_sql.
       should == 'SELECT * FROM foo_core ORDER BY `bar_id` ASC'
@@ -124,6 +162,11 @@ describe Riddle::Query::Select do
       should == 'SELECT * FROM foo_core ORDER BY @weight DESC'
   end
 
+  it "handles ordering when a sphinx function is passed in" do
+    query.from('foo_core').order_by('weight() DESC').to_sql.
+      should == 'SELECT * FROM foo_core ORDER BY weight() DESC'
+  end
+
   it 'handles group ordering' do
     query.from('foo_core').order_within_group_by('bar_id ASC').to_sql.
       should == 'SELECT * FROM foo_core WITHIN GROUP ORDER BY `bar_id` ASC'

data/spec/unit/configuration/template_index_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe Riddle::Configuration::TemplateIndex do
+  it "should be invalid without a name" do
+    index = Riddle::Configuration::TemplateIndex.new(nil)
+    index.should_not be_valid
+
+    index.name = "test1"
+    index.should be_valid
+  end
+
+  it "should raise a ConfigurationError if rendering when not valid" do
+    index = Riddle::Configuration::TemplateIndex.new(nil)
+    lambda {
+      index.render
+    }.should raise_error(Riddle::Configuration::ConfigurationError)
+  end
+
+  it "should render correctly if supplied settings are valid" do
+    index = Riddle::Configuration::TemplateIndex.new("test1")
+    index.docinfo                   = "extern"
+    index.mlock                     = 0
+    index.morphologies             << "stem_en" << "stem_ru" << "soundex"
+    index.min_stemming_len          = 1
+    index.stopword_files           << "/var/data/stopwords.txt" << "/var/data/stopwords2.txt"
+    index.wordform_files           << "/var/data/wordforms.txt"
+    index.exception_files          << "/var/data/exceptions.txt"
+    index.min_word_len              = 1
+    index.charset_type              = "utf-8"
+    index.charset_table             = "0..9, A..Z->a..z, _, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F"
+    index.ignore_characters        << "U+00AD"
+    index.min_prefix_len            = 0
+    index.min_infix_len             = 0
+    index.prefix_field_names       << "filename"
+    index.infix_field_names        << "url" << "domain"
+    index.enable_star               = true
+    index.ngram_len                 = 1
+    index.ngram_characters         << "U+3000..U+2FA1F"
+    index.phrase_boundaries        << "." << "?" << "!" << "U+2026"
+    index.phrase_boundary_step      = 100
+    index.html_strip                = 0
+    index.html_index_attrs          = "img=alt,title; a=title"
+    index.html_remove_element_tags << "style" << "script"
+    index.preopen                   = 1
+    index.ondisk_dict               = 1
+    index.inplace_enable            = 1
+    index.inplace_hit_gap           = 0
+    index.inplace_docinfo_gap       = 0
+    index.inplace_reloc_factor      = 0.1
+    index.inplace_write_factor      = 0.1
+    index.index_exact_words         = 1
+
+    index.render.should == <<-INDEX
+index test1
+{
+  type = template
+  docinfo = extern
+  mlock = 0
+  morphology = stem_en, stem_ru, soundex
+  min_stemming_len = 1
+  stopwords = /var/data/stopwords.txt /var/data/stopwords2.txt
+  wordforms = /var/data/wordforms.txt
+  exceptions = /var/data/exceptions.txt
+  min_word_len = 1
+  charset_type = utf-8
+  charset_table = 0..9, A..Z->a..z, _, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F
+  ignore_chars = U+00AD
+  min_prefix_len = 0
+  min_infix_len = 0
+  prefix_fields = filename
+  infix_fields = url, domain
+  enable_star = 1
+  ngram_len = 1
+  ngram_chars = U+3000..U+2FA1F
+  phrase_boundary = ., ?, !, U+2026
+  phrase_boundary_step = 100
+  html_strip = 0
+  html_index_attrs = img=alt,title; a=title
+  html_remove_elements = style, script
+  preopen = 1
+  ondisk_dict = 1
+  inplace_enable = 1
+  inplace_hit_gap = 0
+  inplace_docinfo_gap = 0
+  inplace_reloc_factor = 0.1
+  inplace_write_factor = 0.1
+  index_exact_words = 1
+}
+    INDEX
+  end
+end

data/spec/unit/configuration/tsv_source_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Riddle::Configuration::TSVSource do
+  it "should be invalid without an tsvpipe command, name and type if there's no parent" do
+    source = Riddle::Configuration::TSVSource.new("tsv1")
+    source.should_not be_valid
+
+    source.tsvpipe_command = "ls /var/null"
+    source.should be_valid
+
+    source.name = nil
+    source.should_not be_valid
+
+    source.name = "tsv1"
+    source.type = nil
+    source.should_not be_valid
+  end
+
+  it "should be invalid without only a name and type if there is a parent" do
+    source = Riddle::Configuration::TSVSource.new("tsv1")
+    source.should_not be_valid
+
+    source.parent = "tsvparent"
+    source.should be_valid
+
+    source.name = nil
+    source.should_not be_valid
+
+    source.name = "tsv1"
+    source.type = nil
+    source.should_not be_valid
+  end
+
+  it "should raise a ConfigurationError if rendering when not valid" do
+    source = Riddle::Configuration::TSVSource.new("tsv1")
+    lambda {
+      source.render
+    }.should raise_error(Riddle::Configuration::ConfigurationError)
+  end
+
+  it "should render correctly when valid" do
+    source = Riddle::Configuration::TSVSource.new("tsv1")
+    source.tsvpipe_command = "ls /var/null"
+
+    source.render.should == <<-TSVSOURCE
+source tsv1
+{
+  type = tsvpipe
+  tsvpipe_command = ls /var/null
+}
+    TSVSOURCE
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-19 00:00:00 Z
+date: 2014-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -86,6 +86,8 @@ files:
 - lib/riddle/configuration/section.rb
 - lib/riddle/configuration/source.rb
 - lib/riddle/configuration/sql_source.rb
+- lib/riddle/configuration/template_index.rb
+- lib/riddle/configuration/tsv_source.rb
 - lib/riddle/configuration/xml_source.rb
 - lib/riddle/controller.rb
 - lib/riddle/query.rb
@@ -246,15 +248,17 @@ files:
 - spec/unit/configuration/searchd_spec.rb
 - spec/unit/configuration/source_spec.rb
 - spec/unit/configuration/sql_source_spec.rb
+- spec/unit/configuration/template_index_spec.rb
+- spec/unit/configuration/tsv_source_spec.rb
 - spec/unit/configuration/xml_source_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/filter_spec.rb
 - spec/unit/message_spec.rb
 - spec/unit/response_spec.rb
 - spec/unit/riddle_spec.rb
-homepage: http://pat.github.com/riddle/
-licenses: []
-
+homepage: http://pat.github.io/riddle/
+licenses: 
+- MIT
 metadata: {}
 
 post_install_message: 
@@ -432,6 +436,8 @@ test_files:
 - spec/unit/configuration/searchd_spec.rb
 - spec/unit/configuration/source_spec.rb
 - spec/unit/configuration/sql_source_spec.rb
+- spec/unit/configuration/template_index_spec.rb
+- spec/unit/configuration/tsv_source_spec.rb
 - spec/unit/configuration/xml_source_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/filter_spec.rb