waistband 0.11.3 → 0.12.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzlmMDdlZjQ0NjdhZDIwNjhkNDlkM2QzYTdlMmY2ZTJhMjg4YWIxNw==
+    MGU3NDk1NDE4OWM5NDYzNjY3ODNhMzc1NTJkOTJhMWVjNWU3OWM5Mg==
   data.tar.gz: !binary |-
-    NWQ4M2ZiYTM5MjQ1NDBkYWYzMjM0ZTNmODFlNzcxMWMwNDRlMDAyZA==
+    NjBiNzhmMWVjZTRjYzM1NzI4ODViMTg4NWIxYTdmMzViZjNjZjE3NA==
 SHA512:
   metadata.gz: !binary |-
-    ZjRmZDU0NzBiZWU1ZjYzMzg1MGIyOWJjNDU2MzQxZDIzMDIwNzNjYWJhZmFj
-    NWFlZDdjZTYwNmE4MzI2ZDcwMTIwNWVlNjUyYzMyNDQ5NjY0NTI3NmU0ZmRl
-    ZjNiOWI3NzhlZjJmZjc0MzUxMjVmN2RlNTg0OTc0ZjE3ZTU4ODU=
+    NTk5NDk4NDVjNzM3ZDg1YzU0ZWJlMjk1MmJjYTkwY2Q0NGI1MTE0YTI1MDdk
+    YTMxMmE5YzZkY2ZmMzk3NzhlNDFiYmJjZDYyNzQ4ZmZkZmQzNGQ0MDE1ZWQz
+    NTI5OTA0YzA1MGUzZjQzZTNmOTFkOWU0MzdmMGRmODI1ZGQ0MDg=
   data.tar.gz: !binary |-
-    MzYzYzY4NmU4ZDcwOWYyMjZkMDNjYmQ4YzJlZWZmNjRmOGU2ZjQwODNmNzk3
-    MGQxOWM2ZjNmNWJhNTg5MmNmNjVlYWFjOWY0YThhMGNmYjYxZjA0ZWM4MjU2
-    YWNmZjRhYzVhZDdiM2VkNTU5ZTUxOGI1NTg5ZTgyOTA0MTJhNTQ=
+    NDJjMmFkZTAwMTk1ZTcxZDI3OTMyNTYwNzk3ZjUwNGQ2NmEzYmZlNzljNzY4
+    MTczM2U0MTc0ODUwZDNjOGY5ZTBhYTE4NGQzNDA1NjQwYmI1MTlmODhkZmU2
+    N2MwY2E2N2E0MWJmNWRkZTMwNTk1YTMyNTU5NjBhOTU0NTliNjY=

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 
 gem 'rspec', '~> 3.0.0'
 gem 'debugger', '~> 1.6.8'
-gem 'kaminari', '~> 0.16.1', require: false
+gem 'kaminari', require: false
 gem 'timecop', '~> 0.7.1'

data/lib/waistband/configuration.rb

@@ -23,23 +23,15 @@ module Waistband
       raise "Please define a valid `config_dir` configuration variable!"  unless config_dir
       raise "Couldn't find configuration directory #{config_dir}"         unless File.exist?(config_dir)
 
-      @env ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
-      if defined?(ERB)
-        yml = YAML.load(ERB.new(File.read("#{config_dir}/waistband.yml")).result)
-      else
-        yml = YAML.load_file("#{config_dir}/waistband.yml")
-      end
-      @yml_config   = yml[@env].with_indifferent_access
-      @adapter      = @yml_config.delete('adapter')
+      @env         ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+      yml            = load_yml_with_erb(File.join(config_dir, 'waistband.yml'))
+      @yml_config    = yml[@env].with_indifferent_access
+      @adapter       = @yml_config.delete('adapter')
     end
 
     def index(name)
       return @indexes[name] if @indexes[name]
-      if defined?(ERB)
-        yml = YAML.load(ERB.new(File.read("#{config_dir}/waistband_#{name}.yml")).result)
-      else
-        yml = YAML.load_file("#{config_dir}/waistband_#{name}.yml")
-      end
+      yml = load_yml_with_erb(File.join(config_dir, "waistband_#{name}.yml"))
       @indexes[name] = yml[@env].with_indifferent_access
     end
 
@@ -78,6 +70,14 @@ module Waistband
 
     private
 
+      def load_yml_with_erb(file)
+        if defined?(ERB)
+          YAML.load(ERB.new(File.read(file)).result)
+        else
+          YAML.load_file(file)
+        end
+      end
+
       def timeout
         return @timeout if defined? @timeout
         @yml_config['timeout']

data/lib/waistband/index.rb

@@ -1,6 +1,8 @@
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/try'
 require 'elasticsearch'
 
 module Waistband
@@ -33,6 +35,12 @@ module Waistband
       client.indices.refresh index: config_name
     end
 
+    def update_all_mappings
+      responses = types.map do |type|
+        update_mapping(type).merge('_type' => type)
+      end
+    end
+
     def update_mapping(type)
       client.indices.put_mapping(
         index: config_name,
@@ -55,8 +63,10 @@ module Waistband
     end
 
     def create!
-      raise ::Waistband::Errors::IndexExists.new("Index already exists") if exists?
       client.indices.create index: config_name, body: config.except('name', 'stringify')
+    rescue Elasticsearch::Transport::Transport::Errors::BadRequest => ex
+      raise ex unless ex.message.to_s =~ /IndexAlreadyExistsException/
+      raise ::Waistband::Errors::IndexExists.new("Index already exists")
     end
 
     def delete
@@ -66,8 +76,10 @@ module Waistband
     end
 
     def delete!
-      raise ::Waistband::Errors::IndexNotFound.new("Index not found") unless exists?
       client.indices.delete index: config_name
+    rescue Elasticsearch::Transport::Transport::Errors::NotFound => ex
+      raise ex unless ex.message.to_s =~ /IndexMissingException/
+      raise ::Waistband::Errors::IndexNotFound.new("Index not found")
     end
 
     def save(*args)
@@ -99,6 +111,17 @@ module Waistband
       doc['_source']
     end
 
+    def read_result(id, options = {})
+      read_result!(id, options)
+    rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      nil
+    end
+
+    def read_result!(id, options = {})
+      hit = read!(id, options)
+      ::Waistband::Result.new(hit)
+    end
+
     def read(id, options = {})
       read!(id, options)
     rescue Elasticsearch::Transport::Transport::Errors::NotFound
@@ -218,6 +241,10 @@ module Waistband
         data
       end
 
+      def types
+        config.try(:[], 'mappings').try(:keys) || []
+      end
+
       def default_type_name
         @index_name.singularize
       end

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.11.3"
+  VERSION = "0.12.1"
 end

data/spec/lib/index_spec.rb

@@ -18,6 +18,22 @@ describe Waistband::Index do
     expect{ index.refresh }.to_not raise_error
   end
 
+  it "blows up when trying to create an existing index" do
+    index.delete!
+    expect{ index.refresh }.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
+
+    expect{ index.create! }.to_not raise_error
+    expect{ index.create! }.to raise_error(::Waistband::Errors::IndexExists, "Index already exists")
+  end
+
+  it "doesn't blow up on creation when using the non-bang method" do
+    index.delete!
+    expect{ index.refresh }.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
+
+    expect{ index.create! }.to_not raise_error
+    expect{ index.create }.to_not raise_error
+  end
+
   it "deletes the index" do
     index.delete!
     expect{ index.refresh }.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
@@ -35,6 +51,16 @@ describe Waistband::Index do
     expect(response['acknowledged']).to be true
   end
 
+  it "updates all mappings" do
+    index.refresh
+    responses = index.update_all_mappings
+    expect(responses).to be_an Array
+
+    response = responses.first
+    expect(response['acknowledged']).to be true
+    expect(response['_type']).to eql 'event'
+  end
+
   it "updates the index's settings" do
     index.refresh
     response = index.update_settings
@@ -96,6 +122,16 @@ describe Waistband::Index do
       expect(index2.read('__test_write')[:_source]).to  eql({'data' => 'index_2'})
     end
 
+    it "finds a result instead of a hash" do
+      index.save('__test_write', attrs)
+      result = index.read_result!('__test_write')
+
+      expect(result).to be_present
+      expect(result).to be_a Waistband::Result
+      expect(result._id).to eql '__test_write'
+      expect(result.ok).to eql '{"yeah"=>true}'
+    end
+
   end
 
   describe 'paginating search results' do

data/waistband.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport',  '>= 3.0.0'
-  spec.add_dependency 'elasticsearch',  '>= 1.0.0'
-  spec.add_dependency 'json',           '~> 1.8.0'
+  spec.add_dependency 'activesupport',  '>= 3.0'
+  spec.add_dependency 'elasticsearch',  '~> 1.0'
+  spec.add_dependency 'json',           '~> 1.8'
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake",    "~> 10.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.1
 platform: ruby
 authors:
 - David Jairala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 description: Handles configuration, index creation, quality of life, etc, of Elastic
   Search in Ruby
 email: