elastics-client 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/elastics-client.rb

@@ -9,6 +9,7 @@ require 'elastics/logger'
 require 'elastics/errors'
 require 'elastics/utils'
 
+require 'elastics/struct/mergeable'
 require 'elastics/struct/prunable'
 require 'elastics/struct/symbolize'
 require 'elastics/struct/hash'
@@ -41,6 +42,7 @@ require 'elastics/templates'
 
 require 'elastics/http_clients/base'
 require 'elastics/http_clients/loader'
+require 'elastics/indices'
 require 'elastics/configuration'
 require 'elastics/utility_methods'
 

data/lib/elastics/api_stubs.rb

@@ -428,10 +428,11 @@ module Elastics
     #  post_index_aliases:
     #  - POST
     #  - /_aliases
+    #  - actions: <<actions>>
     #
     #
     #  Usage:
-    #  Elastics.post_index_aliases
+    #  Elastics.post_index_aliases :actions => actions
     #
     def Elastics.post_index_aliases(*vars)
       ## this is a stub, used for reference

data/lib/elastics/configuration.rb

@@ -20,6 +20,11 @@ module Elastics
     def configure
       yield self
     end
+
+    def indices
+      @indices ||= Indices.new(config_file)
+    end
+    
     # force color in console (used with jruby)
     def ansi=(bool)
       Dye.color = bool

data/lib/elastics/indices.rb

@@ -0,0 +1,28 @@
+module Elastics
+  class Indices < Hash
+
+    extend Struct::Mergeable
+
+    def initialize(config_path)
+      hash = YAML.load(Utils.erb_process(config_path))
+      replace Utils.delete_allcaps_keys(hash)
+    end
+
+    def create_index(index, name=nil, opts={})
+      name ||= index
+      Elastics.PUT name, self[index], opts
+    end
+
+    def create_indices(indices=keys, opts={})
+      indices.each{|i| create_index(i, i, opts)}
+    end
+
+    def delete_indices(indices=keys, opts={})
+      indices.each do |i|
+        args = {:index=>i}.merge(opts)
+        Elastics.delete_index(args)
+      end
+    end
+
+  end
+end

data/lib/elastics/struct/mergeable.rb

@@ -0,0 +1,38 @@
+module Elastics
+  module Struct
+    # allows deep merge between Hashes
+    module Mergeable
+
+      def deep_merge(*hashes)
+        merged = deep_dup
+        hashes.each {|h2| merged.replace(deep_merge_hash(merged,h2))}
+        merged
+      end
+
+      def deep_merge!(*hashes)
+        replace deep_merge(*hashes)
+      end
+
+      def deep_dup
+        Marshal.load(Marshal.dump(self))
+      end
+
+  private
+
+      def deep_merge_hash(h1, h2)
+        h2 ||= {}
+        h1.merge(h2) do |key, oldval, newval|
+          case
+          when oldval.is_a?(::Hash) && newval.is_a?(::Hash)
+            deep_merge_hash(oldval, newval)
+          when oldval.is_a?(::Array) && newval.is_a?(::Array)
+              oldval + newval
+          else
+            newval
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/elastics/tasks.rb

@@ -10,53 +10,18 @@ module Elastics
     end
 
     def default_options
-      @default_options ||= { :force          => false,
-                             :index          => Conf.variables[:index],
-                             :config_file    => Conf.config_file }
+      @default_options ||= { :force => false,
+                             :index => Conf.indices.keys }
     end
 
     def create_indices
-      indices.each do |index|
-        delete_index(index) if options[:force]
-        raise ExistingIndexError, "#{index.inspect} already exists. Please use FORCE=1 if you want to delete it first." \
-              if exist?(index)
-        create(index)
-      end
+      Conf.indices.delete_indices(options[:index]) if options[:force]
+      Conf.indices.create_indices(options[:index])
     end
 
     def delete_indices
-      indices.each { |index| delete_index(index) }
-    end
-
-    def config_hash
-      @config_hash ||= ( hash = YAML.load(Utils.erb_process(config_path))
-                         Utils.delete_allcaps_keys(hash) )
-    end
-
-  private
-
-    def indices
-      i = options[:index] || config_hash.keys
-      i.is_a?(Array) ? i : [i]
-    end
-
-    def exist?(index)
-      Elastics.exist?(:index => index)
-    end
-
-    def config_path
-      @config_path ||= options[:config_file] || Conf.config_file
-    end
-
-    def delete_index(index)
-      Elastics.delete_index(:index => index) if exist?(index)
-    end
-
-    def create(index)
-      config_hash[index] = {} unless config_hash.has_key?(index)
-      Elastics.POST "/#{index}", config_hash[index]
+      Conf.indices.delete_indices(options[:index])
     end
 
   end
-
 end

data/lib/tasks.rake

@@ -1,6 +1,6 @@
 require 'elastics-client'
 
-env   = defined?(Rails) ? :environment : []
+env = defined?(Rails) ? :environment : []
 
 namespace :elastics do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastics-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -103,6 +103,7 @@ files:
 - lib/elastics/http_clients/loader.rb
 - lib/elastics/http_clients/patron.rb
 - lib/elastics/http_clients/rest_client.rb
+- lib/elastics/indices.rb
 - lib/elastics/logger.rb
 - lib/elastics/prog_bar.rb
 - lib/elastics/result.rb
@@ -112,6 +113,7 @@ files:
 - lib/elastics/result/search.rb
 - lib/elastics/struct/array.rb
 - lib/elastics/struct/hash.rb
+- lib/elastics/struct/mergeable.rb
 - lib/elastics/struct/paginable.rb
 - lib/elastics/struct/prunable.rb
 - lib/elastics/struct/symbolize.rb