pyramid_scheme 0.1.1 → 0.1.2

data/Rakefile

@@ -34,6 +34,7 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = ['-x gems,', '-x rake']
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/pyramid_scheme/index_server.rb

@@ -7,10 +7,10 @@ module PyramidScheme
     def initialize(options = {})
       @index_provider = PyramidScheme::IndexProvider::FileSystem.new
       @configuration = PyramidScheme::Configuration.new
-      @indexer_class = configuration[:indexer_class] || PyramidScheme::ThinkingSphinxIndexer
+      @indexer_class = configuration[:indexer_class] || PyramidScheme::Indexer::ThinkingSphinx
     end
 
-    # @returns [PyramidScheme::Indexer] an instance of the specified indexer_class from initialization
+    # @returns [PyramidScheme::Indexer::Base] an instance of the specified indexer_class from initialization
     def indexer
       @indexer ||= @indexer_class.new
     end
@@ -18,6 +18,7 @@ module PyramidScheme
     # run the index
     def index
       create_lock_file
+      indexer.configure
       indexer.index
       destroy_lock_file
       index_provider.process_index

data/lib/pyramid_scheme/indexer/base.rb

@@ -0,0 +1,21 @@
+module PyramidScheme
+  module Indexer
+    #defines an interface for indexers
+    class Base
+      attr_reader :index_task_name, :configure_task_name
+
+      def initialize
+        @index_task_name = self.class.index_task_name
+        @configure_task_name = self.class.configure_task_name
+      end
+
+      def configure
+        Rake::Task[@configure_task_name].invoke
+      end
+
+      def index
+        Rake::Task[@index_task_name].invoke
+      end
+    end
+  end
+end

data/lib/pyramid_scheme/indexer/thinking_sphinx.rb

@@ -0,0 +1,13 @@
+module PyramidScheme
+  module Indexer
+    class ThinkingSphinx < PyramidScheme::Indexer::Base
+      def self.index_task_name
+        'ts:in'
+      end
+
+      def self.configure_task_name
+        'ts:config'
+      end
+    end
+  end
+end

data/lib/pyramid_scheme/indexer/ultrasphinx.rb

@@ -0,0 +1,13 @@
+module PyramidScheme
+  module Indexer
+    class Ultrasphinx < PyramidScheme::Indexer::Base
+      def self.index_task_name
+        'ultrasphinx:index'
+      end
+
+      def self.configure_task_name
+        'ultrasphinx:configure'
+      end
+    end
+  end
+end

data/lib/pyramid_scheme.rb

@@ -4,9 +4,10 @@ require 'configatron'
 
 require 'pyramid_scheme/required_configuration_not_found'
 
-require 'pyramid_scheme/indexer'
-require 'pyramid_scheme/thinking_sphinx_indexer'
-require 'pyramid_scheme/ultrasphinx_indexer'
+require 'pyramid_scheme/indexer/base'
+require 'pyramid_scheme/indexer/thinking_sphinx'
+require 'pyramid_scheme/indexer/ultrasphinx'
+
 
 require 'pyramid_scheme/index_lock_file'
 require 'pyramid_scheme/configuration'

data/pyramid_scheme.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pyramid_scheme}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Pickett"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-02-15}
   s.description = %q{Sphinx index propagtion (currently via the filesystem)}
   s.email = %q{dpickett@enlightsolutions.com}
   s.extra_rdoc_files = [
@@ -29,7 +29,9 @@ Gem::Specification.new do |s|
      "lib/pyramid_scheme/index_lock_file.rb",
      "lib/pyramid_scheme/index_provider/file_system.rb",
      "lib/pyramid_scheme/index_server.rb",
-     "lib/pyramid_scheme/indexer.rb",
+     "lib/pyramid_scheme/indexer/base.rb",
+     "lib/pyramid_scheme/indexer/thinking_sphinx.rb",
+     "lib/pyramid_scheme/indexer/ultrasphinx.rb",
      "lib/pyramid_scheme/required_configuration_not_found.rb",
      "lib/pyramid_scheme/tasks.rb",
      "lib/pyramid_scheme/tasks/rake_tasks.rake",
@@ -41,8 +43,8 @@ Gem::Specification.new do |s|
      "spec/pyramid_scheme/index_provider/file_system_spec.rb",
      "spec/pyramid_scheme/index_provider_configuration_spec.rb",
      "spec/pyramid_scheme/index_server_spec.rb",
-     "spec/pyramid_scheme/thinking_sphinx_indexer_spec.rb",
-     "spec/pyramid_scheme/ultrasphinx_indexer_spec.rb",
+     "spec/pyramid_scheme/indexer/thinking_sphinx_spec.rb",
+     "spec/pyramid_scheme/indexer/ultrasphinx_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "tasks/pyramid_scheme.rake"
@@ -57,8 +59,8 @@ Gem::Specification.new do |s|
      "spec/pyramid_scheme/index_provider/file_system_spec.rb",
      "spec/pyramid_scheme/index_provider_configuration_spec.rb",
      "spec/pyramid_scheme/index_server_spec.rb",
-     "spec/pyramid_scheme/thinking_sphinx_indexer_spec.rb",
-     "spec/pyramid_scheme/ultrasphinx_indexer_spec.rb",
+     "spec/pyramid_scheme/indexer/thinking_sphinx_spec.rb",
+     "spec/pyramid_scheme/indexer/ultrasphinx_spec.rb",
      "spec/pyramid_scheme.rb",
      "spec/spec_helper.rb"
   ]

data/spec/pyramid_scheme/index_server_spec.rb

@@ -5,6 +5,7 @@ describe PyramidScheme::IndexServer do
 
   before(:each) do
     @server = PyramidScheme::IndexServer.new
