elastic_record 0.3.0 → 0.3.1

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+
+gemspec
+# gem 'arelastic', path: '~/code/arelastic'

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Matthew Higgins
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,13 @@
+require 'rake'
+require 'rake/testtask'
+
+desc 'Default: run unit tests.'
+task default: :test
+
+desc 'Test.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end

data/elastic_record.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+ 
+Gem::Specification.new do |s|
+  s.name = 'elastic_record'
+  s.version = '0.3.1'
+  s.summary = 'Use Elastic Search with your objects'
+  s.description = 'Find your records with elastic search'
+
+  s.required_ruby_version     = '>= 1.9.3'
+  s.required_rubygems_version = ">= 1.8.11"
+  s.license     = 'MIT'
+
+  s.author            = 'Matthew Higgins'
+  s.email             = 'developer@matthewhiggins.com'
+  s.homepage          = 'http://github.com/matthuhiggins/elastic_record'
+
+  s.extra_rdoc_files = ['README.rdoc']
+  s.files       = `git ls-files`.split("\n")
+  s.test_files  = `git ls-files -- {test}/*`.split("\n")
+
+  s.add_dependency 'arelastic'
+  s.add_dependency 'rubberband', '>= 0.1.1'
+  s.add_dependency 'activemodel'
+end

data/lib/elastic_record/callbacks.rb

@@ -0,0 +1,15 @@
+module ElasticRecord
+  module Callbacks
+    def self.included(base)
+      base.class_eval do
+        after_save do
+          elastic_index.index_record self
+        end
+
+        after_destroy do
+          elastic_index.delete_record self
+        end
+      end
+    end
+  end
+end

data/lib/elastic_record/index/manage.rb

@@ -37,7 +37,7 @@ module ElasticRecord
           }
         ]
 
-        aliased_indexes.each do |index_to_remove|
+        aliased_names.each do |index_to_remove|
           actions << {
             remove: {
               "index" => index_to_remove,
@@ -50,11 +50,20 @@ module ElasticRecord
       end
 
       def update_mapping(index_name)
-        connection.update_mapping(mapping, index: index_name)
-        # json_put "/#{index_name}/#{type}/_mapping", type => mapping
+        # connection.update_mapping(mapping, index: index_name)
+        json_put "/#{index_name}/#{type}/_mapping", type => mapping
       end
 
-      def aliased_indexes
+      def refresh
+        connection.refresh
+      end
+
+      def reset
+        delete_all
+        create_and_deploy
+      end
+
+      def aliased_names
         json = json_get '/_cluster/state'
         json["metadata"]["indices"].select { |name, status| status["aliases"].include?(alias_name) }.map { |name, status| name }
       end

data/lib/elastic_record/tasks/index.rake

@@ -0,0 +1,72 @@
+module ElasticRecord
+  class Task
+    def self.get_models
+      if class_name = ENV['CLASS']
+        [class_name.camelize.constantize]
+      else
+        IndexedModels.all
+      end
+    end
+  end
+end
+
+namespace :index do
+  desc "Create index for CLASS or all models."
+  task create: :environment do
+    ElasticRecord::Task.get_models.each do |model|
+      # begin
+        index_name = model.elastic_index.create_and_deploy
+        logger.info "Created #{model.name} index (#{index_name})"
+      # rescue => e
+      #   if e.message =~ /IndexAlreadyExistsException/
+      #     logger.info "#{model.name} index already exists"
+      #   else
+      #     raise e
+      #   end
+      # end
+    end
+  end
+
+  desc "Drop index for CLASS or all models."
+  task drop: :environment do
+    ElasticRecord::Task.get_models.each do |model|
+      # begin
+        model.elastic_index.delete_all
+        logger.info "Dropped #{model.name} index"
+      # rescue => e
+      #   if e.message =~ /IndexMissingException/
+      #     logger.info "#{model.name} index does not exist"
+      #   else
+      #     raise e
+      #   end
+      # end
+    end
+  end
+
+  desc "Recreate index for CLASS or all models."
+  task reset: ['index:drop', 'index:create']
+
+  desc "Add records to index. Deploys a new index by default, or specify INDEX"
+  task build: :environment do
+    ElasticRecord::Task.get_models.each do |model|
+      logger.info "Building #{model.name} index."
+
+      if ENV['INDEX']
+        index_name = ENV['INDEX']
+      else
+        logger.info "  Creating index..."
+        index_name = model.elastic_index.create
+      end
+
+      logger.info "  Reindexing into #{index_name}"
+      model.find_in_batches do |records|
+        model.elastic_index.bulk_add(records, index_name)
+      end
+
+      logger.info "  Deploying index..."
+      model.elastic_index.deploy(index_name)
+
+      logger.info "  Done."
+    end
+  end
+end

data/test/elastic_record/index/documents_test.rb

@@ -4,7 +4,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Spec
   def setup
     super
     
-    Widget.reset_index!
+    index.reset
   end
 
   def test_index_record

data/test/elastic_record/index/manage_test.rb

@@ -25,10 +25,10 @@ class ElasticRecord::Index::ManageTest < MiniTest::Spec
   def test_deploy
     index.create 'widgets_foo'
     
-    assert index.aliased_indexes.empty?
+    assert index.aliased_names.empty?
     index.deploy 'widgets_foo'
 
-    assert_equal ['widgets_foo'], index.aliased_indexes
+    assert_equal ['widgets_foo'], index.aliased_names
   end
 
   private

data/test/elastic_record/relation/batches_test.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class ElasticRecord::Relation::BatchesTest < MiniTest::Spec
   def setup
-    Widget.reset_index!
+    Widget.elastic_index.reset
     create_widgets
   end
 
@@ -38,6 +38,6 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Spec
         Widget.new(id: 15, color: 'green'),
       ]
       
-      Widget.elastic_connection.refresh
+      Widget.elastic_index.refresh
     end
 end

data/test/elastic_record/relation/delegation_test.rb

@@ -2,12 +2,12 @@ require 'helper'
 
 class ElasticRecord::Relation::DelegationTest < MiniTest::Spec
   def setup
-    Widget.reset_index!
+    Widget.elastic_index.reset
   end
 
   def test_delegate_to_array
-    Widget.elastic_connection.index({'widget' => {'color' => 'red'}}, {index: 'widgets', type: 'widget', id: 5})
-    Widget.elastic_connection.refresh
+    Widget.elastic_index.index_record(Widget.new(id: 5, color: 'red'))
+    Widget.elastic_index.refresh
     
     records = []
     Widget.elastic_relation.each do |record|
@@ -26,7 +26,7 @@ class ElasticRecord::Relation::DelegationTest < MiniTest::Spec
 
     result = model.elastic_relation.filter('foo' => 'bar').do_it
 
-    expected = {"query"=>{"constant_score"=>{"filter"=>{"term"=>{"foo"=>"bar"}}}}}
+    expected = {"query" => {"constant_score" => {"filter" => {"term" => {"foo" => "bar"}}}}}
     assert_equal expected, result 
   end
 end

data/test/elastic_record/relation/finder_methods_test.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Spec
   def setup
-    Widget.reset_index!
+    Widget.elastic_index.reset
     create_widgets
   end
 
@@ -34,9 +34,11 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Spec
   private
 
     def create_widgets
-      Widget.elastic_connection.index({'widget' => {'color' => 'red'}}, {index: 'widgets', type: 'widget', id: '05'})
-      Widget.elastic_connection.index({'widget' => {'color' => 'blue'}}, {index: 'widgets', type: 'widget', id: '10'})
+      Widget.elastic_index.bulk_add [
+        Widget.new(color: 'red', id: '05'),
+        Widget.new(color: 'blue', id: '10'),
+      ]
       
-      Widget.elastic_connection.refresh
+      Widget.elastic_index.refresh
     end
 end

data/test/elastic_record/relation_test.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class ElasticRecord::RelationTest < MiniTest::Spec
   def setup
-    Widget.reset_index!
+    Widget.elastic_index.reset
     create_widgets
   end
 
@@ -44,9 +44,11 @@ class ElasticRecord::RelationTest < MiniTest::Spec
 
   private
     def create_widgets
-      Widget.elastic_connection.index({'widget' => {'color' => 'red'}}, {index: 'widgets', type: 'widget', id: 5})
-      Widget.elastic_connection.index({'widget' => {'color' => 'blue'}}, {index: 'widgets', type: 'widget', id: 10})
-      
-      Widget.elastic_connection.refresh
+      Widget.elastic_index.bulk_add [
+        Widget.new(id: 5, color: 'red'),
+        Widget.new(id: 10, color: 'blue')
+      ]
+
+      Widget.elastic_index.refresh
     end
 end

data/test/support/widget.rb

@@ -1,5 +1,8 @@
 class Widget
   extend ActiveModel::Naming
+  extend ActiveModel::Callbacks
+  define_model_callbacks :save, :destroy
+
   include ElasticRecord::Model
 
   self.elastic_index.mapping[:properties].update(color: {
@@ -21,11 +24,6 @@ class Widget
         instance_eval(&block)
       end
     end
-
-    def reset_index!
-      elastic_index.delete_all
-      elastic_index.create_and_deploy
-    end
   end
 
   attr_accessor :id, :color

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -66,24 +66,32 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- .gitignore
+- Gemfile
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- elastic_record.gemspec
+- lib/elastic_record.rb
+- lib/elastic_record/callbacks.rb
 - lib/elastic_record/config.rb
 - lib/elastic_record/connection.rb
+- lib/elastic_record/index.rb
 - lib/elastic_record/index/documents.rb
 - lib/elastic_record/index/manage.rb
 - lib/elastic_record/index/mapping.rb
-- lib/elastic_record/index.rb
 - lib/elastic_record/model.rb
 - lib/elastic_record/orm/active_record.rb
 - lib/elastic_record/railtie.rb
+- lib/elastic_record/relation.rb
 - lib/elastic_record/relation/batches.rb
 - lib/elastic_record/relation/delegation.rb
 - lib/elastic_record/relation/finder_methods.rb
 - lib/elastic_record/relation/merging.rb
 - lib/elastic_record/relation/search_methods.rb
 - lib/elastic_record/relation/value_methods.rb
-- lib/elastic_record/relation.rb
 - lib/elastic_record/searching.rb
-- lib/elastic_record.rb
+- lib/elastic_record/tasks/index.rake
 - test/elastic_record/config_test.rb
 - test/elastic_record/connection_test.rb
 - test/elastic_record/index/documents_test.rb
@@ -101,7 +109,6 @@ files:
 - test/helper.rb
 - test/support/connect.rb
 - test/support/widget.rb
-- README.rdoc
 homepage: http://github.com/matthuhiggins/elastic_record
 licenses:
 - MIT