caster 0.9.5 → 0.9.6

data/bin/cast

@@ -10,21 +10,16 @@ class Cast < Thor
   desc 'version', 'prints the current version of your database'
   method_option :db, :aliases => '-d', :required => true
   def version
-    db = CouchRest.database! "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{options[:db]}"
-    begin
-      puts db.get("#{Caster.config[:metadata][:id_prefix]}_#{Caster.config[:metadata][:database] || database}")['version']
-    rescue
-      puts "No version information available."
-    end
+    metadata = (Caster.config['metadata']['database'] != nil)? MetadataDatabase.new : MetadataDocument.new
+    puts metadata.get_db_version(options[:db]) || 'No version information available.'
   end
 
   desc 'up', 'executes migrations defined in cast files in the current directory'
   method_option :db, :aliases => '-d'
   method_option :version, :aliases => '-v'
   def up path = '.'
-    metadata = (Caster.config[:metadata][:database] != nil)? MetadataDatabase.new : MetadataDocument.new
+    metadata = (Caster.config['metadata']['database'] != nil)? MetadataDatabase.new : MetadataDocument.new
     Migrator.new(metadata).migrate_in_dir path, options[:db], options[:version]
-    puts 'Done.'
   end
 end
 

data/lib/caster.rb

@@ -7,20 +7,23 @@ include Caster
 module Caster
 
   @config = {
-    :host => '127.0.0.1',
-    :port => '5984',
-    :metadata => {
-        :database => nil,
-        :id_prefix => 'caster',
-        :type => 'caster_metadoc'
+    'host' => '127.0.0.1',
+    'port' => '5984',
+    'metadata' => {
+        'database' => nil,
+        'design_doc_id' => 'caster_meta',
+        'key' => {
+            'type' => 'caster_metadoc'
+        },
     },
-    :batch_size => 2000,
+    'batch_size' => 2000,
+    'log_level' => 'info',
   }
 
   @valid_config_keys = @config.keys
 
   @logger = Logger.new STDOUT
-  @logger.level = Logger.const_get((@config.has_key?(:log_level))? @config[:log_level].upcase : 'INFO')
+  @logger.level = Logger.const_get((@config.has_key?('log_level'))? @config['log_level'].upcase : 'INFO')
 
   def self.config
     @config
@@ -32,7 +35,7 @@ module Caster
 
   def self.configure opts = {}
     opts.each do |k, v|
-      @config[k.to_sym] = v if @valid_config_keys.include? k.to_sym
+      @config[k] = v if @valid_config_keys.include? k
     end
   end
 

data/lib/caster/execution.rb

@@ -52,7 +52,7 @@ module Caster
         db = @db
       else
         database_name, view = scope.split('/', 2)
-        db = CouchRest.database "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{database_name}"
+        db = CouchRest.database "http://#{Caster.config['host']}:#{Caster.config['port']}/#{database_name}"
       end
       key = [scope, query]
       @ref_docs_cache[key] = db_query(db, view, query)['rows'].map { |rdoc| rdoc['doc'] || rdoc['value'] } unless @ref_docs_cache.has_key? key
@@ -61,12 +61,12 @@ module Caster
 
     def execute
       limit = @query['limit'] || 1.0/0.0
-      if Caster.config[:batch_size] == nil or limit < Caster.config[:batch_size]
+      if Caster.config['batch_size'] == nil or limit < Caster.config['batch_size']
         execute_batch db_query(@db, @view, @query)['rows']
         return
       end
 
-      @query['limit'] = Caster.config[:batch_size] + 1
+      @query['limit'] = Caster.config['batch_size'] + 1
       saved_docs = 0
       while saved_docs < limit do
         docs = db_query(@db, @view, @query)['rows']
@@ -75,7 +75,7 @@ module Caster
         @query['startkey_docid'] = docs.last['id']
         @query['startkey'] = docs.last['key']
 
-        if docs.length <= Caster.config[:batch_size]
+        if docs.length <= Caster.config['batch_size']
           execute_batch docs
           return
         elsif saved_docs + docs.length - 1 > limit

data/lib/caster/metadata/metadata_database.rb

@@ -1,26 +1,28 @@
+require 'caster/metadata/metadata_store'
 require 'couchrest'
+
 module Caster
 
   class MetadataDatabase
 
+    include Caster::MetadataStore
+
+    def initialize
+      @metadb = CouchRest.database! "http://#{Caster.config['host']}:#{Caster.config['port']}/#{Caster.config['metadata']['database']}"
+    end
+
     def desc
       'external database'
     end
 
     def get_db_version database
-      db = CouchRest.database! "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{Caster.config[:metadata][:database]}"
-      begin
-        return db.get(database)[:version]
-      rescue
-        # ignored
-      end
+      get_metadoc(@metadb)[database] rescue nil
     end
 
     def save_db_version database, version
-      db = CouchRest.database! "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{Caster.config[:metadata][:database]}"
-      metadoc = db.get(database)
-      metadoc['version'] = version
-      db.save_doc metadoc
+      metadoc = get_metadoc(@metadb)
+      metadoc[database] = version
+      @metadb.save_doc metadoc
     end
   end
 end

data/lib/caster/metadata/metadata_document.rb

@@ -1,36 +1,26 @@
+require 'caster/metadata/metadata_store'
 require 'couchrest'
 
 module Caster
 
   class MetadataDocument
 
+    include Caster::MetadataStore
+
     def desc
       'source database'
     end
 
     def get_db_version database
-      db = CouchRest.database! "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{(Caster.config[:metadata][:database] || database)}"
-      begin
-        return db.get("#{Caster.config[:metadata][:id_prefix]}_#{database}")['version']
-      rescue
-        # ignored
-      end
+      db = CouchRest.database! "http://#{Caster.config['host']}:#{Caster.config['port']}/#{database}"
+      get_metadoc(db)[db.name] rescue nil
     end
 
     def save_db_version database, version
-      db = CouchRest.database! "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{(Caster.config[:metadata][:database] || database)}"
-      metadoc = nil
-      begin
-        metadoc = db.get "#{Caster.config[:metadata][:id_prefix]}_#{database}"
-      rescue
-        metadoc = {
-            '_id' => "#{Caster.config[:metadata][:id_prefix]}_#{database}",
-            'type' => "#{Caster.config[:metadata][:type]}"
-        }
-      end
-      metadoc['version'] = version
+      db = CouchRest.database! "http://#{Caster.config['host']}:#{Caster.config['port']}/#{database}"
+      metadoc = get_metadoc(db)
+      metadoc[database] = version
       db.save_doc metadoc
     end
   end
-
 end

data/lib/caster/metadata/metadata_store.rb

@@ -0,0 +1,26 @@
+require 'couchrest'
+
+module Caster
+
+  module MetadataStore
+
+    private
+    def init_design_doc db
+      db.save_doc({
+           '_id' => "_design/#{Caster.config['metadata']['design_doc_id']}",
+           :views => {
+               :meta_doc => {
+                   :map => "function(doc) { if (doc.#{Caster.config['metadata']['key'].first[0]} == '#{Caster.config['metadata']['key'].first[1]}') emit (doc._id, doc); }"
+               }
+           }
+       }) rescue nil
+    end
+
+    def get_metadoc db
+      init_design_doc db
+      db.view("#{Caster.config['metadata']['design_doc_id']}/meta_doc")['rows'][0]['value']
+      rescue
+        db.save_doc({ Caster.config['metadata']['key'].first[0] => Caster.config['metadata']['key'].first[1] })['id']
+    end
+  end
+end

data/lib/caster/migration.rb

@@ -3,7 +3,7 @@ require 'caster/execution'
 module Caster
 
   def migrate database_name, &block
-    @db = CouchRest.database "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{database_name}"
+    @db = CouchRest.database "http://#{Caster.config['host']}:#{Caster.config['port']}/#{database_name}"
     yield
     @db = nil
   end
@@ -16,7 +16,7 @@ module Caster
 
   def over scope, query = {}, &block
     database_name, view = split_view_accessor(scope)
-    db = CouchRest.database "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{database_name}" if @db == nil
+    db = CouchRest.database "http://#{Caster.config['host']}:#{Caster.config['port']}/#{database_name}" if @db == nil
     Execution.new(db || @db, view, query, &block).execute
   end
 

data/lib/caster/migrator.rb

@@ -1,5 +1,6 @@
 require 'caster/migration'
 require 'caster/metadata/metadata_document'
+require 'caster/metadata/metadata_database'
 require 'couchrest'
 
 module Caster
@@ -23,7 +24,7 @@ module Caster
       cast_files.map do |file|
         migration_version, database = File.basename(file, '.cast').split '.'
 
-        @dbs[database] = CouchRest.database! "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{database}" if @dbs[database] == nil
+        @dbs[database] = CouchRest.database! "http://#{Caster.config['host']}:#{Caster.config['port']}/#{database}" if @dbs[database] == nil
 
         all_migrations[database] = [] if all_migrations[database] == nil
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caster
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Manohar Akula
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-14 00:00:00 Z
+date: 2013-01-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: couchrest
@@ -59,6 +59,7 @@ files:
 - lib/caster/execution.rb
 - lib/caster/metadata/metadata_database.rb
 - lib/caster/metadata/metadata_document.rb
+- lib/caster/metadata/metadata_store.rb
 - lib/caster/migration.rb
 - lib/caster/migrator.rb
 - lib/caster/operation.rb