+    @server.indexer.stub(:configure)
     @server.indexer.stub(:index)
     FileUtils.mkdir_p(PyramidScheme.configuration[:server_destination_path])
     FileUtils.mkdir_p(PyramidScheme.configuration[:client_source_path])
@@ -15,17 +16,21 @@ describe PyramidScheme::IndexServer do
   end
 
   it 'should default to a thinking sphinx indexer' do
-    @server.indexer.should be_kind_of(PyramidScheme::ThinkingSphinxIndexer)
+    @server.indexer.should be_kind_of(PyramidScheme::Indexer::ThinkingSphinx)
   end
 
   it 'should allow me to specify an ultrasphinx indexer' do
     PyramidScheme.configure do |config|
-      config.indexer_class = PyramidScheme::UltrasphinxIndexer
+      config.indexer_class = PyramidScheme::Indexer::Ultrasphinx
     end
     @server = PyramidScheme::IndexServer.new
-    @server.indexer.should be_kind_of(PyramidScheme::UltrasphinxIndexer)
+    @server.indexer.should be_kind_of(PyramidScheme::Indexer::Ultrasphinx)
   end
 
+  it 'should configure via the indexer' do
+    @server.indexer.expects(:configure).once
+    @server.index
+  end
   it 'should index via the indexer' do
     @server.indexer.expects(:index).once
     @server.index

data/spec/pyramid_scheme/indexer/thinking_sphinx_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe PyramidScheme::Indexer::ThinkingSphinx do
+  before(:each) do
+    @indexer = PyramidScheme::Indexer::ThinkingSphinx.new
+  end
+
+  it 'should have the index rake task of ts:in' do
+    @indexer.class.index_task_name.should eql('ts:in')
+  end
+
+  it 'should have the configure rake task of ts:config' do
+    @indexer.class.configure_task_name.should eql('ts:config')
+  end
+end

data/spec/pyramid_scheme/indexer/ultrasphinx_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe PyramidScheme::Indexer::Ultrasphinx do
+  before(:each) do
+    @indexer = PyramidScheme::Indexer::Ultrasphinx.new
+  end
+
+  it 'should have the indexer task of ultrasphinx:index' do
+    @indexer.class.index_task_name.should eql('ultrasphinx:index')
+  end
+
+  it 'should have the configure task of ultrasphinx:configure' do
+    @indexer.class.configure_task_name.should eql('ultrasphinx:configure')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pyramid_scheme
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Dan Pickett
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -05:00
+date: 2010-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,7 +94,9 @@ files:
 - lib/pyramid_scheme/index_lock_file.rb
 - lib/pyramid_scheme/index_provider/file_system.rb
 - lib/pyramid_scheme/index_server.rb
-- lib/pyramid_scheme/indexer.rb
+- lib/pyramid_scheme/indexer/base.rb
+- lib/pyramid_scheme/indexer/thinking_sphinx.rb
+- lib/pyramid_scheme/indexer/ultrasphinx.rb
 - lib/pyramid_scheme/required_configuration_not_found.rb
 - lib/pyramid_scheme/tasks.rb
 - lib/pyramid_scheme/tasks/rake_tasks.rake
@@ -106,8 +108,8 @@ files:
 - spec/pyramid_scheme/index_provider/file_system_spec.rb
 - spec/pyramid_scheme/index_provider_configuration_spec.rb
 - spec/pyramid_scheme/index_server_spec.rb
-- spec/pyramid_scheme/thinking_sphinx_indexer_spec.rb
-- spec/pyramid_scheme/ultrasphinx_indexer_spec.rb
+- spec/pyramid_scheme/indexer/thinking_sphinx_spec.rb
+- spec/pyramid_scheme/indexer/ultrasphinx_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/pyramid_scheme.rake
@@ -144,7 +146,7 @@ test_files:
 - spec/pyramid_scheme/index_provider/file_system_spec.rb
 - spec/pyramid_scheme/index_provider_configuration_spec.rb
 - spec/pyramid_scheme/index_server_spec.rb
-- spec/pyramid_scheme/thinking_sphinx_indexer_spec.rb
-- spec/pyramid_scheme/ultrasphinx_indexer_spec.rb
+- spec/pyramid_scheme/indexer/thinking_sphinx_spec.rb
+- spec/pyramid_scheme/indexer/ultrasphinx_spec.rb
 - spec/pyramid_scheme.rb
 - spec/spec_helper.rb

data/lib/pyramid_scheme/indexer.rb

@@ -1,14 +0,0 @@
-module PyramidScheme
-  #defines an interface for indexers
-  class Indexer
-    attr_reader :rake_task_name
-
-    def initialize(rake_task_name = nil)
-      @rake_task_name = rake_task_name || self.class.default_task_name
-    end
-
-    def index
-      Rake::Task[@rake_task_name].invoke
-    end
-  end
-end

data/spec/pyramid_scheme/thinking_sphinx_indexer_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe PyramidScheme::ThinkingSphinxIndexer do 
-  before(:each) do
-    @indexer = PyramidScheme::ThinkingSphinxIndexer.new
-  end
-
-  it 'should have the default rake task of ts:in' do
-    @indexer.class.default_task_name.should eql('ts:in')
-  end
-end

data/spec/pyramid_scheme/ultrasphinx_indexer_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe PyramidScheme::UltrasphinxIndexer do
-  before(:each) do
-    @indexer = PyramidScheme::UltrasphinxIndexer.new
-  end
-
-  it 'should have the default rake task of ultrasphinx:index' do
-    @indexer.class.default_task_name.should eql('ultrasphinx:index')
-  end
-
-  it 'should default to the default rake task' do
-    @indexer.rake_task_name.should eql(@indexer.class.default_task_name)
-  end
-end