elastic_record 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7b8f5fc3d3234cd4df693c95e621d6cdb7f8dad
-  data.tar.gz: ddb1266846f803009ee3ae703e55e88f31427f2a
+  metadata.gz: 2cbc5a9b19d4e4536a11ca0c7a9a871d94122454
+  data.tar.gz: d9a056220a3afdc7220fd38d416469406689ca22
 SHA512:
-  metadata.gz: 007cf7521d482d9d2905fb425e1407c82ac7a72b53ce456c60dfa24ff0b6714def89003a42bf90aee417047183937f94e1373eb605137e400dd8c06df6d57b78
-  data.tar.gz: 936d22b8288094f09be05009aabfaef241105c4b84df7ac6f237a228eb366e206d80307dc4896d43e5d0772744c4d8ab9889e5cabc58de9e5ee2f8851dcb566d
+  metadata.gz: 391e0c18ac97b92f0a9048aa1e2c158438a24cb984303b7ed96a642b49c39caa57905645695b8357548f233a21ea37b76f530156068b1cfd625139f2b17627cc
+  data.tar.gz: 7366f981a1d0e9d5c3f273f625f8a44c77dc7352a29ab19c729eb4d911982848370e05a7fe2ecaca88ebac7869deb84b04b3eec74cffec2965402f20cd751cf1

data/README.rdoc

@@ -1,5 +1,6 @@
 = ElasticRecord
