flying-sphinx 0.5.0 → 0.5.1

data/flying-sphinx.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'flying-sphinx'
-  s.version     = '0.5.0'
+  s.version     = '0.5.1'
   s.authors     = ['Pat Allan']
   s.email       = 'pat@freelancing-gods.com'
   s.date        = '2011-05-12'
@@ -17,12 +17,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
 
   s.add_runtime_dependency 'thinking-sphinx',    ['>= 0']
-  s.add_runtime_dependency 'net-ssh',            ['~> 2.0.23']
+  s.add_runtime_dependency 'net-ssh',            ['>= 2.0.23']
   s.add_runtime_dependency 'multi_json',         ['~> 1.0.1']
   s.add_runtime_dependency 'faraday',            ['~> 0.6.1']
   s.add_runtime_dependency 'faraday_middleware', ['~> 0.6.3']
   s.add_runtime_dependency 'rash',               ['~> 0.3.0']
   
+  s.add_development_dependency 'rake',            ['0.8.7']
   s.add_development_dependency 'yajl-ruby',       ['~> 0.8.2']
   s.add_development_dependency 'rspec',           ['~> 2.5.0']
   s.add_development_dependency 'rcov',            ['~> 0.9.9']

data/lib/flying_sphinx/api.rb

@@ -69,7 +69,7 @@ class FlyingSphinx::API
     
     puts "API Request: #{method} '#{path}'; params: #{data.inspect}"
     response = block.call
-    puts "API Response: #{response.body.to_hash.inspect}"
+    puts "API Response: #{response.body.inspect}"
     return response
   end
   

data/lib/flying_sphinx/delayed_delta.rb

@@ -12,6 +12,10 @@ class FlyingSphinx::DelayedDelta < ThinkingSphinx::Deltas::DefaultDelta
   def self.enqueue(object, priority = 0)
     return if duplicates_exist? object
     
+    enqueue_without_duplicates_check object, priority
+  end
+  
+  def self.enqueue_without_duplicates_check(object, priority = 0)
     if defined?(Rails) && Rails.version.to_i <= 2
       ::Delayed::Job.enqueue(object, priority)
     else
@@ -55,11 +59,11 @@ class FlyingSphinx::DelayedDelta < ThinkingSphinx::Deltas::DefaultDelta
       delayed_job_priority
     )
     
-    Delayed::Job.enqueue(
+    self.class.enqueue_without_duplicates_check(
       FlyingSphinx::FlagAsDeletedJob.new(
         model.core_index_names, instance.sphinx_document_id
       ),
-      :priority => delayed_job_priority
+      delayed_job_priority
     ) if instance
     
     true

data/lib/flying_sphinx/index_request.rb

@@ -34,6 +34,8 @@ class FlyingSphinx::IndexRequest
   end
   
   def status_message
+    raise "Index Request failed to start. Something's not right!" if @index_id.nil?
+    
     status = request_status
     case status
     when 'FINISHED'

data/lib/flying_sphinx/sinatra.rb

@@ -0,0 +1,12 @@
+require 'flying_sphinx'
+
+config = FlyingSphinx::Configuration.new
+
+ThinkingSphinx::Configuration.instance.address = config.host
+ThinkingSphinx::Configuration.instance.port    = config.port
+ThinkingSphinx::Configuration.instance.configuration.searchd.client_key =
+  config.client_key
+
+if ENV['DATABASE_URL'][/^mysql/].nil?
+  ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
+end

data/lib/flying_sphinx/tunnel.rb

@@ -37,7 +37,7 @@ class FlyingSphinx::Tunnel
   end
 
   def db_port
-    db_config[:port]
+    db_config[:port] || 5432
   end
 
   def db_config

data/spec/specs/index_request_spec.rb

@@ -137,6 +137,8 @@ describe FlyingSphinx::IndexRequest do
     
     before :each do
       api.stub(:post => index_response)
+      
+      index_request.instance_variable_set :@index_id, 42
     end
     
     it "returns with a positive message on success" do
@@ -162,6 +164,14 @@ describe FlyingSphinx::IndexRequest do
       
       index_request.status_message.should == "Unknown index response: 'UNKNOWN'."
     end
+    
+    it "raises a warning if the index id isn't set" do
+      index_request.instance_variable_set :@index_id, nil
+      
+      lambda {
+        index_request.status_message
+      }.should raise_error
+    end
   end
   
   describe "#display_name" do

metadata

@@ -2,7 +2,7 @@
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -30,7 +30,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 2.0.23
   type: :runtime
@@ -80,71 +80,82 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: rake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.8.2
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 2.5.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.9.9
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: fakeweb-matcher
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.2.2
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: delayed_job
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 2.1.4
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
 executables: []
@@ -159,7 +170,6 @@ files:
 - LICENCE
 - README.textile
 - Rakefile
-- VERSION
 - flying-sphinx.gemspec
 - keys/key
 - lib/flying-sphinx.rb
@@ -172,6 +182,7 @@ files:
 - lib/flying_sphinx/index_request.rb
 - lib/flying_sphinx/rails.rb
 - lib/flying_sphinx/railtie.rb
+- lib/flying_sphinx/sinatra.rb
 - lib/flying_sphinx/tasks.rb
 - lib/flying_sphinx/tunnel.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.5.0