wukong-migrate 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTYxYmMxOTdkZTkxZTI2ZmE5ODhhYTY5YzViOWU5YzAzMmE3OGQ5NQ==
+    N2RlYzkzMTE2NDhhY2Q2MDdlMzNlNzMyMGZjYjAwNDVkOGQyMDJmYQ==
   data.tar.gz: !binary |-
-    Mzk3YWNkOTEzMjQyNWQ1MTQ4ZWRiZjIwYjY5NDE5Yjk1ZWEzNzMwMA==
+    YTczYjgyM2ExYzRhYmZkMmY0MTQ4YWVjMjQ4OTZlZjE2YWE4OGFhZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmU2ZWY3MWVkNjA0ZDVhNGM5YjNmZGJiYTQ0ZjIzMmU5Njk0Mzc0MWJiNTM2
-    NjFmY2Q3MTYwZTE3MjY0NDczZWQzMWEzODUwZjhiNmZmYmQ2YjIwM2QwZWY2
-    NzU1OTQwMmM3MDVkMjE0ZTcwZTBkODMxOGJmYjVkYzYwYzM3MWI=
+    ZDI3MjQ0MGQxYTJkMmViZjgyMDA1MDg5MTEwNjI5YTQyMWE0MTUwNmFiOWE0
+    ZGNlMDYyNmRmZDRkZDdlNjdhNjAzMDc5NDBhNmYxMzlkMTNlZWRmODQxMjhi
+    ZWNlN2YwOGIyYWJlM2MzODliMGJjYTY3OWM4YjU2OWI4ZDdmYTU=
   data.tar.gz: !binary |-
-    MGU5YWE3ZGQzN2NmNzFjOTA0ODE5MjM4NWQ4MzQwMWNjY2Y0ZDJhN2M2MDgz
-    MjY0MTg1ZDAyZTEyYzVjMDkxNTMxYmI2NzJiYWU4YWJhM2Y2NDA5ZGIxNTFj
-    ZThhZDljZjE3MTU1YjY2ZjUzNzQ1YTUxYzhhMjViMTA5Y2EyMWY=
+    YWM1MWMyOWI4YjQwOTU4OTgzOWY4ODQ3MGI2ZDA3MDUzMDIyZDljZTU1NGI1
+    Yjk0MGNjYmRiZDdlY2JjOTkzNjliNWY3YjIzZWY1NDcwMzY4MjRmZTIwOGVm
+    MWM5NWI5NTg1MTA2OTEzYzM1MDc5MTA3NWY0ZTg2MTBlMGVhNDA=

data/lib/wukong-migrate/elasticsearch_migration.rb

@@ -65,11 +65,11 @@ end
 
 class IndexDsl < EsMigrationDsl
   # Dsl methods
-  collection :creations,    ObjectDsl, singular_name: 'create_mapping'
-  collection :updates,      ObjectDsl, singular_name: 'update_mapping'
-  collection :deletions,    ObjectDsl, singular_name: 'delete_mapping'
-  magic      :alias_to,     Array,     of: Symbol, default: []
-  magic      :remove_alias, Array,     of: Symbol, default: []
+  collection :creations,      ObjectDsl, singular_name: 'create_mapping'
+  collection :updates,        ObjectDsl, singular_name: 'update_mapping'
+  collection :deletions,      ObjectDsl, singular_name: 'delete_mapping'
+  collection :add_aliases,    Whatever,  singular_name: 'alias_to'
+  collection :remove_aliases, Whatever,  singular_name: 'remove_alias'
     
   # Additional index-level settings
   magic      :number_of_replicas, Integer
@@ -92,14 +92,12 @@ class IndexDsl < EsMigrationDsl
     obj
   end
 
-  def receive_alias_to params
-    params.each{ |als| operation_list << alias_index_op(:add, self.name, als) }
-    super(params)
+  def receive_alias_to(attrs, &block)
+    operation_list << alias_index_op(:add, self.name, attrs[:name], attrs[:filter])
   end
-
-  def receive_remove_alias params
-    params.each{ |als| operation_list << alias_index_op(:remove, self.name, als) }
-    super(params)
+  
+  def receive_remove_alias(attrs, &block)
+    operation_list << alias_index_op(:remove, self.name, attrs[:name], attrs[:filter])
   end
 
   def index_settings

data/lib/wukong-migrate/elasticsearch_operations.rb

@@ -59,11 +59,12 @@ class EsHttpOperation
   class AliasIndex < EsHttpOperation
     field :alias_name, String
     field :action,     Symbol
+    field :filter,     Hash
     
-    def path() '/_aliases?'                                                    ; end
-    def body() { actions: [{ action => { index: index, alias: alias_name } }]} ; end 
-    def verb() :post                                                           ; end
-    def info() "#{action.capitalize} alias :#{alias_name} for index #{index}"  ; end
+    def path() '/_aliases?'                                                                                  ; end
+    def body() { actions: [{ action => { index: index, alias: alias_name, filter: filter }.compact_blank }]} ; end 
+    def verb() :post                                                                                         ; end
+    def info() "#{action.capitalize} alias :#{alias_name} for index #{index}"                                ; end
   end
   
   class UpdateIndexMapping < EsHttpOperation
@@ -93,8 +94,8 @@ class EsHttpOperation
       UpdateIndexMapping.receive(index: index, obj_type: obj_type, mapping: mapping)
     end
     
-    def alias_index_op (action, index, als)
-      AliasIndex.receive(action: action, index: index, alias_name: als)
+    def alias_index_op (action, index, als, filter)
+      AliasIndex.receive({ action: action, index: index, alias_name: als, filter: filter }.compact_blank)
     end    
   end
 end

data/lib/wukong-migrate/version.rb

@@ -1,5 +1,5 @@
 module Wukong
   module Migrate
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/wukong-migrate/elasticsearch_migration_spec.rb

@@ -36,13 +36,12 @@ describe EsMigration do
     it 'handles alias operations last' do
       m = subject.new do
         create_index(:foo) do
-          alias_to [:superfoo, :superbar]
+          alias_to :superfoo, filter: {}
         end
         delete_index(:bar)
       end.combined_operations.should eq([delete_index_op('bar'),
                                          create_index_op('foo', {}),
-                                         alias_index_op('add', 'foo', 'superfoo'),
-                                         alias_index_op('add', 'foo', 'superbar')])
+                                         alias_index_op('add', 'foo', 'superfoo', {})])
     end
     
     it 'handles mapping operations' do 

data/spec/wukong-migrate/elasticsearch_operations_spec.rb

@@ -52,14 +52,14 @@ describe 'EsHttpOperation' do
   end
 
   context EsHttpOperation::AliasIndex do
-    subject{ described_class.receive(index: 'foo', alias_name: 'bar', action: 'add') }
+    subject{ described_class.receive(index: 'foo', alias_name: 'bar', action: 'add', filter: { term: { foo: 'bar' }}) }
 
     its(:path) { should eq('/_aliases?')                                          }
-    its(:body) { should eq({ actions: [{ add: { index: 'foo', alias: 'bar' } }]}) }
+    its(:body) { should eq({ actions: [{ add: { index: 'foo', alias: 'bar', filter: { term: { foo: 'bar' } } } }]}) }
     its(:verb) { should eq(:post)                                                 }
     its(:info) { should eq('Add alias :bar for index foo')                        }
     its(:raw_curl_string) do
-      should eq("curl -X POST 'http://localhost:9200/_aliases?' -d '{\"actions\":[{\"add\":{\"index\":\"foo\",\"alias\":\"bar\"}}]}'")
+      should eq("curl -X POST 'http://localhost:9200/_aliases?' -d '{\"actions\":[{\"add\":{\"index\":\"foo\",\"alias\":\"bar\",\"filter\":{\"term\":{\"foo\":\"bar\"}}}}]}'")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wukong-migrate
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Travis Dempsey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wukong-deploy