elastics-models 1.1.11 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cf7d1302d02455603f5895e19b5ff67ccf36ed79
+  data.tar.gz: 5059bda21dfcef3a4d6bcfe87b8f034a003d2320
+SHA512:
+  metadata.gz: 68ff5dfafa3b857bc60765fc9e268ccd22aedf4a8c2d4862dcc0b6e29e37adc03244e0af6c366810ff25a65fb888978301618dbe97149d3f79cc1af03b5b556a
+  data.tar.gz: fc0cffc785b4b50461d1125e623bfe84047cc1866df55fa10c3de3ad2a0425b7bff9bf72bbbb85be75a12a362d9d3228f29976ec41cc3aaedfeaa0089673692c

data/VERSION

@@ -1 +1 @@
-1.1.11
+1.2.0

data/elastics-models.gemspec

@@ -1,6 +1,9 @@
 require 'date'
-version_path = %w[../VERSION ../../VERSION].detect{|v| File.exist?(File.expand_path(v, __FILE__))}
-version      = File.read(File.expand_path(version_path, __FILE__)).strip
+version_path = %w[VERSION ../VERSION].detect{|v| File.exist?(v)}
+version      = File.read(version_path).strip
+extra_files  = []
+extra_files << 'VERSION' if File.exist?('VERSION')
+extra_files << 'LICENSE' if File.exist?('LICENSE')
 
 Gem::Specification.new do |s|
   s.name                      = 'elastics-models'
@@ -9,7 +12,7 @@ Gem::Specification.new do |s|
   s.homepage                  = 'http://elastics.github.io/elastics'
   s.authors                   = ["Domizio Demichelis"]
   s.email                     = 'dd.nexus@gmail.com'
-  s.files                     = `git ls-files -z`.split("\0") + %w[VERSION LICENSE]
+  s.files                     = `git ls-files -z`.split("\0") + extra_files
   s.version                   = version
   s.date                      = Date.today.to_s
   s.required_rubygems_version = ">= 1.3.6"

data/lib/elastics/active_model/attachment.rb

@@ -26,7 +26,7 @@ module Elastics
                 }
         props.extend(Struct::Mergeable).deep_merge! args.first if args.first.is_a?(Hash)
 
-        scope :"#{name}_scope", fields("#{name}.title",
+        scope :"#{name}_scope", source("#{name}.title",
                                        "#{name}.author",
                                        "#{name}.name",
                                        "#{name}.content_type",

data/lib/elastics/instance_proxy/model_indexer.rb

@@ -2,7 +2,7 @@ module Elastics
   module InstanceProxy
     class ModelIndexer < ModelSyncer
 
-      # delegates :index, :is_child?, :is_parent? to class_elastics
+      # delegates :is_child?, :is_parent? to class_elastics
       Utils.define_delegation :to  => :class_elastics,
                               :in  => self,
                               :by  => :module_eval,
@@ -32,10 +32,10 @@ module Elastics
         Elastics.get(metainfo, *vars)
       end
 
-      # like get, but it returns all the fields after a refresh
+      # like get, but it returns all the source fields after a refresh
       def full_get(*vars)
         return unless instance.elastics_indexable?
-        Elastics.search_by_id(metainfo, {:refresh => true, :params => {:fields => '*,_source'}}, *vars)
+        Elastics.search_by_id(metainfo, {:refresh => true, :params => {:_source => '*'}}, *vars)
       end
 
       def parent_instance
@@ -76,7 +76,7 @@ module Elastics
         @routing ||= case
                      when instance.respond_to?(:elastics_routing) then instance.elastics_routing
                      when is_child?                               then parent_instance.elastics.routing
-                     when is_parent?                              then create_routing
+                     when is_parent?                              then id
                      end
       end
       attr_writer :routing
@@ -91,8 +91,8 @@ module Elastics
       attr_writer :parent
 
       def metainfo
-        meta = Vars.new( :index => index, :type => type, :id => id )
-        params = {}
+        meta             = Vars.new( :index => index, :type => type, :id => id )
+        params           = {}
         params[:routing] = routing if routing
         params[:parent]  = parent  if parent
         meta.merge!(:params => params) unless params.empty?
@@ -103,23 +103,6 @@ module Elastics
         instance.destroyed? ? remove : store
       end
 
-      private
-
-      BASE62_DIGITS = ('0'..'9').to_a + ('A'..'Z').to_a + ('a'..'z').to_a
-
-      def create_routing
-        string    = [index, type, id].join
-        remainder = Digest::MD5.hexdigest(string).to_i(16)
-        result    = []
-        max_power = ( Math.log(remainder) / Math.log(62) ).floor
-        max_power.downto(0) do |power|
-          digit, remainder = remainder.divmod(62**power)
-          result << digit
-        end
-        result << remainder if remainder > 0
-        result.map{|digit| BASE62_DIGITS[digit]}.join
-      end
-
     end
   end
 end

data/lib/elastics/model_tasks.rb

@@ -42,7 +42,7 @@ module Elastics
         end
 
         # block never called during live-reindex, since prefix_index creates it
-        unless Elastics.exist?(:index => index)
+        unless Elastics.indices_exists(:index => index)
           Conf.indices.create_index(index)
           Prompter.say_ok "#{index} index created" if options[:verbose]
         end

data/lib/elastics/models_live_reindex.rb

@@ -51,7 +51,7 @@ module Elastics
 
           pbar = ProgBar.new(model.count, nil, "Model #{model}: ") if opts[:verbose]
 
-          model.find_in_batches({:raw_result => true, :params => {:fields => '*,_source'}}, opts) do |result|
+          model.find_in_batches({:raw_result => true, :params => {:_source => '*'}}, opts) do |result|
             batch  = result['hits']['hits']
             result = process_and_post_batch(batch)
             pbar.process_result(result, batch.size) if opts[:verbose]

data/lib/elastics/result/active_model.rb

@@ -9,13 +9,13 @@ module Elastics
         result.variables[:context] && result.variables[:context].include?(Elastics::ActiveModel)
       end
 
-      def get_docs
+      def get_docs(should_freeze=false)
         # super is from elastics-scopes
-        docs = super
+        docs = super()
         return docs if variables[:raw_result]
         raw_result = self
         if docs.is_a?(Array)
-          res = docs.map {|doc| build_object(doc)}
+          res = docs.map {|doc| build_object(doc,should_freeze)}
           res.extend(Struct::Paginable).setup(raw_result['hits']['total'], variables)
           class << res; self end.class_eval do
             define_method(:raw_result){ raw_result }
@@ -25,13 +25,13 @@ module Elastics
           end
           res
         else
-          build_object docs
+          build_object docs, should_freeze
         end
       end
 
     private
 
-      def build_object(doc)
+      def build_object(doc, should_freeze)
         attrs      = (doc['_source']||{}).merge(doc['fields']||{})
         object     = variables[:context].new attrs
         raw_result = self
@@ -51,7 +51,7 @@ module Elastics
           @highlight  = doc['highlight']
           # load the elastics proxy before freezing
           elastics
-          self.freeze if raw_result.variables[:params][:fields] || doc['fields']
+          self.freeze if should_freeze
         end
         object
       end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: elastics-models
 version: !ruby/object:Gem::Version
-  version: 1.1.11
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastics-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: elastics-scopes
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 description: Provides ActiveRecord, Mongoid, ActiveModel and elasticsearch-mapper-attachment
@@ -67,7 +60,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
+- VERSION
 - elastics-models.gemspec
 - lib/elastics-models.rb
 - lib/elastics/active_model.rb
@@ -91,33 +86,29 @@ files:
 - lib/elastics/result/document_loader.rb
 - lib/elastics/result/search_loader.rb
 - lib/tasks.rake
-- VERSION
-- LICENSE
 homepage: http://elastics.github.io/elastics
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Transparently integrates your models with one or more elasticsearch indices.
 test_files: []
-has_rdoc: