flex 0.3.1 → 0.4.0

data/README.md

@@ -2,14 +2,16 @@
 
 Flex is a complete ruby client for [ElasticSearch](http://www.elasticsearch.org). It introduces a new way to send any kind of request (not just search queries) to the ES server, and to manage any kind of response. You can transparently integrate it with **ActiveRecord** and **Mongoid** models with or without automatic synchronization, with or without **Rails**. It is fast and efficient, easy to use and customize.
 
-Flex is currently a very new project, however it is already used in production in 5 sites, and it will be deployed to a few others soon.
-
 ## Useful Links
 
 * [Documentation](./flex/wiki)
 * [Issues](./flex/issues)
 * [Pull Requests](./flex/pulls)
 
+## Branches
+
+The master branch reflects the last published gem. Then you may find a next-version branch (named after the version string), with the commits that will be merged in master just before publishing the next gem version. The next-version branch may get rebased or force pushed.
+
 ## Credits
 
 Special thanks for their sponsorship to [Escalate Media](http://www.escalatemedia.com) and [Barquin International](http://www.barquin.com).

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/bin/flexes

@@ -0,0 +1,174 @@
+#! /usr/bin/env ruby
+
+require 'optparse'
+require 'flex'
+
+options  = { }
+version  = File.read(File.expand_path('../../VERSION', __FILE__)).strip
+copy     = "flexes #{version} (c) 2012 Domizio Demichelis"
+optparse = OptionParser.new do |opts|
+
+  opts.banner = <<-banner
+
+    FlexEs:
+        Flex tool to dump/load data from/to ElasticSearch.
+    Usage:
+        flexes <command> [options]
+    <command>:
+        dump   dumps the data from one or more ElasticSearch indices
+        load   loads a dumpfile
+        stats  prints the full ElasticSearch stats
+
+    Notice: The load command will load the dump-file into ElasticSearch without removing any pre-existent data.
+            If you need fresh indices, use the flex:delete_indices and flex:create_indices rake tasks from your
+            application, which will also recreate the mapping.
+  banner
+
+
+  opts.separator ''
+  opts.separator 'Common options:'
+
+  options[:file] = './flexes.dump'
+  opts.on( '-f', '--file [FILE]', "The path of the dumpfile (default: '#{options[:file]}')" ) do |f|
+    options[:file] = f
+  end
+
+  opts.separator ''
+  opts.separator 'Dump options:'
+
+  options[:index] = nil
+  opts.on( '-i', '--index [INDEX_OR_INDICES]', Array, 'The index or comma separated indices to dump (default: all indices)' ) do |i|
+    options[:index] = i
+  end
+
+  options[:type] = nil
+  opts.on( '-t', '--type [TYPE_OR_TYPES]', Array, 'The type or comma separated types to dump (default: all types)' ) do |t|
+    options[:type] = t
+  end
+
+  options[:scroll] = '5m'
+  opts.on( '-s', '--scroll [TIME]', "The ElasticSearch scroll time (default: #{options[:scroll]})" ) do |s|
+    options[:scroll] = s
+  end
+
+  options[:size] = 50
+  opts.on( '-z', '--size [SIZE]', Integer, "The chunk size to dump per shard (default: #{options[:size]} * number of shards)" ) do |z|
+    options[:size] = z
+  end
+
+  opts.separator ''
+  opts.separator 'Load options:'
+
+  options[:timeout] = 20
+  opts.on( '-o', '--timeout [SECONDS]', Integer, "The http_client timeout for bulk loading (default: #{options[:timeout]} seconds)" ) do |o|
+    options[:timeout] = o
+  end
+
+  options[:batch_size] = 1000
+  opts.on( '-b', '--batch_size [BATCH_SIZE]', Integer, "The batch size to load (default: #{options[:batch_size]})" ) do |z|
+    options[:size] = z
+  end
+
+  opts.separator ''
+  opts.separator 'Other options:'
+
+  opts.on( '-v', '--version', 'Shows the version and exits' ) do
+    puts version
+    exit
+  end
+
+  opts.on_tail( '-h', '--help', 'Displays this screen' ) do
+    puts copy
+    puts opts
+    exit
+  end
+
+end
+
+optparse.parse!
+command = ARGV.first
+exec "#{$0} -h" if command.nil?
+puts copy
+
+case command
+
+when 'dump'
+  search_t    = Flex::Template::Search.new( {:query => {:match_all => {}}},
+                                            :params => { :search_type => 'scan',
+                                                         :scroll      => options[:scroll],
+                                                         :size        => options[:size],
+                                                         :fields      => '_source,*' } )
+  scroll_t    = Flex::Template.new( :get,
+                                    '/_search/scroll',
+                                    nil,
+                                    :params => { :scroll => options[:scroll] } )
+  search_res  = search_t.render options
+  scroll_id   = search_res['_scroll_id']
+  total_hits  = search_res['hits']['total']
+  total_count = 0
+  pbar        = Flex::ProgBar.new(total_hits)
+  dump_stats  = Hash.new { |hash, key| hash[key] = Hash.new{|h,k| h[k] = 0} }
+  file_size   = 0
+  File.open(options[:file], 'wb') do |file|
+    while (result = scroll_t.render(:data => scroll_id)) do
+      break if result['hits']['hits'] == []
+      lines = result['hits']['hits'].map do |h|
+                dump_stats[h['_index']][h['_type']] += 1
+                meta = { :_index => h['_index'],
+                         :_type  => h['_type'],
+                         :_id    => h['_id'] }
+                if h.has_key?('fields')
+                  h['fields'].each do |k,v|
+                    meta[k] = v if k[0] == '_'
+                  end
+                end
+                [ MultiJson.encode({'index' => meta}),
+                  MultiJson.encode(h['_source']) ].join("\n")
+              end
+      file.puts lines.join("\n")
+      scroll_id = result['_scroll_id']
+      total_count += lines.size
+      pbar.pbar.inc(lines.size)
+    end
+    file_size = file.size
+  end
+  formatted_file_size = file_size.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse
+  pbar.pbar.finish
+  puts "\n***** WARNING: Expected document to dump: #{total_hits}, dumped: #{total_count}. *****" \
+       unless total_hits == total_count
+  puts "\nDumped #{total_count} documents to #{options[:file]} (size: #{formatted_file_size} bytes)"
+  puts dump_stats.to_yaml
+
+when 'load'
+  Flex::Configuration.http_client_options[:timeout] = options[:timeout]
+  chunk_size = options[:batch_size] * 2    # 2 lines per doc
+  lines      = ''
+  line_count = 0
+  file       = File.open(options[:file])
+  file.lines{ line_count += 1 }
+  file.rewind
+  pbar = Flex::ProgBar.new(line_count / 2, options[:batch_size])
+  file.lines do |line|
+    lines << line
+    if file.lineno % chunk_size == 0
+      result = Flex.bulk :lines => lines
+      lines  = ''
+      pbar.process_result(result, options[:batch_size])
+    end
+  end
+  # last chunk
+  unless lines == ''
+    result = Flex.bulk :lines => lines
+    pbar.process_result(result, (file.lineno % chunk_size) / 2)
+  end
+  file.close
+  pbar.finish
+
+when 'stats'
+  puts '>> puts Flex.stats.to_yaml'
+  puts Flex.stats.to_yaml
+
+else
+  puts "unknown command: #{command.inspect}"
+
+end

data/flex.gemspec

@@ -4,11 +4,12 @@ Gem::Specification.new do |s|
   s.name                      = 'flex'
   s.summary                   = 'Ruby Client for ElasticSearch'
   s.description               = <<-desc
-Flex is an innovative ruby client for ElasticSearch. With Flex your code will be clean, easy to write and read, and very short: "poetic-short". Flex is fast and efficient, easy to use and customize, and offers ActiveRecord, MongoId and Rails integration.
+Flex is an innovative ruby client for ElasticSearch. With Flex your code will be clean, easy to write and read, and very short: "poetic-short". Flex is fast and efficient, easy to use and customize, and offers ActiveRecord, Mongoid and Rails integration.
   desc
   s.homepage                  = 'http://github.com/ddnexus/flex'
   s.authors                   = ["Domizio Demichelis"]
   s.email                     = 'dd.nexus@gmail.com'
+  s.executables               = ['flexes']
   s.extra_rdoc_files          = %w[README.md]
   s.require_paths             = %w[lib]
   s.files                     = `git ls-files -z`.split("\0")
@@ -19,7 +20,7 @@ Flex is an innovative ruby client for ElasticSearch. With Flex your code will be
   s.post_install_message      = <<EOM
 ________________________________________________________________________________
 
-                              INSTALLATION NOTES
+                             FLEX INSTALLATION NOTES
 ________________________________________________________________________________
 
 In order to use Flex, a supported http-client must be installed on this system.

data/lib/flex.rb

@@ -48,6 +48,9 @@ require 'flex/http_clients/rest_client'
 require 'flex/configuration'
 require 'flex/utility_methods'
 
+require 'progressbar'
+require 'flex/prog_bar'
+
 module Flex
 
   VERSION  = File.read(File.expand_path('../../VERSION', __FILE__)).strip

data/lib/flex/configuration.rb

@@ -44,13 +44,13 @@ module Flex
                              :logger              => Logger.new(STDERR),
                              :variables           => Variables.new( :index      => nil,
                                                                     :type       => nil,
-                                                                    :no_pruning => %w[match_all] ),
+                                                                    :no_pruning => [] ),
                              :flex_models         => [],
                              :config_file         => './config/flex.yml',
                              :flex_dir            => './flex',
                              :http_client         => load_http_client,
                              :http_client_options => {},
-                             :debug               => true,
+                             :debug               => false,
                              :debug_result        => true,
                              :debug_to_curl       => false,
                              :raise_proc          => proc{|response| response.status >= 400}

data/lib/flex/instance_proxy/model.rb

@@ -28,7 +28,8 @@ module Flex
 
       def parent_instance(raise=true)
         return unless is_child?
-        @parent_instance ||= instance.send(class_flex.parent_association) || raise && raise(MissingParentError, "missing parent instance for document #{instance.inspect}.")
+        @parent_instance ||= instance.send(class_flex.parent_association) || raise &&
+                               raise(MissingParentError, "missing parent instance for document #{instance.inspect}.")
       end
 
       # helper that iterates through the parent record chain
@@ -81,7 +82,7 @@ module Flex
 
       private
 
-      BASE62_DIGITS = %w(0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z)
+      BASE62_DIGITS = ('0'..'9').to_a + ('A'..'Z').to_a + ('a'..'z').to_a
 
       def create_routing
         string    = [index, type, id].join

data/lib/flex/manager.rb

@@ -12,7 +12,7 @@ module Flex
 
     # arrays of all the types
     def types
-      type_class_map.keys.map{|k| k.split('/').last}
+      @types ||= Configuration.flex_models.map {|m| (m.is_a?(String) ? eval("::#{m}") : m).flex.type }.flatten
     end
 
     # sets the default parent/child mappings and merges with the config_file

data/lib/flex/prog_bar.rb

@@ -0,0 +1,34 @@
+module Flex
+  class ProgBar
+
+    attr_reader :pbar
+
+    def initialize(total_count, batch_size=nil, prefix_message=nil)
+      @total_count      = total_count
+      @successful_count = 0
+      @failed_count     = 0
+      @pbar             = ::ProgressBar.new('processing...', total_count)
+      @pbar.clear
+      @pbar.bar_mark = '|'
+      puts '_' * @pbar.send(:get_term_width)
+      message = "#{prefix_message}Processing #{total_count} documents"
+      message << " in batches of #{batch_size}:" unless batch_size.nil?
+      puts message
+      @pbar.send(:show)
+    end
+
+    def process_result(result, inc)
+      Configuration.logger.error "[FLEX] Failed load:\n#{result.failed.to_yaml}" unless result.failed.size == 0
+      @failed_count     += result.failed.size
+      @successful_count += result.successful.size
+      @pbar.inc(inc)
+    end
+
+    def finish
+      @pbar.finish
+      puts "Processed #{@total_count}. Successful #{@successful_count}. Skipped #{@total_count - @successful_count - @failed_count}. Failed #{@failed_count}."
+      puts "See the log for the details about the failed import." unless @failed_count == 0
+    end
+
+  end
+end

data/lib/flex/rails.rb

@@ -2,11 +2,12 @@ require 'flex'
 require 'rails'
 require 'flex/rails/helper'
 
-if ::Rails.respond_to?(:version) && ::Rails.version.to_i == 3
+if ::Rails.respond_to?(:version) && ::Rails.version.to_i >= 3
   require 'flex/rails/engine'
 else
   Flex::Configuration.configure do |c|
     c.config_file = ::Rails.root.join('config', 'flex.yml').to_s
     c.flex_dir    = ::Rails.root.join('app', 'flex').to_s
+    c.debug       = ::Rails.env.development?
   end
 end

data/lib/flex/rails/engine.rb

@@ -3,11 +3,11 @@ module Flex
     class Engine < ::Rails::Engine
 
       ActiveSupport.on_load(:before_configuration) do
-        Flex::Configuration.configure do |c|
-          c.variables[:index] = [self.class.name.split('::').first.underscore, ::Rails.env].join('_')
-          c.config_file       = ::Rails.root.join('config', 'flex.yml').to_s
-          c.flex_dir          = ::Rails.root.join('app', 'flex').to_s
-        end
+        config.flex = Flex::Configuration
+        config.flex.variables[:index] = [self.class.name.split('::').first.underscore, ::Rails.env].join('_')
+        config.flex.config_file       = ::Rails.root.join('config', 'flex.yml').to_s
+        config.flex.flex_dir          = ::Rails.root.join('app', 'flex').to_s
+        config.flex.debug             = ::Rails.env.development?
       end
 
       ActiveSupport.on_load(:after_initialize) do

data/lib/flex/tasks.rb

@@ -16,8 +16,6 @@ module Flex
     end
 
     def import_models
-      require 'progressbar'
-
       Configuration.http_client_options[:timeout]   = ENV['TIMEOUT'].to_i if ENV['TIMEOUT']
       Configuration.http_client_options[:timeout] ||= 20
       Configuration.debug = !!ENV['FLEX_DEBUG']
@@ -29,7 +27,7 @@ module Flex
           options[k.to_sym] = v
         end
       end
-      deleted    = []
+      deleted = []
 
       models.each do |klass|
         index = klass.flex.index
@@ -60,37 +58,19 @@ module Flex
           next
         end
 
-        total_count      = klass.count
-        successful_count = 0
-        failed           = []
-
-        pbar = ProgressBar.new('processing...', total_count)
-        pbar.clear
-        pbar.bar_mark = '|'
-        puts '_' * pbar.send(:get_term_width)
-        puts "Class #{klass}: indexing #{total_count} documents in batches of #{batch_size}:\n"
-        pbar.send(:show)
+        pbar = ProgBar.new(klass.count, batch_size, "Class #{klass}: ")
 
         klass.find_in_batches(:batch_size => batch_size) do |array|
-          opts = {:index => index}.merge(options)
+          opts   = {:index => index}.merge(options)
           result = Flex.import_collection(array, opts) || next
-          f = result.failed
-          failed += f
-          successful_count += result.successful.count
-          pbar.inc(array.size)
+          pbar.process_result(result, array.size)
         end
 
         pbar.finish
-        puts "Processed #{total_count}. Successful #{successful_count}. Skipped #{total_count - successful_count - failed.size}. Failed #{failed.size}."
-
-        if failed.size > 0
-          puts 'Failed imports:'
-          puts failed.to_yaml
-        end
       end
     end
 
-  private
+    private
 
     def indices
       indices = ENV['INDICES'] || struct.keys
@@ -138,4 +118,5 @@ module Flex
     end
 
   end
+
 end

data/lib/flex/template.rb

@@ -1,6 +1,8 @@
 module Flex
+
   # Generic Flex::Template object.
-  # This class represents a generic Flex::Template object. It is used as the base class by all the more specific Flex::Template::* classes.
+  # This class represents a generic Flex::Template object.
+  # It is used as the base class by all the more specific Flex::Template::* classes.
   # You  usually don't need to instantiate this class manually, since it is usually used internally.
   # For more details about templates, see the documentation.
   class Template
@@ -69,8 +71,9 @@ module Flex
 
     rescue NameError => e
       if e.name == :request
-        raise MissingHttpClientError, 'you should install the gem "patron" (recommended for performances) or "rest-client", ' +
-                                      'or provide your own http-client interface and set Flex::Configuration.http_client'
+        raise MissingHttpClientError,
+              'you should install the gem "patron" (recommended for performances) or "rest-client", ' +
+              'or provide your own http-client interface and set Flex::Configuration.http_client'
       else
         raise
       end
@@ -142,40 +145,34 @@ module Flex
           merged = @variables.deep_merge sym_vars
           vars   = process_vars(merged)
           obj    = #{stringified}
+          obj    = prune(obj)
+          obj[:path].tr_s!('/', '/')     # removes empty path segments
           obj[:vars] = vars
-          obj    = prune(obj, vars[:no_pruning])
           obj
         end
       ruby
       interpolate(*args)
     end
 
-    # prunes the branch when the leaf is nil
-    # also removes empty path segments
+    # prunes the branch when the leaf is a PrunableObject
     # and compact.flatten the Array values
-    def prune(obj, no_pruning)
+    def prune(obj)
       case obj
       when Array
-        return if obj.empty?
+        return if obj.is_a?(PrunableObject)
         a = obj.map do |i|
-              next if i.nil?
-              prune(i, no_pruning)
+              next if i.is_a?(PrunableObject)
+              prune(i)
             end.compact.flatten
         a unless a.empty?
       when Hash
-        return if obj.empty?
+        return if obj.is_a?(PrunableObject)
+        return obj if obj.empty?
         h = {}
         obj.each do |k, v|
-          next if v.nil?
-          v = case
-              when k == :path
-                v.gsub(/\/+/, '/')
-              when no_pruning.include?(k)
-                v
-              else
-                prune(v, no_pruning)
-              end
-          h[k] = v unless v.nil?
+          pruned = prune(v)
+          next if pruned.is_a?(PrunableObject)
+          h[k] = pruned
         end
         h unless h.empty?
       else

data/lib/flex/template/base.rb

@@ -1,5 +1,8 @@
 module Flex
   class Template
+
+    module PrunableObject end
+
     module Base
 
       def process_vars(vars)
@@ -24,6 +27,14 @@ module Flex
         vars
       end
 
+      # extend obj with PrunableObject if it is nil or it is an empty Array or Hash
+      # called from stringified
+      def prunable(name, vars)
+        obj = vars[name]
+        return obj if vars[:no_pruning].include?(name)
+        (obj.nil? || obj == [] || obj == {}) ? obj.extend(PrunableObject) : obj
+      end
+
     end
   end
 end

data/lib/flex/template/info.rb

@@ -10,16 +10,33 @@ module Flex
           block = ''
           temp = templates[name]
           meth_call = [host_class, name].join('.')
-          block << "########## #{meth_call} ##########\n\n#{'-' * temp.class.to_s.length}\n#{temp.class}\n#{temp.to_flex(name)}\n"
+          block << <<-meth_call
+########## #{meth_call} ##########
+
+#{'-' * temp.class.to_s.length}
+#{temp.class}
+#{temp.to_flex(name)}
+meth_call
           temp.partials.each do |par_name|
             par = partials[par_name]
-            block << "#{'-' * par.class.to_s.length}\n#{par.class}\n#{par.to_flex(par_name)}\n"
+            block << <<-partial
+#{'-' * par.class.to_s.length}
+#{par.class}
+#{par.to_flex(par_name)}
+partial
           end
           block << "\nUsage:\n"
           block << usage(meth_call, temp)
           block << "\n "
           info  << block.split("\n").map{|l| '#  ' + l}.join("\n")
-          info  <<  "\ndef #{meth_call}(vars={})\n  # this is a stub, used for reference\nend\n\n\n"
+          info  <<  <<-meth
+
+def #{meth_call}(vars={})
+  ## this is a stub, used for reference
+end
+
+
+meth
         end
         info
       end
@@ -30,7 +47,8 @@ module Flex
         all_tags = temp.tags + temp.partials
         lines = all_tags.map do |t|
           comments = 'partial' if t.to_s.match(/^_/)
-          ['', t.to_s] + (temp.variables.has_key?(t) ? ["#{temp.variables[t].inspect},", comments_to_s(comments)] : ["#{t},", comments_to_s(comments, 'required')])
+          ['', t.to_s] + (temp.variables.has_key?(t) ? ["#{temp.variables[t].inspect},", comments_to_s(comments)] \
+                                                     : ["#{t},", comments_to_s(comments, 'required')])
         end
         lines.sort! { |a,b| b[3] <=> a[3] }
         lines.first[0] = meth_call

data/lib/flex/template/tags.rb

@@ -37,7 +37,7 @@ module Flex
       end
 
       def stringify(in_string)
-        in_string ? "\#{vars[:#{name}]}" : "vars[:#{name}]"
+        in_string ? "\#{prunable(:#{name}, vars)}" : "prunable(:#{name}, vars)"
       end
 
     end

data/lib/flex/utility_methods.rb

@@ -61,7 +61,7 @@ module Flex
                 m['_parent']  = parent if parent
                 routing       = get_routing(d)
                 m['_routing'] = routing if routing
-                line = {action => meta.merge(m)}.to_json
+                line = MultiJson.encode({action => meta.merge(m)})
                 line << "\n#{json}" unless action == 'delete'
                 line
               end.compact
@@ -94,7 +94,8 @@ module Flex
       case
       when d.respond_to?(:flex)  then d.flex.type
       when d.respond_to?(:_type) then d._type
-      when d.is_a?(Hash)         then d.delete(:_type) || d.delete('_type') || d.delete(:type) || d.delete('type')
+      when d.is_a?(Hash)         then d.delete(:_type) || d.delete('_type') ||
+                                      d.delete(:type)  || d.delete('type')
       when d.respond_to?(:type)  then d.type
       end
     end
@@ -104,7 +105,8 @@ module Flex
       when d.respond_to?(:flex) && d.flex.parent_instance(false) then d.flex.parent_instance.id
       when d.respond_to?(:_parent) then d._parent
       when d.respond_to?(:parent)  then d.parent
-      when d.is_a?(Hash)           then d.delete(:_parent) || d.delete('_parent') || d.delete(:parent) || d.delete('parent')
+      when d.is_a?(Hash)           then d.delete(:_parent) || d.delete('_parent') ||
+                                        d.delete(:parent)  || d.delete('parent')
       end
     end
 
@@ -113,13 +115,15 @@ module Flex
       when d.respond_to?(:flex) && d.flex.routing(false) then d.flex.routing
       when d.respond_to?(:_routing) then d._routing
       when d.respond_to?(:routing)  then d.routing
-      when d.is_a?(Hash)            then d.delete(:_routing) || d.delete('_routing') || d.delete(:routing) || d.delete('routing')
+      when d.is_a?(Hash)            then d.delete(:_routing) || d.delete('_routing') ||
+                                         d.delete(:routing)  || d.delete('routing')
       end
     end
 
     def get_id(d)
       case
-      when d.is_a?(Hash)      then  d.delete(:_id) || d.delete('_id') || d.delete(:id) || d.delete('id')
+      when d.is_a?(Hash)      then  d.delete(:_id) || d.delete('_id') ||
+                                    d.delete(:id)  || d.delete('id')
       when d.respond_to?(:id) then  d.id
       end
     end
@@ -128,6 +132,7 @@ module Flex
       case
       when d.respond_to?(:flex_source) then d.flex_source
       when d.respond_to?(:to_json)     then d.to_json
+      else MultiJson.encode(d)
       end
     end
 

data/lib/flex/utils.rb

@@ -22,7 +22,8 @@ module Flex
     end
 
     def erb_process(source)
-      ERB.new(File.read(source)).result
+      varname = "_flex_#{source.hash.to_s.tr('-', '_')}"
+      ERB.new(File.read(source), nil, nil, varname).result
     end
 
     def group_array_by(ary)

data/lib/generators/flex/setup/templates/flex_initializer.rb.erb

@@ -17,8 +17,8 @@ Flex::Configuration.configure do |config|
   # The custom url of your ElasticSearch server
   # config.base_uri = 'http://localhost:9200'
 
-  # Set it to false to skip the logging of the debug infos
-  # config.debug = true
+  # Set it to true to log the debug infos (true by default in development mode)
+  # config.debug = false
 
   # Debug info are actually valid curl commands
   # config.debug_to_curl = false

data/lib/tasks/index.rake

@@ -8,10 +8,10 @@ namespace :flex do
   desc 'imports from an ActiveRecord or Mongoid models'
   task(:import => env) { Flex::Tasks.import_models }
 
-  desc 'create indices from the Flex::Configuration.config_file file'
+  desc 'creates indices from the Flex::Configuration.config_file file'
   task(:create_indices => env) { Flex::Tasks.create_indices }
 
-  desc 'destroy indices in the Flex::Configuration.config_file file'
+  desc 'destroys indices in the Flex::Configuration.config_file file'
   task(:delete_indices => env) { Flex::Tasks.delete_indices }
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flex
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70249639384360 !ruby/object:Gem::Requirement
+  requirement: &70223266050660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70249639384360
+  version_requirements: *70223266050660
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70249639383900 !ruby/object:Gem::Requirement
+  requirement: &70223266050000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70249639383900
+  version_requirements: *70223266050000
 - !ruby/object:Gem::Dependency
   name: prompter
-  requirement: &70249639383440 !ruby/object:Gem::Requirement
+  requirement: &70223266049300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70249639383440
+  version_requirements: *70223266049300
 - !ruby/object:Gem::Dependency
   name: irt
-  requirement: &70249639382940 !ruby/object:Gem::Requirement
+  requirement: &70223266048620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.10
   type: :development
   prerelease: false
-  version_requirements: *70249639382940
+  version_requirements: *70223266048620
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &70249639382280 !ruby/object:Gem::Requirement
+  requirement: &70223266048160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.18
   type: :development
   prerelease: false
-  version_requirements: *70249639382280
+  version_requirements: *70223266048160
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70249639381640 !ruby/object:Gem::Requirement
+  requirement: &70223266047620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,15 +76,16 @@ dependencies:
         version: 1.6.7
   type: :development
   prerelease: false
-  version_requirements: *70249639381640
+  version_requirements: *70223266047620
 description: ! 'Flex is an innovative ruby client for ElasticSearch. With Flex your
   code will be clean, easy to write and read, and very short: "poetic-short". Flex
-  is fast and efficient, easy to use and customize, and offers ActiveRecord, MongoId
+  is fast and efficient, easy to use and customize, and offers ActiveRecord, Mongoid
   and Rails integration.
 
 '
 email: dd.nexus@gmail.com
-executables: []
+executables:
+- flexes
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -92,6 +93,7 @@ files:
 - LICENSE
 - README.md
 - VERSION
+- bin/flexes
 - flex.gemspec
 - lib/flex.rb
 - lib/flex/api_methods.yml
@@ -111,6 +113,7 @@ files:
 - lib/flex/logger.rb
 - lib/flex/manager.rb
 - lib/flex/model.rb
+- lib/flex/prog_bar.rb
 - lib/flex/rails.rb
 - lib/flex/rails/engine.rb
 - lib/flex/rails/helper.rb
@@ -149,7 +152,7 @@ files:
 homepage: http://github.com/ddnexus/flex
 licenses: []
 post_install_message: ! "________________________________________________________________________________\n\n
-  \                             INSTALLATION NOTES\n________________________________________________________________________________\n\nIn
+  \                            FLEX INSTALLATION NOTES\n________________________________________________________________________________\n\nIn
   order to use Flex, a supported http-client must be installed on this system.\n\nThe
   suported http-client gems are \"patron\" and \"rest-client\".\n\nYou should install
   \"patron\" (a libcurl based gem developed in C) for best\nperformances, or install