-{<img src="https://secure.travis-ci.org/matthuhiggins/elastic_record.png?rvm=1.9.3" />}[http://travis-ci.org/matthuhiggins/elastic_record]
+{<img src="https://secure.travis-ci.org/data-axle/elastic_record.png?rvm=2.0.0" />}[http://travis-ci.org/data-axle/elastic_record]
+{<img src="https://codeclimate.com/github/data-axle/elastic_record.png" />}[https://codeclimate.com/github/data-axle/elastic_record]
 
 ElasticRecord is an elasticsearch ORM.
 

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '1.0.1'
+  s.version = '1.1.0'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 

data/lib/elastic_record/lucene.rb

@@ -10,60 +10,6 @@ module ElasticRecord
       def escape(query)
         query.gsub(ESCAPE_REGEX, "\\\\\\1")
       end
-
-      # Returns a lucene query that works like GMail
-      def match_phrase(query, fields, &block)
-        return if query.blank?
-
-        words = split_phrase_into_words(query)
-
-        words.map do |word|
-          if word =~ /^(\w+):(.+)$/ && fields.include?($1)
-            match_word $2, [block_given? ? yield($1) : $1]
-          else
-            match_word word, (block_given? ? fields.map(&block) : fields)
-          end
-        end.join(' AND ')
-      end
-
-      # Performs a prefix match on the word:
-      # 
-      # ElasticRecord::Lucene.match_word('blue', ['color', 'name'])
-      #   => (color:blue* OR name:blue*)
-      # 
-      # In the case that the word has special characters, it is wrapped in quotes:
-      # 
-      # ElasticRecord::Lucene.match_word('A&M', ['name'])
-      #   => (name:"A&M")
-      def match_word(word, fields)
-        if word =~ / / || word =~ ESCAPE_REGEX
-          word = "\"#{word.gsub('"', '')}\""
-        else
-          word = "#{word}*"
-        end
-
-        or_query = fields.map do |field|
-          "#{field}:#{word}"
-        end.join(' OR ')
-
-        "(#{or_query})"
-      end
-
-      private
-        # Converts a sentence into the words:
-        # 
-        # split_phrase_into_words('his "blue fox"')
-        # => ['his', 'blue fox']
-        def split_phrase_into_words(phrase)
-          # If we have an odd number of double quotes,
-          # add a double quote to the end so that shellwords
-          # does not crap out.
-          if phrase.count('"') % 2 == 1
-            phrase = "#{phrase}\""
-          end
-
-          Shellwords::shellwords phrase.gsub("'", "\"'\"")
-        end
     end
   end
 end

data/lib/elastic_record/relation/batches.rb

@@ -13,10 +13,10 @@ module ElasticRecord
         end
       end
 
-      def find_ids_in_batches(options = {})
+      def find_ids_in_batches(options = {}, &block)
         options.assert_valid_keys(:batch_size)
 
-        scroll_keep_alive = '1m'
+        scroll_keep_alive = options[:keep_alive] || '5m'
         size = options[:batch_size] || 100
 
         options = {
@@ -28,7 +28,7 @@ module ElasticRecord
         scroll_id = klass.elastic_index.search(as_elastic, options)['_scroll_id']
 
         while (hit_ids = get_scroll_hit_ids(scroll_id, scroll_keep_alive)).any?
-          yield hit_ids
+          hit_ids.each_slice(size, &block)
         end
       end
 

data/lib/elastic_record/relation/search_methods.rb

@@ -2,27 +2,23 @@ module ElasticRecord
   class Relation
     module SearchMethods
       Relation::MULTI_VALUE_METHODS.each do |name|
-        class_eval <<-CODE, __FILE__, __LINE__ + 1
-          def #{name}_values                   # def filter_values
-            @values[:#{name}] || []            #   @values[:filter] || []
-          end                                  # end
-                                               #
-          def #{name}_values=(values)          # def filter_values=(values)
-            @values[:#{name}] = values         #   @values[:filter] = values
-          end                                  # end
-        CODE
+        define_method "#{name}_values" do
+          @values[name] || []
+        end
+
+        define_method "#{name}_values=" do |values|
+          @values[name] = values
+        end
       end
 
       Relation::SINGLE_VALUE_METHODS.each do |name|
-        class_eval <<-CODE, __FILE__, __LINE__ + 1
-          def #{name}_value                    # def offset_value
-            @values[:#{name}]                  #   @values[:offset]
-          end                                  # end
-
-          def #{name}_value=(value)            # def offset_value=(value)
-            @values[:#{name}] = value          #   @values[:offset] = value
-          end                                  # end
-        CODE
+        define_method "#{name}_value" do
+          @values[name]
+        end
+
+        define_method "#{name}_value=" do |value|
+          @values[name] = value
+        end
       end
 
       def query!(value)

data/test/elastic_record/lucene_test.rb

@@ -5,30 +5,4 @@ class ElasticRecord::LuceneTest < MiniTest::Spec
     assert_equal "\\\\", ElasticRecord::Lucene.escape("\\")
     assert_equal "Matt \\&& Joe", ElasticRecord::Lucene.escape("Matt && Joe")
   end
-
-  def test_match_phrase
-    assert_match_phrase nil, '', ['name']
-    assert_match_phrase nil, nil, ['name']
-
-    assert_match_phrase '(name:foo*)', 'foo', ['name']
-    assert_match_phrase '(name:"foo-bar")', 'foo-bar', ['name']
-    assert_match_phrase "(name:bob's*)", "bob's", ['name']
-    assert_match_phrase '(name:foo* OR street:foo*)', 'foo', ['name', 'street']
-    assert_match_phrase '(name:"foo bar" OR street:"foo bar") AND (name:faz* OR street:faz*)', '"foo bar" faz', ['name', 'street']
-    assert_match_phrase '(street:"42 place") AND (name:bar*)', 'street:"42 place" name:bar', ['name', 'street']
-  end
-
-  def test_match_phrase_with_unmatched_quotes
-    assert_match_phrase '(name:"foo bar")', '"foo bar', ['name']
-  end
-
-  def test_match_phrase_with_block
-    assert_match_phrase '(name.analyzed:foo*)', 'foo', ['name'] { |f| "#{f}.analyzed" }
-  end
-
-  private
-
-    def assert_match_phrase(expected, query, fields, &block)
-      assert_equal expected, ElasticRecord::Lucene.match_phrase(query, fields, &block)
-    end
 end

data/test/elastic_record/relation/batches_test.rb

@@ -24,11 +24,13 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Spec
 
   def test_find_ids_in_batches_with_size
     results = []
-    Widget.elastic_relation.find_ids_in_batches(batch_size: 1) do |ids|
+    Widget.elastic_relation.find_ids_in_batches(batch_size: 2) do |ids|
       results << ids
     end
 
     assert_equal 2, results.size
+    assert_equal 2, results[0].size
+    assert_equal 1, results[1].size
     assert_equal ['5', '10', '15'].to_set, results.flatten.to_set
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic