elastics-rails 1.1.11 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b3557c34db875d8814339ecce273fe7fbffe921c
+  data.tar.gz: 775c3e630785a14eba4ee13996146374a7999ae5
+SHA512:
+  metadata.gz: 8f6005025b0ab4565a00d15c872aee74ebe5d593b9507c5e636691bed85bb1adecbe6e705004b6776918ecf1c7a3a98e4d6c60711cb53a56658f1f208464af06
+  data.tar.gz: 40be010e82cdf499deef25fc0d3b8441316c1b1895dfa1f8b163fc2658de1147054bfcfffaa82371b438b6dbadbf27d1691d3eb0186f56633bb9b1de97ba3268

data/VERSION

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

data/elastics-rails.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-rails'
@@ -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/rails/engine.rb

@@ -6,7 +6,7 @@ module Elastics
         config.elastics = Conf
         config.elastics.variables[:index] = [self.class.name.split('::').first.underscore, ::Rails.env].join('_')
         config.elastics.config_file       = ::Rails.root.join('config', 'elastics.yml').to_s
-        config.elastics.elastics_dir       = ::Rails.root.join('app', 'elastics').to_s
+        config.elastics.elastics_dir      = ::Rails.root.join('app', 'elastics').to_s
         config.elastics.logger            = Logger.new(STDOUT)
         config.elastics.logger.level      = ::Logger::DEBUG if ::Rails.env.development?
         config.elastics.result_extenders |= [ Elastics::Result::RailsHelper ]

data/lib/elastics/result/rails_helper.rb

@@ -14,25 +14,26 @@ module Elastics
         def method_missing(meth, *args, &block)
           meth.to_s =~ RE
           attribute = $1
-          if attribute
-            opts = {:fragment_separator => ' ... '}.merge(args.first||{})
-            if self['highlight']
-              key, high = self['highlight'].find { |k,v| k.gsub('.','_') == attribute }
-              high = Array.wrap(high) if high
-            end
-            if high.blank?
-              respond_to?(attribute.to_sym) ? send(attribute.to_sym) : ''
-            else
-              high.join(opts[:fragment_separator]).html_safe
-            end
+          attribute ? higlighted(attribute, args.first || {}) : super
+        end
+
+        # TODO: add the doc for this method
+        def higlighted(attribute, opts={})
+          opts = { :fragment_separator => ' ... ' }.merge(opts)
+          if self['highlight']
+            # works also with nested attributes
+            key, high = self['highlight'].find { |k, v| k.gsub('.', '_') == attribute }
+            high      = Array.wrap(high) if high
+          end
+          if high.blank?
+            respond_to?(attribute.to_sym) ? send(attribute.to_sym) : ''
           else
-            super
+            high.join(opts[:fragment_separator]).html_safe
           end
         end
 
       end
 
-
       # extend if result is a Search or MultiGet
       def self.should_extend?(result)
         result.is_a?(Search) || result.is_a?(MultiGet)

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: elastics-rails
 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: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !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-models
   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
 description: Provides the engine, generators and helpers to integrate Elastics with
   Rails
 email: dd.nexus@gmail.com
@@ -66,7 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
+- VERSION
 - elastics-rails.gemspec
 - lib/elastics-rails.rb
 - lib/elastics/rails/engine.rb
@@ -79,33 +74,29 @@ files:
 - lib/generators/elastics/setup/templates/elastics_dir/elastics.yml.erb
 - lib/generators/elastics/setup/templates/elastics_dir/elastics_extender.rb.erb
 - lib/generators/elastics/setup/templates/elastics_initializer.rb.erb
-- 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: Rails integration for Elastics
 test_files: []
-has_rdoc: