caster 0.9.2 → 0.9.3

data/bin/cast

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

data/lib/caster.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'logger'
 require 'caster/migration'
 
 include Caster
@@ -8,12 +9,17 @@ module Caster
   @config = {
     :host => '127.0.0.1',
     :port => '5984',
-    :metadoc_type => 'caster_metadoc',
-    :metadoc_id_prefix => 'caster'
+    :metadata => {
+        :database => nil,
+        :id_prefix => 'caster',
+        :type => 'caster_metadoc'
+    }
   }
 
   @valid_config_keys = @config.keys
 
+  @logger = Logger.new STDOUT
+
   def self.configure opts = {}
     opts.each do |k, v|
       @config[k.to_sym] = v if @valid_config_keys.include? k.to_sym
@@ -38,4 +44,8 @@ module Caster
   def self.config
     @config
   end
+
+  def self.log
+    @logger
+  end
 end

data/lib/caster/accessor.rb

@@ -2,6 +2,8 @@ module Caster
 
   # provides means to easily access nested values from hash
   # doc['a']['b']['c'] can be accessed as 'a.b.c'
+  # doc['a.b'] can be accessed as 'a\.b'
+  # doc['a\b'] can be accessed as 'a\\\\b'
   class Accessor
 
     def get doc, accessor
@@ -12,7 +14,7 @@ module Caster
 
     def set doc, accessor, value
       sub_doc = doc
-      accessor.split('.').each do |sub_field|
+      split(accessor).each do |sub_field|
         sub_doc[sub_field] = {} if sub_doc[sub_field] == nil
         sub_doc = sub_doc[sub_field]
       end
@@ -20,14 +22,45 @@ module Caster
     end
 
     def delete doc, accessor
-      sub_fields = accessor.split('.')
+      sub_fields = split(accessor)
       field_to_delete = sub_fields.pop
       eval("#{access('doc', sub_fields.join('.'))}.delete('#{field_to_delete}')")
     end
 
-    private
     def access doc_var, accessor
-      doc_var << accessor.split('.').map { |field| "['#{field}']" }.join
+      doc_var << split(accessor).map { |field| "['#{field}']" }.join
+    end
+
+    def split accessor
+      escape = false
+      words = []
+      w = 0
+      (0..accessor.length - 1).each do |i|
+
+        c = accessor[i].chr
+        n = accessor[i+1].chr rescue ''
+
+        if escape
+          escape = false
+          next
+        end
+
+        words[w] = '' if words[w] == nil
+
+        if c == '\\'
+          words[w] << n
+          escape = true
+          next
+        end
+
+        if c == '.'
+          w = w + 1
+          next
+        end
+
+        words[w] << c
+      end
+      words
     end
   end
 end

data/lib/caster/execution.rb

@@ -56,6 +56,7 @@ module Caster
     end
 
     def execute
+      Caster.log.info "executing query on '#{@db.name}' over '#{@view}' with params #{@query.inspect}"
       rdocs = @db.view(@view, @query)['rows']
       db_docs_map = Hash.new { |k, v| k[v] = [] }
       rdocs.each do |rdoc|

data/lib/caster/metadata/metadata_database.rb

@@ -0,0 +1,22 @@
+require 'couchrest'
+module Caster
+
+  class MetadataDatabase
+
+    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
+    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
+    end
+  end
+end

data/lib/caster/metadata/metadata_document.rb

@@ -0,0 +1,32 @@
+require 'couchrest'
+
+module Caster
+
+  class MetadataDocument
+
+    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
+    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.save_doc metadoc
+    end
+  end
+
+end

data/lib/caster/migration.rb

@@ -15,12 +15,12 @@ module Caster
   end
 
   def over scope, query = {}, &block
-    database_name, view = split(scope)
+    database_name, view = split_view_accessor(scope)
     db = CouchRest.database "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{database_name}" if @db == nil
     Execution.new(db || @db, view, query, &block).execute
   end
 
-  def split scope
+  def split_view_accessor scope
     if scope.count('/') == 1
       return nil, scope
     elsif scope.count('/') == 2

