elasticsearch-model 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTEzZGEzOThmZGEyNGQ1NWU1NmQ5M2MxZjY2MTY3Zjc4MjY4YWUzMQ==
+    Y2Y1ZDVlOWEyODBjYzg3MmFiYjNmOTZjY2I2YTJmMjIxYzkwN2I1OA==
   data.tar.gz: !binary |-
-    MzViYTk0YjhmZjA3ODI1MTlhOWZhNDU4NzdjZTQyZDIxNDcxODYwZg==
+    NTIyNTFhZDc3MTQ3YTdiMDlmMmYwZmYxN2VjZmIyOTYyNzlhMWY1Yw==
 SHA512:
   metadata.gz: !binary |-
-    ODRhOGMxYzBmMTZlYWU4YzJmNTRjZmRjZjQ5Y2VkY2I5M2E0ZTFhZWZjYTVl
-    ODcyMDUyMzkyOGE5MmI2ZDcwNWIwNTEwMTY4YmZlMzIyOWU2NDU2OGI2NmM4
-    MGFkODMxM2I1NmZmNmRmMDRiNzViOGIyZDhkYzU2MGMxNDQ2NzA=
+    MmE4MjU1N2UwMmYwNTJiMzM5ZjdlOWM4ZGI0NzI0NzJkYTc0YjA0OTM2M2Q5
+    MGUwZDBmNzFhMDg2MGQ1NTk1N2U0YmVmOWY4MTI0NGVlMzcwYjNhNjU5MzE3
+    OWRkYTBmNTAxZGYwOTM1MWQ5Mjc2MDU2ZTUwMDIyOTY3NTcwMmM=
   data.tar.gz: !binary |-
-    NGQ2YTM3YWVkNzVkYWU5MmNkNjJmMjZjZTM2MGMxZGU0NGY3Y2U5MmRlZTU5
-    NWZjOGY2ZDdmODIyMzYzNDkzOTM4M2E4M2YwYTkwN2FmMjZlNmQ2MTIyODRk
-    YjM4ZTQ1NWNkN2VkY2UzNDU4NThjYTY0NmMyOWY5NDA4MmU5MjA=
+    ZTUzYzliYmU4NjcxYTFmYWQyMDA2MGE1ZWYwZDhhMmRiMTI3NzlkYjJhNWI3
+    Y2ExNzY3Mzc1NGM4MmQwZWM1MDEzZDlhMjQyYmViN2ZjNTg1NTJlZWE0NmRm
+    ZTA1ODRhOWQ1OTUxMWY4YjllZGE3OWQwNzFmMDM5ZDMzNmZkOTg=

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 0.1.3
+
 ## 0.1.2
 
 * Properly delegate existence methods like `result.foo?` to `result._source.foo`

data/elasticsearch-model.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
   s.rdoc_options      = [ "--charset=UTF-8" ]
 
+  s.required_ruby_version = ">= 1.9.3"
+
   s.add_dependency "elasticsearch",       '> 0.4'
   s.add_dependency "activesupport",       '> 3'
   s.add_dependency "hashie"

data/lib/elasticsearch/model.rb

@@ -62,6 +62,7 @@ module Elasticsearch
   #     # ...
   #
   module Model
+    METHODS = [:search, :mapping, :mappings, :settings, :index_name, :document_type, :import]
 
     # Adds the `Elasticsearch::Model` functionality to the including class.
     #
@@ -107,13 +108,9 @@ module Elasticsearch
         # Delegate important methods to the `__elasticsearch__` proxy, unless they are defined already
         #
         class << self
-          delegate :search,        to: :__elasticsearch__ unless respond_to?(:search)
-          delegate :mapping,       to: :__elasticsearch__ unless respond_to?(:mapping)
-          delegate :mappings,      to: :__elasticsearch__ unless respond_to?(:mappings)
-          delegate :settings,      to: :__elasticsearch__ unless respond_to?(:settings)
-          delegate :index_name,    to: :__elasticsearch__ unless respond_to?(:index_name)
-          delegate :document_type, to: :__elasticsearch__ unless respond_to?(:document_type)
-          delegate :import,        to: :__elasticsearch__ unless respond_to?(:import)
+          METHODS.each do |method|
+            delegate method, to: :__elasticsearch__ unless self.public_instance_methods.include?(method)
+          end
         end
 
         # Mix the importing module into the proxy

data/lib/elasticsearch/model/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Model
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/test/unit/module_test.rb

@@ -22,6 +22,11 @@ class Elasticsearch::Model::ModuleTest < Test::Unit::TestCase
 
     context "when included in module/class, " do
       class ::DummyIncludingModel; end
+      class ::DummyIncludingModelWithSearchMethodDefined
+        def self.search(query, options={})
+          "SEARCH"
+        end
+      end
 
       should "include and set up the proxy" do
         DummyIncludingModel.__send__ :include, Elasticsearch::Model
@@ -40,6 +45,12 @@ class Elasticsearch::Model::ModuleTest < Test::Unit::TestCase
         assert_respond_to DummyIncludingModel, :document_type
         assert_respond_to DummyIncludingModel, :import
       end
+
+      should "not override existing method" do
+        DummyIncludingModelWithSearchMethodDefined.__send__ :include, Elasticsearch::Model
+
+        assert_equal 'SEARCH', DummyIncludingModelWithSearchMethodDefined.search('foo')
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -435,7 +435,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='