riddle 1.5.8 → 1.5.9

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  data.tar.gz: 510b7c51b1422b3fee8d37bb3e569b218c3fafba
+  metadata.gz: 892c35de7bb285404d93abb4fc52e3c4356fa5ad
+SHA512: 
+  data.tar.gz: da219c1e7647d916b1719ea4b422072b4e16626227c29dd1df51aac11d5a329b5fc6101adc2f753a84c0395f92beb90b2cfb01be4dd605d9e27ee891f3bbc745
+  metadata.gz: abfd8ca976c29a26220402525827e623803356e67c3f11247b09473bc6c5b38e51104a3093eade7478c15a2d747c793f5d99a41eeaf3ba06a5de2de0a76c5c74

data/HISTORY

@@ -1,3 +1,8 @@
+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.
+- Don't escape references to id in SphinxQL INSERT/REPLACE queries.
+
 1.5.8 - August 26th 2013
 - Reworked escaping to be consistent and always query-safe (Demian Ferreiro).
 - Escape column names in SphinxQL WHERE, INSERT, ORDER BY and GROUP BY clauses and statements (Jason Rust).

data/lib/riddle/configuration/index_settings.rb

@@ -13,7 +13,9 @@ module Riddle
           :html_index_attrs, :html_remove_elements, :preopen, :ondisk_dict,
           :inplace_enable, :inplace_hit_gap, :inplace_docinfo_gap,
           :inplace_reloc_factor, :inplace_write_factor, :index_exact_words,
-          :overshort_step, :stopwords_step, :hitless_words
+          :overshort_step, :stopwords_step, :hitless_words, :ha_strategy,
+          :bigram_freq_words, :bigram_index, :index_field_lengths,
+          :regexp_filter, :stopwords_unstemmed, :global_idf
         ]
       end
 
@@ -28,7 +30,9 @@ module Riddle
         :html_remove_element_tags, :preopen, :ondisk_dict, :inplace_enable,
         :inplace_hit_gap, :inplace_docinfo_gap, :inplace_reloc_factor,
         :inplace_write_factor, :index_exact_words, :overshort_step,
-        :stopwords_step, :hitless_words
+        :stopwords_step, :hitless_words, :ha_strategy, :bigram_freq_words,
+        :bigram_index, :index_field_lengths, :regexp_filter,
+        :stopwords_unstemmed, :global_idf
 
       def initialize_settings
         @morphologies             = []
@@ -41,6 +45,7 @@ module Riddle
         @ngram_characters         = []
         @phrase_boundaries        = []
         @html_remove_element_tags = []
+        @regexp_filter            = []
       end
 
       def morphology

data/lib/riddle/configuration/indexer.rb

@@ -2,17 +2,19 @@ module Riddle
   class Configuration
     class Indexer < Riddle::Configuration::Section
       def self.settings
-        [ 
+        [
           :mem_limit, :max_iops, :max_iosize, :max_xmlpipe2_field,
-          :write_buffer, :max_file_field_buffer, :lemmatizer_base, :lemmatizer_cache
+          :write_buffer, :max_file_field_buffer, :on_file_field_error,
+          :lemmatizer_base, :lemmatizer_cache, :json_autoconv_numbers,
+          :on_json_attr_error
         ]
       end
-      
+
       attr_accessor *self.settings
-            
+
       def render
         raise ConfigurationError unless valid?
-        
+
         (
           ["indexer", "{"] +
           settings_body +

data/lib/riddle/configuration/realtime_index.rb

@@ -7,13 +7,13 @@ module Riddle
         Riddle::Configuration::IndexSettings.settings + [
           :rt_mem_limit, :rt_field, :rt_attr_uint, :rt_attr_bigint,
           :rt_attr_float, :rt_attr_timestamp, :rt_attr_string, :rt_attr_multi,
-          :rt_attr_multi_64
+          :rt_attr_multi_64, :rt_attr_bool, :rt_attr_json
         ]
       end
 
       attr_accessor :rt_mem_limit, :rt_field, :rt_attr_uint, :rt_attr_bigint,
         :rt_attr_float, :rt_attr_timestamp, :rt_attr_string, :rt_attr_multi,
-        :rt_attr_multi_64
+        :rt_attr_multi_64, :rt_attr_bool, :rt_attr_json
 
       def initialize(name)
         @name               = name
@@ -25,6 +25,8 @@ module Riddle
         @rt_attr_string     = []
         @rt_attr_multi      = []
         @rt_attr_multi_64   = []
+        @rt_attr_bool       = []
+        @rt_attr_json       = []
 
         initialize_settings
       end

data/lib/riddle/configuration/searchd.rb

@@ -6,30 +6,34 @@ module Riddle
           :listen, :address, :port, :log, :query_log,
           :query_log_format, :read_timeout, :client_timeout, :max_children,
           :pid_file, :max_matches, :seamless_rotate, :preopen_indexes,
-          :unlink_old, :attr_flush_period, :ondisk_dict_default, :max_packet_size,
-          :mva_updates_pool, :crash_log_path, :max_filters, :max_filter_values,
-          :listen_backlog, :read_buffer, :read_unhinted, :max_batch_queries,
-          :subtree_docs_cache, :subtree_hits_cache, :workers, :dist_threads,
-          :binlog_path, :binlog_flush, :binlog_max_log_size, :collation_server,
+          :unlink_old, :attr_flush_period, :ondisk_dict_default,
+          :max_packet_size, :mva_updates_pool, :crash_log_path, :max_filters,
+          :max_filter_values, :listen_backlog, :read_buffer, :read_unhinted,
+          :max_batch_queries, :subtree_docs_cache, :subtree_hits_cache,
+          :workers, :dist_threads, :binlog_path, :binlog_flush,
+          :binlog_max_log_size, :snippets_file_prefix, :collation_server,
           :collation_libc_locale, :plugin_dir, :mysql_version_string,
           :rt_flush_period, :thread_stack, :expansion_limit,
-        :compat_sphinxql_magics, :watchdog, :client_key
+          :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
         ]
       end
-      
+
       attr_accessor *self.settings
       attr_accessor :mysql41
-            
+
       def render
         raise ConfigurationError unless valid?
-        
+
         (
           ["searchd", "{"] +
           settings_body +
           ["}", ""]
         ).join("\n")
       end
-      
+
       def valid?
         !( @port.nil? || @pid_file.nil? )
       end

data/lib/riddle/configuration/sql_source.rb

@@ -6,10 +6,11 @@ module Riddle
           :type, :sql_host, :sql_user, :sql_pass, :sql_db,
           :sql_port, :sql_sock, :mysql_connect_flags, :mysql_ssl_cert,
           :mysql_ssl_key, :mysql_ssl_ca, :odbc_dsn, :sql_query_pre, :sql_query,
-          :sql_joined_field, :sql_file_field, :sql_query_range, :sql_range_step,
-          :sql_query_killlist, :sql_attr_uint, :sql_attr_bool, :sql_attr_bigint,
-          :sql_attr_timestamp, :sql_attr_str2ordinal, :sql_attr_float,
-          :sql_attr_multi, :sql_attr_string, :sql_attr_str2wordcount,
+          :sql_joined_field, :sql_file_field, :sql_query_range,
+          :sql_range_step, :sql_query_killlist, :sql_attr_uint, :sql_attr_bool,
+          :sql_attr_bigint, :sql_attr_timestamp, :sql_attr_str2ordinal,
+          :sql_attr_float, :sql_attr_multi, :sql_attr_string,
+          :sql_attr_str2wordcount, :sql_attr_json,
           :sql_column_buffers, :sql_field_string, :sql_field_str2wordcount,
           :sql_query_post, :sql_query_post_index, :sql_ranged_throttle,
           :sql_query_info, :mssql_winauth, :mssql_unicode, :unpack_zlib,
@@ -35,6 +36,7 @@ module Riddle
         @sql_attr_multi           = []
         @sql_attr_string          = []
         @sql_attr_str2wordcount   = []
+        @sql_attr_json            = []
         @sql_field_string         = []
         @sql_field_str2wordcount  = []
         @sql_query_post           = []

data/lib/riddle/query/insert.rb

@@ -14,7 +14,7 @@ class Riddle::Query::Insert
   end
 
   def to_sql
-    "#{command} INTO #{@index} (`#{columns_to_s}`) VALUES (#{values_to_s})"
+    "#{command} INTO #{@index} (#{columns_to_s}) VALUES (#{values_to_s})"
   end
 
   private
@@ -24,7 +24,10 @@ class Riddle::Query::Insert
   end
 
   def columns_to_s
-    columns.join('`, `')
+    columns.collect { |column|
+      column.to_s == 'id' ? 'id' : "`#{column}`"
+    }.join(', ')
+
   end
 
   def values_to_s
@@ -43,6 +46,8 @@ class Riddle::Query::Insert
       value ? 1 : 0
     when Time
       value.to_i
+    when Date
+      value.to_time.to_i
     when Array
       "(#{value.join(',')})"
     else

data/riddle.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'riddle'
-  s.version     = '1.5.8'
+  s.version     = '1.5.9'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']

data/spec/riddle/query/insert_spec.rb

@@ -3,23 +3,23 @@ require 'spec_helper'
 describe Riddle::Query::Insert do
   it 'handles inserts' do
     query = Riddle::Query::Insert.new('foo_core', [:id, :deleted], [4, false])
-    query.to_sql.should == 'INSERT INTO foo_core (`id`, `deleted`) VALUES (4, 0)'
+    query.to_sql.should == 'INSERT INTO foo_core (id, `deleted`) VALUES (4, 0)'
   end
-  
+
   it 'handles replaces' do
     query = Riddle::Query::Insert.new('foo_core', [:id, :deleted], [4, false])
     query.replace!
-    query.to_sql.should == 'REPLACE INTO foo_core (`id`, `deleted`) VALUES (4, 0)'
+    query.to_sql.should == 'REPLACE INTO foo_core (id, `deleted`) VALUES (4, 0)'
   end
-  
+
   it 'encloses strings in single quotes' do
     query = Riddle::Query::Insert.new('foo_core', [:id, :name], [4, 'bar'])
-    query.to_sql.should == "INSERT INTO foo_core (`id`, `name`) VALUES (4, 'bar')"
+    query.to_sql.should == "INSERT INTO foo_core (id, `name`) VALUES (4, 'bar')"
   end
-  
+
   it 'handles inserts with more than one set of values' do
     query = Riddle::Query::Insert.new 'foo_core', [:id, :name], [[4, 'bar'], [5, 'baz']]
     query.to_sql.
-      should == "INSERT INTO foo_core (`id`, `name`) VALUES (4, 'bar'), (5, 'baz')"
+      should == "INSERT INTO foo_core (id, `name`) VALUES (4, 'bar'), (5, 'baz')"
   end
 end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 8
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,57 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-26 00:00:00 +10:00
-default_executable: 
+date: 2013-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
         version: 0.9.2
   version_requirements: *id001
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
+  name: rake
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   version_requirements: *id002
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
+  name: rspec
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
         version: 0.7.2
   version_requirements: *id003
-  name: yard
-  prerelease: false
   type: :development
+  prerelease: false
+  name: yard
 description: A Ruby API and configuration helper for the Sphinx search service.
 email: 
 - pat@freelancing-gods.com
@@ -277,39 +252,31 @@ files:
 - spec/unit/message_spec.rb
 - spec/unit/response_spec.rb
 - spec/unit/riddle_spec.rb
-has_rdoc: true
 homepage: http://pat.github.com/riddle/
 licenses: []
 
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - &id004 
+    - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id004
 requirements: []
 
 rubyforge_project: riddle
-rubygems_version: 1.6.2
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An API for Sphinx, written in and for Ruby.
 test_files: 
 - spec/fixtures/.gitignore
@@ -471,3 +438,4 @@ test_files:
 - spec/unit/message_spec.rb
 - spec/unit/response_spec.rb
 - spec/unit/riddle_spec.rb
+has_rdoc: