flying-sphinx 0.6.4 → 0.6.5

data/HISTORY

@@ -1,3 +1,7 @@
+0.6.5 - 3rd May 2012
+* Relaxing the multi_json dependency to allow for higher versions.
+* Support for staging.flying-sphinx.com.
+
 0.6.4 - 3rd March 2012
 * Fix for Rails 2 with API verbose logging.
 

data/flying-sphinx.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'thinking-sphinx',    ['>= 0']
   s.add_runtime_dependency 'riddle',             ['>= 1.5.0']
   s.add_runtime_dependency 'net-ssh',            ['>= 2.0.23']
-  s.add_runtime_dependency 'multi_json',         ['~> 1.0.1']
+  s.add_runtime_dependency 'multi_json',         ['>= 1.0.1']
   s.add_runtime_dependency 'faraday_middleware', ['~> 0.7.0']
   s.add_runtime_dependency 'rash',               ['~> 0.3.0']
 

data/lib/flying_sphinx/api.rb

@@ -3,9 +3,10 @@ require 'faraday_middleware'
 
 class FlyingSphinx::API
 
-  APIServer  = 'https://flying-sphinx.com'
-  APIPath    = "/api/my/app"
-  APIVersion = 2
+  APIServer        = 'https://flying-sphinx.com'
+  APIStagingServer = 'https://staging.flying-sphinx.com'
+  APIPath          = "/api/my/app"
+  APIVersion       = 2
 
   attr_reader :api_key, :identifier, :adapter
 
@@ -52,7 +53,7 @@ class FlyingSphinx::API
   def connection(connection_options = {})
     options = {
       :ssl     => {:verify => false},
-      :url     => APIServer,
+      :url     => (ENV['STAGED_SPHINX_API_KEY'] ? APIStagingServer : APIServer),
       :headers => api_headers
     }
 

data/lib/flying_sphinx/configuration.rb

@@ -169,18 +169,18 @@ class FlyingSphinx::Configuration
   end
 
   def identifier_from_env
-    ENV['FLYING_SPHINX_IDENTIFIER']
+    ENV['STAGED_SPHINX_IDENTIFIER'] || ENV['FLYING_SPHINX_IDENTIFIER']
   end
 
   def api_key_from_env
-    ENV['FLYING_SPHINX_API_KEY']
+    ENV['STAGED_SPHINX_API_KEY'] || ENV['FLYING_SPHINX_API_KEY']
   end
 
   def host_from_env
-    ENV['FLYING_SPHINX_HOST'].dup
+    (ENV['STAGED_SPHINX_HOST'] || ENV['FLYING_SPHINX_HOST']).dup
   end
 
   def port_from_env
-    ENV['FLYING_SPHINX_PORT'].dup
+    (ENV['STAGED_SPHINX_PORT'] || ENV['FLYING_SPHINX_PORT']).dup
   end
 end

data/lib/flying_sphinx/rails.rb

@@ -1,6 +1,6 @@
 require 'action_controller/dispatcher'
 
-if ENV['FLYING_SPHINX_IDENTIFIER']
+if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
   ActionController::Dispatcher.to_prepare :flying_sphinx do
     config = FlyingSphinx::Configuration.new
 

data/lib/flying_sphinx/railtie.rb

@@ -14,5 +14,5 @@ class FlyingSphinx::Railtie < Rails::Railtie
     if ENV['DATABASE_URL'] && ENV['DATABASE_URL'][/^mysql/].nil?
       ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
     end
-  end if ENV['FLYING_SPHINX_IDENTIFIER']
+  end if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
 end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '0.6.4'
+  Version = '0.6.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-03 00:00:00 Z
+date: 2012-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: thinking-sphinx
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :runtime
   version_requirements: *id001
-  prerelease: false
-  name: thinking-sphinx
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: riddle
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,11 +45,11 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
+  type: :runtime
   version_requirements: *id002
-  prerelease: false
-  name: riddle
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: net-ssh
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,15 +61,15 @@ dependencies:
         - 0
         - 23
         version: 2.0.23
+  type: :runtime
   version_requirements: *id003
-  prerelease: false
-  name: net-ssh
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: multi_json
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 21
         segments: 
@@ -76,11 +77,11 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
+  type: :runtime
   version_requirements: *id004
-  prerelease: false
-  name: multi_json
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: faraday_middleware
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,11 +93,11 @@ dependencies:
         - 7
         - 0
         version: 0.7.0
+  type: :runtime
   version_requirements: *id005
-  prerelease: false
-  name: faraday_middleware
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: rash
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -108,11 +109,11 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
+  type: :runtime
   version_requirements: *id006
-  prerelease: false
-  name: rash
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rake
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -124,11 +125,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  type: :development
   version_requirements: *id007
-  prerelease: false
-  name: rake
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: yajl-ruby
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -140,11 +141,11 @@ dependencies:
         - 8
         - 2
         version: 0.8.2
+  type: :development
   version_requirements: *id008
-  prerelease: false
-  name: yajl-ruby
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rspec
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -156,11 +157,11 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
+  type: :development
   version_requirements: *id009
-  prerelease: false
-  name: rspec
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rcov
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -172,11 +173,11 @@ dependencies:
         - 9
         - 9
         version: 0.9.9
+  type: :development
   version_requirements: *id010
-  prerelease: false
-  name: rcov
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: fakeweb
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -188,11 +189,11 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
+  type: :development
   version_requirements: *id011
-  prerelease: false
-  name: fakeweb
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: fakeweb-matcher
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -204,11 +205,11 @@ dependencies:
         - 2
         - 2
         version: 1.2.2
+  type: :development
   version_requirements: *id012
-  prerelease: false
-  name: fakeweb-matcher
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: delayed_job
+  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -220,9 +221,8 @@ dependencies:
         - 1
         - 4
         version: 2.1.4
+  type: :development
   version_requirements: *id013
-  prerelease: false
-  name: delayed_job
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
 executables: []
@@ -303,3 +303,4 @@ test_files:
 - spec/specs/delayed_delta_spec.rb
 - spec/specs/flag_as_deleted_job_spec.rb
 - spec/specs/index_request_spec.rb
+has_rdoc: