pyramid_scheme 0.2.7 → 0.2.8

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/pyramid_scheme/configuration.rb

@@ -29,7 +29,11 @@ module PyramidScheme
       config_hash = YAML::load(File.open(path))
       set do |config|
         config_hash.each do |key, value|
-          config.send("#{key}=", value)
+          if key =~ /class$/
+            config.send("#{key}=", recursive_const_get(value))
+          else
+            config.send("#{key}=", value)
+          end
         end
       end
     end
@@ -45,5 +49,15 @@ module PyramidScheme
     def [](key)
       configatron.pyramid_scheme.to_hash[key] 
     end
+
+    def self.recursive_const_get(klass_str, mod_base = Kernel)
+      first_namespace = klass_str[/^\w*\:\:/]
+      if first_namespace.nil?
+        mod_base.const_get(klass_str)
+      else
+        recursive_const_get(klass_str.gsub(first_namespace, ""),
+          mod_base.const_get(first_namespace[0..-3]))
+      end
+    end
   end
 end

data/lib/pyramid_scheme/tasks.rb

@@ -1 +1,34 @@
-load(File.join(File.dirname(__FILE__), 'tasks/rake_tasks.rake'))
+module PyramidScheme
+  # PyramidScheme::Tasks.new('path/to/configuration/yml')
+  class Tasks < ::Rake::TaskLib
+    attr_reader :yml_path
+
+    def initialize(yml_path = nil)
+      unless yml_path.nil?
+        @yml_path = yml_path 
+        configure_with_yml
+      end
+      define
+    end
+
+    protected
+    def configure_with_yml
+      PyramidScheme.configure_with_yml(@yml_path)
+    end
+
+    def define
+      namespace :pyramid_scheme do
+        desc "retrieve new sphinx indexes as the client"
+        task :retrieve do
+          PyramidScheme::IndexClient.new.retrieve_index
+        end
+
+        desc "create new sphinx indexes as the server"
+        task :index do
+          PyramidScheme::IndexServer.new.index
+        end
+      end
+    end
+    
+  end
+end

data/spec/configuration.example.yml

@@ -2,5 +2,6 @@ access_key: access_key
 secret_access_key: secret_access_key
 bucket: some_bucket
 prefix: some_prefix
+index_provider_class: PyramidScheme::IndexProvider::S3
 server_source_path: "/some/server/source"
 client_destination_path: "/some/client/destination"

data/spec/pyramid_scheme/configuration_spec.rb

@@ -4,6 +4,8 @@ describe PyramidScheme::Configuration do
   describe "from yml" do
     before(:each) do
       FakeFS.deactivate!
+      PyramidScheme.configure_with_yml(
+        File.join(File.dirname(__FILE__), '../configuration.example.yml'))
     end
 
     after(:each) do
@@ -11,9 +13,11 @@ describe PyramidScheme::Configuration do
     end
 
     it 'should have a method that allows configuration from a yml file' do
-      PyramidScheme.configure_with_yml(
-        File.join(File.dirname(__FILE__), '../configuration.example.yml'))
         PyramidScheme.configuration[:secret_access_key].should_not be_nil
     end
+    
+    it 'should cast a string to a class if suffix of the configuraiton is class' do
+      PyramidScheme.configuration[:index_provider_class].should eql(PyramidScheme::IndexProvider::S3)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'fakefs/spec_helpers'
 Spec::Runner.configure do |config|
   config.before(:each) do
     PyramidScheme.configure do |config|
+      config.index_provider_class = PyramidScheme::IndexProvider::FileSystem
       config.client_source_path = '/some/default/source'
       config.client_destination_path = '/some/default/destination'
       config.server_source_path = '/some/server/source'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Dan Pickett
@@ -142,7 +142,6 @@ files:
 - lib/pyramid_scheme/lock/s3.rb
 - lib/pyramid_scheme/required_configuration_not_found.rb
 - lib/pyramid_scheme/tasks.rb
-- lib/pyramid_scheme/tasks/rake_tasks.rake
 - lib/pyramid_scheme/thinking_sphinx_indexer.rb
 - lib/pyramid_scheme/ultrasphinx_indexer.rb
 - spec/configuration.example.yml

data/lib/pyramid_scheme/tasks/rake_tasks.rake

@@ -1,11 +0,0 @@
-namespace :pyramid_scheme do
-  desc "retrieve new sphinx indexes as the client"
-  task :retrieve => :environment do
-    PyramidScheme::IndexClient.new.retrieve_index
-  end
-
-  desc "create new sphinx indexes as the server"
-  task :index => :environment do
-    PyramidScheme::IndexServer.new.index
-  end
-end