artirix_data_models 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b789a4325708b34bd7ebfdc7745857c0b15c274
-  data.tar.gz: a0b4df2ed3b9a82761ad7b7474d2456c7c1ec622
+  metadata.gz: ae18a031f2f63e51b88e650af33f00514be973f3
+  data.tar.gz: 47cacfc9d39fe71f601a24a2b0a98592fff96ed9
 SHA512:
-  metadata.gz: b3067423501cef36002fc3c46a8d1bca73541ed2cfd92acb068b704472dca356d2c771f3e4434a554983dbe86f0b2956bcf181cf4d0554b8294c778572c1c6e4
-  data.tar.gz: d82ad3c5b183de485ddd6c3d85b749fe03abb5b5ba3dbd9c8c3ed9c3ad1918338fca8d08eb6e22efa000d8ac1fdd1ac4885fb9357d4dd48f393e7d40f8bcd242
+  metadata.gz: 56fc976f72c5fb3fac636946094f16904795a611ded1b1b4c45bf30b0cf618ea769d7882ccc6ee914b4d8d571eed78c3d9d15e4f522ac8db468dd1986592fec8
+  data.tar.gz: 6c8b20e6e3c5fcd5efde31dd1069692fda9e8286f3dab37f0170bd25910a051504f81aff5b83d0206a292a9d930fa4848b4d8f911af3986cc87c7bcfd0f981ba

data/.gitignore

@@ -1,7 +1,7 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
+/Gemfile.lock
 /coverage/
 /doc/
 /pkg/

data/README.md

@@ -320,6 +320,10 @@ end
 
 ## Changes
 
+### 1.0.0.beta3
+
+- remove `hashie` dependency. Important: `EsCollection` breaks with hashie 3.5.x before this change
+
 ### 1.0.0.beta2
 
 - Partial Mode: the default mode status is inherited from the parent class. If you have

data/artirix_data_models.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday'
   spec.add_dependency 'keyword_init', '~> 1.4'
   spec.add_dependency 'naught'
-  spec.add_dependency 'hashie', '~> 3.4'
   spec.add_dependency 'artirix_cache_service'
 
   spec.add_development_dependency 'simpleconfig'

data/lib/artirix_data_models.rb

@@ -7,7 +7,6 @@ require 'oj'
 require 'faraday'
 require 'keyword_init'
 require 'naught'
-require 'hashie'
 
 require 'artirix_cache_service'
 

data/lib/artirix_data_models/raw_aggregation_data_normaliser.rb

@@ -40,7 +40,7 @@ module ArtirixDataModels
     end
 
     def treat_buckets(hash)
-      with_buckets_list = deep_locate hash, FIND_BUCKETS
+      with_buckets_list = locate FIND_BUCKETS, hash
 
       with_buckets_list.each do |with_buckets|
         with_buckets.each do |name, value|
@@ -50,7 +50,7 @@ module ArtirixDataModels
     end
 
     def treat_values(hash)
-      with_values_list = deep_locate hash, FIND_VALUE
+      with_values_list = locate FIND_VALUE, hash
 
       with_values_list.each do |with_values|
         with_values.each do |name, value|
@@ -60,7 +60,7 @@ module ArtirixDataModels
     end
 
     def treat_counts(hash)
-      with_values_list = deep_locate hash, FIND_COUNTS
+      with_values_list = locate FIND_COUNTS, hash
       with_values_list.each do |with_values|
         with_values.each do |name, value|
           normalise_element(name, value)
@@ -120,12 +120,40 @@ module ArtirixDataModels
     end
 
     # aux
-    def deep_locate(object, callable)
-      Hashie::Extensions::DeepLocate.deep_locate(callable, object).deep_dup
+    def locate(callable, object)
+      self.class.locate(callable, object).deep_dup
     end
 
     def nested_aggs_from(raw_bucket)
       RawAggregationDataNormaliser.new(aggregations_factory, raw_bucket).normalise
     end
+
+    ###################################################
+    # from former Hashie implementation (up to 3.4.x) #
+    ###################################################
+
+    def self.locate(comparator, object, result = [])
+      if object.is_a?(::Enumerable)
+        if object.any? { |value| match_comparator?(value, comparator, object) }
+          result.push object
+        else # DO NOT LOOK DEEPER ONCE FOUND IF THE VALUE FOUND IS A HASH (this will prevent us from properly recognising nested aggregations)!
+          (object.respond_to?(:values) ? object.values : object.entries).each do |value|
+            locate(comparator, value, result)
+          end
+        end
+      end
+
+      result
+    end
+
+    def self.match_comparator?(value, comparator, object)
+      if object.is_a?(::Hash)
+        key, value = value
+      else
+        key = nil
+      end
+
+      comparator.call(key, value, object)
+    end
   end
-end
+end

data/lib/artirix_data_models/version.rb

@@ -1,3 +1,3 @@
 module ArtirixDataModels
-  VERSION = '1.0.0.beta2'
+  VERSION = '1.0.0.beta3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artirix_data_models
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Eduardo Turiño
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: artirix_cache_service
   requirement: !ruby/object:Gem::Requirement
@@ -326,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Data Models (read only model) and Data Layer connection lib