chewy 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 751edf8eb80e8e5a9f2eaf9dc2d1a1e639427a91
-  data.tar.gz: 985d1dd1398d00df7f922cf9147cae1a006f9ca0
+  metadata.gz: 12e0c49636421098824baf242c46477ec44a1253
+  data.tar.gz: d8861ffbacc81ec75d4c9a40b36ec19b345ef3aa
 SHA512:
-  metadata.gz: bf632b85c2b0849ef88b549a170deca5d2ac39f2ec6822eabc7f5bd2d9d3c86ccbca2199bdae3ae72990e59f1de8945aee4547b0efe6b84ae789435895af9c10
-  data.tar.gz: 787052a2a10499f4b0dba7b68292a7a300616cc170c34e264d821e862fe69553bf61ef1fe9c5d9c6419d6b720fd3673b1cbd564c0011119261ed8e80beff600a
+  metadata.gz: a29788d87989658ea5a7017554217b21bfdf6a52c7486a740c977261f5a095b591d5f4f352bb1ccbe5f8a26c74f8e355c0f4c2ce4b896a3a71cdb6106974434f
+  data.tar.gz: cffc378f5fe51f0a9507c43315491f005b6f1ad9d993946786583a54df95b44bcba56483d186c6356d2fef2168dc692979146a900b8c33870782eb84cc4c6cb6

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # master
 
+# Version 0.6.2
+
+## Changes
+
+  * document root id custom value option (@baronworks)
+
+## Bugfixes
+
+  * Removed decay function defaults (@Linuus)
+
+  * Correct config file handling in case of empty file
+
 # Version 0.6.1
 
 ## Changes

data/chewy.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['kinwizard@gmail.com']
   spec.summary       = %q{Elasticsearch ODM client wrapper}
   spec.description   = %q{Chewy provides functionality for Elasticsearch index handling, documents import mappings and chainable query DSL}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/toptal/chewy'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

data/lib/chewy/config.rb

@@ -174,7 +174,8 @@ module Chewy
 
           if File.exists?(file)
             yaml = ERB.new(File.read(file)).result
-            YAML.load(yaml)[Rails.env].try(:deep_symbolize_keys)
+            hash = YAML.load(yaml)
+            hash[Rails.env].try(:deep_symbolize_keys) if hash
           end
         end || {}
       end

data/lib/chewy/fields/root.rb

@@ -2,10 +2,12 @@ module Chewy
   module Fields
     class Root < Chewy::Fields::Base
       attr_reader :dynamic_templates
+      attr_reader :id
       attr_reader :parent
       attr_reader :parent_id
 
       def initialize(name, options = {})
+        @id = options.delete(:id) || options.delete(:_id)
         @parent = options.delete(:parent) || options.delete(:_parent)
         @parent_id = options.delete(:parent_id)
         options.reverse_merge!(value: ->(_){_})
@@ -64,6 +66,12 @@ module Chewy
           parent_id.arity == 0 ? object.instance_exec(&parent_id) : parent_id.call(object)
         end
       end
+      
+      def compose_id(object)
+        if id
+          id.arity == 0 ? object.instance_exec(&id) : id.call(object)
+        end
+      end
     end
   end
 end

data/lib/chewy/query.rb

@@ -454,8 +454,8 @@ module Chewy
     #                :field,
     #                origin: '11, 12',
     #                scale: '2km',
-    #                offset: '5km'
-    #                decay: 0.4
+    #                offset: '5km',
+    #                decay: 0.4,
     #                filter: { foo: :bar})
     #       # => {body:
     #              query: {
@@ -474,12 +474,7 @@ module Chewy
     #                  }]
     #                } } }
     def decay(function, field, options = {})
-      field_options = {
-        origin: options.delete(:origin) || 0,
-        scale: options.delete(:scale) || 1,
-        offset: options.delete(:offset) || 0,
-        decay: options.delete(:decay) || 0.1
-      }
+      field_options = options.extract!(:origin, :scale, :offset, :decay).delete_if { |_, v| v.nil? }
       scoring = options.merge(function => {
         field => field_options
       })

