flying-sphinx 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/lib/flying_sphinx/api.rb

@@ -1,13 +1,13 @@
 class FlyingSphinx::API
   include HTTParty
   
-  APIServer = 'http://flying-sphinx.com/heroku'
+  APIServer = 'https://flying-sphinx.com/heroku'
   
-  attr_reader :api_key, :heroku_id
+  attr_reader :api_key, :identifier
   
-  def initialize(heroku_id, api_key)
+  def initialize(identifier, api_key)
     @api_key   = api_key
-    @heroku_id = heroku_id
+    @identifier = identifier
   end
   
   def get(path, data = {})
@@ -27,7 +27,7 @@ class FlyingSphinx::API
   def api_options
     {
       :api_key   => api_key,
-      :heroku_id => heroku_id
+      :identifier => identifier
     }
   end
 end

data/lib/flying_sphinx/configuration.rb

@@ -1,20 +1,16 @@
 class FlyingSphinx::Configuration
-  attr_reader :heroku_id, :api_key, :host, :port, :database_port, :mem_limit
+  attr_reader :identifier, :api_key, :host, :port, :database_port, :mem_limit
   
-  def initialize(heroku_id = nil, api_key = nil)
-    @heroku_id = heroku_id || heroku_id_from_env
-    @api_key   = api_key   || api_key_from_env
+  def initialize(identifier = nil, api_key = nil)
+    @identifier = identifier || identifier_from_env
+    @api_key    = api_key    || api_key_from_env
     
     set_from_server
     setup_environment_settings
   end
   
   def api
-    @api ||= FlyingSphinx::API.new(heroku_id, api_key)
-  end
-  
-  def app_name
-    @app_name = heroku_id.split('@').first
+    @api ||= FlyingSphinx::API.new(identifier, api_key)
   end
   
   def sphinx_configuration
@@ -44,7 +40,7 @@ class FlyingSphinx::Configuration
   end
   
   def base_path
-    "/mnt/sphinx/flying-sphinx/#{app_name}"
+    "/mnt/sphinx/flying-sphinx/#{identifier}"
   end
   
   def log_path
@@ -95,8 +91,8 @@ class FlyingSphinx::Configuration
     end
   end
   
-  def heroku_id_from_env
-    ENV['APP_NAME'] + '@heroku.com'
+  def identifier_from_env
+    ENV['FLYING_SPHINX_IDENTIFIER']
   end
   
   def api_key_from_env

data/spec/flying_sphinx/configuration_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe FlyingSphinx::Configuration do
   describe '#initialize' do
-    let(:api_server) { 'http://flying-sphinx.com/heroku' }
+    let(:api_server) { 'https://flying-sphinx.com/heroku' }
     let(:api_key)    { 'foo-bar-baz' }
-    let(:heroku_id)  { 'app@heroku.com' }
-    let(:encoded_heroku_id) {
-      FakeWeb::Utility.encode_unsafe_chars_in_userinfo heroku_id
+    let(:identifier)  { 'app@heroku.com' }
+    let(:encoded_identifier) {
+      FakeWeb::Utility.encode_unsafe_chars_in_userinfo identifier
     }
     
     before :each do
       FakeWeb.register_uri(:get,
-        "#{api_server}/app?api_key=#{api_key}&heroku_id=#{encoded_heroku_id}",
+        "#{api_server}/app?api_key=#{api_key}&identifier=#{encoded_identifier}",
         :body => JSON.dump(
           :server        => 'foo.bar.com',
           :port          => 9319,
@@ -21,24 +21,24 @@ describe FlyingSphinx::Configuration do
     end
     
     it "requests details from the server with the given API key" do
-      FlyingSphinx::Configuration.new heroku_id, api_key
+      FlyingSphinx::Configuration.new identifier, api_key
       
       FakeWeb.should have_requested :get,
-        "#{api_server}/app?api_key=#{api_key}&heroku_id=#{encoded_heroku_id}"
+        "#{api_server}/app?api_key=#{api_key}&identifier=#{encoded_identifier}"
     end
     
     it "sets the host from the server information" do
-      config = FlyingSphinx::Configuration.new heroku_id, api_key
+      config = FlyingSphinx::Configuration.new identifier, api_key
       config.host.should == 'foo.bar.com'
     end
     
     it "sets the port from the server information" do
-      config = FlyingSphinx::Configuration.new heroku_id, api_key
+      config = FlyingSphinx::Configuration.new identifier, api_key
       config.port.should == 9319
     end
     
     it "sets the port from the server information" do
-      config = FlyingSphinx::Configuration.new heroku_id, api_key
+      config = FlyingSphinx::Configuration.new identifier, api_key
       config.database_port.should == 10001
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +11:00
+date: 2011-01-18 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -206,7 +206,7 @@ files:
 - spec/flying_sphinx/flag_as_deleted_job_spec.rb
 - spec/flying_sphinx/index_request_spec.rb
 has_rdoc: true
-homepage: http://flying-sphinx.com
+homepage: https://flying-sphinx.com
 licenses: []
 
 post_install_message: