riddle 1.0.10 → 1.0.11

data/README.textile

@@ -61,7 +61,7 @@ that the query took to run.
 @:status@ is the error code for the query - and if there was a related warning, it will be under
 the @:warning@ key. Fatal errors will be described under @:error@.
 
-If you've installed the gem and wondering why there's no tests - check out the svn 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.
+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. Contributors
 
@@ -80,3 +80,4 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Jerry Vos
 * Piotr Sarnacki
 * Tim Preston
+* Amir Yalon

data/lib/riddle/client.rb

@@ -175,9 +175,9 @@ module Riddle
     # the latitude and longitude (in radians), and the reference position.
     # Note that for geocoding to work properly, you must also set
     # match_mode to :extended. To sort results by distance, you will
-    # need to set sort_mode to '@geodist asc' for example. Sphinx
-    # expects latitude and longitude to be returned from you SQL source
-    # in radians.
+    # need to set sort_by to '@geodist asc', and sort_mode to extended (as an
+    # example). Sphinx expects latitude and longitude to be returned from you
+    # SQL source in radians.
     #
     # Example:
     #   client.set_anchor('lat', -0.6591741, 'long', 2.530770)

data/lib/riddle/configuration/section.rb

@@ -21,7 +21,7 @@ module Riddle
             conf = "  #{setting} = "
           else
             conf = setting_to_array(setting).collect { |set|
-              "  #{setting} = #{set}"
+              "  #{setting} = #{rendered_setting set}"
             }
           end
           conf.length == 0 ? nil : conf
@@ -38,6 +38,20 @@ module Riddle
           [value]
         end
       end
+      
+      def rendered_setting(setting)
+        return setting unless setting.is_a?(String)
+        
+        index  = 8100
+        output = setting.clone
+        
+        while index < output.length
+          output.insert(index, "\\\n")
+          index += 8100
+        end
+        
+        output
+      end
     end
   end
 end

data/lib/riddle/configuration/sql_source.rb

@@ -31,19 +31,6 @@ module Riddle
         @unpack_mysqlcompress = []
       end
       
-      def sql_query=(query)
-        unless query.nil?
-          max_length = 8178  # max is: 8192 - "sql_query = ".length - "\\\n".length
-          i = max_length
-          while i < query.length
-            i = query.rindex(" ", i)
-            query.insert(i, "\\" + "\n")
-            i = i + max_length
-          end
-        end
-        @sql_query = query
-      end
-            
       def valid?
         super && (!( @sql_host.nil? || @sql_user.nil? || @sql_db.nil? ||
           @sql_query.nil? ) || !@parent.nil?)

data/lib/riddle/controller.rb

@@ -21,7 +21,7 @@ module Riddle
       options = indexes.last.is_a?(Hash) ? indexes.pop : {}
       indexes << '--all' if indexes.empty?
       
-      cmd = "#{indexer} --config #{@path} #{indexes.join(' ')}"
+      cmd = "#{indexer} --config '#{@path}' #{indexes.join(' ')}"
       cmd << " --rotate" if running?
       options[:verbose] ? system(cmd) : `#{cmd}`
     end
@@ -29,7 +29,7 @@ module Riddle
     def start
       return if running?
       
-      cmd = "#{searchd} --pidfile --config #{@path}"
+      cmd = "#{searchd} --pidfile --config '#{@path}'"
       
       if RUBY_PLATFORM =~ /mswin/
         system("start /B #{cmd} 1> NUL 2>&1")

data/spec/functional/update_spec.rb

@@ -11,17 +11,17 @@ describe "Sphinx Updates" do
     result[:matches].should_not be_empty
     result[:matches].length.should == 1
     ellie = result[:matches].first
-    ellie[:attributes]["birthday"].should == Time.utc(1970, 1, 23).to_i
+    ellie[:attributes]["birthday"].should == Time.local(1970, 1, 23).to_i
     
     # make Ellie younger by 6 years
-    @client.update("people", ["birthday"], {ellie[:doc] => [Time.utc(1976, 1, 23).to_i]})
+    @client.update("people", ["birthday"], {ellie[:doc] => [Time.local(1976, 1, 23).to_i]})
     
     # check attribute's value
     result = @client.query("Ellie K Ford")
     result[:matches].should_not be_empty
     result[:matches].length.should == 1
     ellie = result[:matches].first
-    ellie[:attributes]["birthday"].should == Time.utc(1976, 1, 23).to_i
+    ellie[:attributes]["birthday"].should == Time.local(1976, 1, 23).to_i
   end
   
   it "should update multiple records appropriately" do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'riddle'

data/spec/unit/configuration/sql_source_spec.rb

@@ -116,16 +116,17 @@ source src1
   it "should insert a backslash-newline into an sql_query when greater than 8178 characters" do
     source = Riddle::Configuration::SQLSource.new("src1", "mysql")
     source.sql_query = big_query_string[0, 8200]
+    source.parent = 'src0'
     
-    (source.sql_query.index("\\\n") < 8178).should be_true
+    source.render.should match(/sql_query\s=\s[^\n]+\\\n/)
   end
   
   it "should insert two backslash-newlines into an sql_query when greater than 16,356 characters" do
     source = Riddle::Configuration::SQLSource.new("src1", "mysql")
     source.sql_query = big_query_string
+    source.parent = 'src0'
     
-    (source.sql_query.index("\\\n") < 8178).should be_true
-    (source.sql_query.index("\\\n", 8178) < 16356).should be_true
+    source.render.should match(/sql_query\s=\s[^\n]+\\\n[^\n]+\\\n/)    
   end
   
   def big_query_string

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  version: 1.0.10
+  hash: 1
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,29 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +11:00
+date: 2010-06-30 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: A Ruby API and configuration helper for the Sphinx search service.
 email: pat@freelancing-gods.com
 executables: []
@@ -64,6 +80,33 @@ files:
 - lib/riddle/configuration/sql_source.rb
 - lib/riddle/configuration/xml_source.rb
 - lib/riddle/controller.rb
+- spec/functional/connection_spec.rb
+- spec/functional/excerpt_spec.rb
+- spec/functional/keywords_spec.rb
+- spec/functional/persistance_spec.rb
+- spec/functional/search_spec.rb
+- spec/functional/status_spec.rb
+- spec/functional/update_spec.rb
+- spec/riddle/auto_version_spec.rb
+- spec/riddle/client_spec.rb
+- spec/riddle/configuration_spec.rb
+- spec/riddle/controller_spec.rb
+- spec/riddle_spec.rb
+- spec/spec_helper.rb
+- spec/sphinx_helper.rb
+- spec/unit/client_spec.rb
+- spec/unit/configuration/distributed_index_spec.rb
+- spec/unit/configuration/index_spec.rb
+- spec/unit/configuration/indexer_spec.rb
+- spec/unit/configuration/searchd_spec.rb
+- spec/unit/configuration/source_spec.rb
+- spec/unit/configuration/sql_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
 has_rdoc: true
 homepage: http://riddle.freelancing-gods.com
 licenses: []
@@ -74,21 +117,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An API for Sphinx, written in and for Ruby.