data/lib/chewy/type/import.rb

@@ -90,6 +90,10 @@ module Chewy
           if self.root_object.parent_id
             entry[:parent] = self.root_object.compose_parent(object) if object.respond_to?(:id)
           end
+          
+          if self.root_object.id
+            entry[:_id] = self.root_object.compose_id(object)
+          end
 
           indexed_object = indexed_objects && indexed_objects[entry[:_id].to_s]
 

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/chewy/query_spec.rb

@@ -138,12 +138,7 @@ describe Chewy::Query do
     specify { expect(subject.decay(:gauss, :field)).not_to eq(subject) }
     specify { expect(subject.decay(:gauss, :field).criteria.scores).to eq([ {
       gauss: {
-        field: {
-          origin: 0,
-          scale: 1,
-          offset: 0,
-          decay: 0.1
-        }
+        field: {}
       }
     }]) }
     specify { expect { subject.decay(:gauss, :field) }.not_to change { subject.criteria.scores } }

data/spec/chewy/runtime_spec.rb

@@ -4,6 +4,6 @@ describe Chewy::Runtime do
   describe '.version' do
     specify { expect(described_class.version).to be_a(described_class::Version) }
     specify { expect(described_class.version).to be >= '1.0' }
-    specify { expect(described_class.version).to be < '1.4' }
+    specify { expect(described_class.version).to be < '1.5' }
   end
 end

data/spec/chewy/type/import_spec.rb

@@ -279,6 +279,58 @@ describe Chewy::Type::Import do
         end
       end
     end
+    
+    context 'root id', :orm do
+      let(:canada) { Country.create(id: 1, name: 'Canada', country_code: 'CA', rating: 4) }
+      let(:country)  { CountriesIndex::Country }
+      
+      before do
+        stub_model(:country)
+      end
+      
+      before do
+        stub_index(:countries) do
+          define_type Country do
+            root _id: -> { country_code } do
+              field :name
+              field :rating
+            end
+          end
+        end
+      end
+      
+      specify { expect( country.import(canada) ).to eq(true)  }
+      specify { expect { country.import(canada) }.to update_index(country).and_reindex(canada.country_code) }
+
+      specify do
+        expect(CountriesIndex.client).to receive(:bulk).with(hash_including(
+          body: [{ index: { _id: canada.country_code, data: { 'name' => 'Canada', 'rating' => 4 } } }]
+        ))
+
+        country.import canada
+      end
+      
+      specify do
+        canada.update_attributes(rating: 9)
+
+        expect(CountriesIndex.client).to receive(:bulk).with(hash_including(
+          body: [{ index: { _id: canada.country_code, data: { 'name' => 'Canada', 'rating' => 9 } } }]
+        ))
+
+        country.import canada
+      end
+      
+      specify do
+        canada.destroy
+
+        expect(CountriesIndex.client).to receive(:bulk).with(hash_including(
+          body: [{ delete: { _id: canada.country_code } }]
+        ))
+
+        country.import canada
+      end
+      
+    end  # END root id
   end
 
   describe '.import!', :orm do

data/spec/support/active_record.rb

@@ -6,6 +6,7 @@ ActiveRecord::Base.logger = Logger.new('/dev/null')
 ActiveRecord::Schema.define do
   create_table :countries do |t|
     t.column :name, :string
+    t.column :country_code, :string
     t.column :rating, :integer
   end
 

data/spec/support/mongoid.rb

@@ -64,6 +64,7 @@ RSpec.configure do |config|
       include Mongoid::Document
 
       field :name, type: String
+      field :country_code, type: String
       field :rating, type: Integer
 
       has_many :cities, order: :id.asc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -284,7 +284,7 @@ files:
 - spec/support/class_helpers.rb
 - spec/support/fail_helpers.rb
 - spec/support/mongoid.rb
-homepage: ''
+homepage: https://github.com/toptal/chewy
 licenses:
 - MIT
 metadata: {}