data/lib/caster/migrator.rb

@@ -1,72 +1,72 @@
 require 'caster/migration'
+require 'caster/metadata/metadata_document'
 require 'couchrest'
 
 module Caster
 
   class Migrator
 
-    def migrate_dir database, path, max_version = nil
-      db = CouchRest.database! "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{database}"
+    def initialize metadata
+      @dbs = {}
+      @metadata = metadata
+    end
+    
+    def migrate_in_dir path, migrate_database = nil, max_version = nil
 
-      current_version = nil
-      begin
-        current_version = db.get("#{Caster.config[:metadoc_id_prefix]}_#{database}")['version']
-      rescue
-        # ignored
-      end
+      all_migrations = {}
 
       path = path.sub /(\/)+$/, ''
+      Dir["#{path}/*.cast"].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
 
-      migrations = Dir["#{path}/*.cast"].map do |file|
-        version, db_in_filename = File.basename(file, '.cast').split '.'
-        { :version => version , :database => db_in_filename, :filepath => file }
+        all_migrations[database] = [] if all_migrations[database] == nil
+
+        all_migrations[database] << {
+            :current_version => @metadata.get_db_version(database),
+            :version => migration_version,
+            :filepath => file
+        }
       end
 
-      db_filtered = migrations.map do |migration|
-        migration if database == migration[:database]
-      end.compact
+      all_migrations.each_pair do |database, migrations|
+
+        db_filtered = (migrate_database == nil)? migrations.map : migrations.map do |migration|
+          migration if migrate_database == database
+        end.compact
 
-      min_version_filtered = db_filtered.map do |migration|
-        migration if current_version == nil or migration[:version] > current_version
-      end.compact
+        min_version_filtered = db_filtered.map do |migration|
+          migration if migration[:current_version] == nil or migration[:version] > migration[:current_version]
+        end.compact
 
-      max_version_filtered = min_version_filtered.map do |migration|
-        migration if max_version == nil or migration[:version] <= max_version
-      end.compact
+        max_version_filtered = min_version_filtered.map do |migration|
+          migration if max_version == nil or migration[:version] <= max_version
+        end.compact
 
-      filtered_and_sorted_files = max_version_filtered.map do |migration|
-        migration[:filepath]
-      end.sort
+        filtered_and_sorted_files = max_version_filtered.map do |migration|
+          migration[:filepath]
+        end.sort
 
-      filtered_and_sorted_files.each do |file|
-        migrate_file file, db
+        filtered_and_sorted_files.each do |file|
+          migrate_file file
+        end
       end
+
     end
 
-    def migrate_file path, db_handle = nil
+    def migrate_file path
       filename = File.basename path, '.cast'
       version, database = filename.split '.'
+      current_version = @metadata.get_db_version database
 
-      db = db_handle || (CouchRest.database! "http://#{Caster.config[:host]}:#{Caster.config[:port]}/#{database}")
-      metadoc = nil
-      begin
-        metadoc = db.get "#{Caster.config[:metadoc_id_prefix]}_#{database}"
-      rescue
-        metadoc = {
-            '_id' => "#{Caster.config[:metadoc_id_prefix]}_#{database}",
-            'type' => "#{Caster.config[:metadoc_type]}"
-        }
-      end
-
-      if metadoc['version'] != nil and version <= metadoc['version']
+      if current_version != nil and version <= current_version
         raise 'Cannot migrate down!'
       else
-        metadoc['version'] = version
+        migrate_script database, File.open(path).read
+        @metadata.save_db_version database, version
       end
 
-      migrate_script database, File.open(path).read
-
-      db.save_doc metadoc
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caster
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Manohar Akula
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-06 00:00:00 Z
+date: 2013-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: couchrest
@@ -57,6 +57,8 @@ files:
 - lib/caster.rb
 - lib/caster/accessor.rb
 - lib/caster/execution.rb
+- lib/caster/metadata/metadata_database.rb
+- lib/caster/metadata/metadata_document.rb
 - lib/caster/migration.rb
 - lib/caster/migrator.rb
 - lib/caster/operation.rb