elastic_record 0.1.1 → 0.2.0

data/lib/elastic_record/index/manage.rb

@@ -0,0 +1,22 @@
+module ElasticRecord
+  class Index
+    module Manage
+      def create(index_name = name)
+        model.elastic_connection.create_index(index_name)
+
+        unless mapping.empty?
+          model.elastic_connection.update_mapping(mapping, index: index_name)
+        end
+      end
+
+      def delete(index_name = name)
+        model.elastic_connection.delete_index(index_name)
+      end
+
+      def alias
+        # alias_actions = {add: {index_name => pending_index_alias}}
+        # elastic_connection.alias_index(alias_actions)
+      end
+    end
+  end
+end

data/lib/elastic_record/index/mapping.rb

@@ -0,0 +1,33 @@
+module ElasticRecord
+  class Index
+    module Mapping
+      def mapping=(mapping)
+        mapping.deep_merge!(mapping)
+      end
+
+      def mapping
+        @mapping ||= {
+          _source: {
+            enabled: false
+          },
+          properties: {
+            created_at: {type: "date", index: "not_analyzed", format: "dateOptionalTime"},
+            updated_at: {type: "date", index: "not_analyzed", format: "dateOptionalTime"}
+          },
+          dynamic_templates: [
+            {
+              no_string_analyzing: {
+                match: "*",
+                match_mapping_type: "string",
+                mapping: {
+                  type: "string",
+                  index: "not_analyzed"
+                }
+              }
+            }
+          ]
+        }
+      end
+    end
+  end
+end

data/lib/elastic_record/index.rb

@@ -0,0 +1,23 @@
+require 'elastic_record/index/manage'
+require 'elastic_record/index/mapping'
+
+module ElasticRecord
+  class Index
+    include Manage
+    include Mapping
+
+    attr_accessor :model
+
+    def initialize(model)
+      @model = model
+    end
+
+    def name
+      model.model_name.collection
+    end
+
+    def type
+      model.model_name.element
+    end
+  end
+end

data/lib/elastic_record/model.rb

@@ -9,13 +9,25 @@ module ElasticRecord
     end
 
     module ClassMethods
-      def relation
+      def elastic_relation
         ElasticRecord::Relation.new(self, arelastic)
       end
 
       def arelastic
         @arelastic ||= Arelastic::Builders::Search.new
       end
+
+      def elastic_index
+        @elastic_index ||= ElasticRecord::Index.new(self)
+      end
+    end
+
+    def arelastic
+      self.class.arelastic
+    end
+
+    def elastic_index
+      self.class.elastic_index
     end
   end
 end

data/lib/elastic_record/relation/value_methods.rb

@@ -0,0 +1,6 @@
+module ElasticRecord
+  class Relation
+    MULTI_VALUE_METHODS  = [:extending, :filter, :facet, :order]
+    SINGLE_VALUE_METHODS = [:query, :limit, :offset]
+  end
+end

data/lib/elastic_record/relation.rb

@@ -1,13 +1,12 @@
-# require 'elastic_record/relation/delegation'
-# require 'elastic_record/relation/finder_methods'
-# require 'elastic_record/relation/merging'
-# require 'elastic_record/relation/search_methods'
+require 'elastic_record/relation/value_methods'
+require 'elastic_record/relation/batches'
+require 'elastic_record/relation/delegation'
+require 'elastic_record/relation/finder_methods'
+require 'elastic_record/relation/merging'
+require 'elastic_record/relation/search_methods'
 
 module ElasticRecord
   class Relation
-    MULTI_VALUE_METHODS  = [:extending, :filter, :facet, :order]
-    SINGLE_VALUE_METHODS = [:query, :limit, :offset]
-
     include Batches, Delegation, FinderMethods, Merging, SearchMethods
 
     attr_reader :klass, :arelastic, :values

data/lib/elastic_record/searching.rb

@@ -4,7 +4,7 @@ module ElasticRecord
       if current_elastic_search
         current_elastic_search.clone
       else
-        relation
+        elastic_relation
       end
     end
 

data/lib/elastic_record.rb

@@ -3,15 +3,8 @@ require 'arelastic'
 module ElasticRecord
   autoload :Config, 'elastic_record/config'
   autoload :Connection, 'elastic_record/connection'
-
+  autoload :Index, 'elastic_record/index'
+  autoload :Model, 'elastic_record/model'
   autoload :Relation, 'elastic_record/relation'
-  autoload :Batches, 'elastic_record/relation/batches'
-  autoload :Delegation, 'elastic_record/relation/delegation'
-  autoload :FinderMethods, 'elastic_record/relation/finder_methods'
-  autoload :Merging, 'elastic_record/relation/merging'
-  autoload :SearchMethods, 'elastic_record/relation/search_methods'
-
   autoload :Searching, 'elastic_record/searching'
-
-  autoload :Model, 'elastic_record/model'
 end

data/test/elastic_record/connection_test.rb

@@ -4,7 +4,7 @@ class ElasticRecord::ConnectionTest < MiniTest::Spec
   def test_elastic_connection
     connection = Widget.elastic_connection
 
-    assert_equal 'widget', connection.default_type
-    assert_equal 'widgets', connection.default_index
+    assert_equal Widget.elastic_index.type, connection.default_type
+    assert_equal Widget.elastic_index.name, connection.default_index
   end
 end

data/test/elastic_record/index/manage_test.rb

@@ -0,0 +1,4 @@
+require 'helper'
+
+class ElasticRecord::Index::ManageTest < MiniTest::Spec
+end

data/test/elastic_record/index/mapping_test.rb

@@ -0,0 +1,4 @@
+require 'helper'
+
+class ElasticRecord::Index::MappingTest < MiniTest::Spec
+end

data/test/elastic_record/index_test.rb

@@ -0,0 +1,10 @@
+require 'helper'
+
+class ElasticRecord::IndexTest < MiniTest::Spec
+  def test_elastic_connection
+    index = Widget.elastic_index
+
+    assert_equal 'widget', index.type
+    assert_equal 'widgets', index.name
+  end
+end

data/test/elastic_record/model_test.rb

@@ -1,10 +1,16 @@
 require 'helper'
 
 class ElasticRecord::ModelTest < MiniTest::Spec
-  def test_relation
-    relation = Widget.relation
+  def test_elastic_relation
+    relation = Widget.elastic_relation
 
     assert_equal Widget, relation.klass
     assert_equal Widget.arelastic, relation.arelastic
   end
+
+  def test_elastic_index
+    index = Widget.elastic_index
+
+    assert_equal Widget, index.model
+  end
 end

data/test/elastic_record/relation/batches_test.rb

@@ -8,7 +8,7 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Spec
 
   def test_find_each
     results = []
-    Widget.relation.find_each do |widget|
+    Widget.elastic_relation.find_each do |widget|
       results << widget.id
     end
     assert_equal ['5', '10', '15'].to_set, results.to_set
@@ -16,7 +16,7 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Spec
 
   def test_find_each_with_scope
     results = []
-    Widget.relation.filter(color: %w(red blue)).find_each do |widget|
+    Widget.elastic_relation.filter(color: %w(red blue)).find_each do |widget|
       results << widget.id
     end
     assert_equal ['5', '10'].to_set, results.to_set

data/test/elastic_record/relation/delegation_test.rb

@@ -10,7 +10,7 @@ class ElasticRecord::Relation::DelegationTest < MiniTest::Spec
     Widget.elastic_connection.refresh
     
     records = []
-    Widget.relation.each do |record|
+    Widget.elastic_relation.each do |record|
       records << record
     end
 
@@ -24,7 +24,7 @@ class ElasticRecord::Relation::DelegationTest < MiniTest::Spec
       end
     end
 
-    result = model.relation.filter('foo' => 'bar').do_it
+    result = model.elastic_relation.filter('foo' => 'bar').do_it
 
     expected = {"query"=>{"constant_score"=>{"filter"=>{"term"=>{"foo"=>"bar"}}}}}
     assert_equal expected, result 

data/test/elastic_record/relation/finder_methods_test.rb

@@ -7,28 +7,28 @@ class ElasticRecord::Relation::FinderMethodsTest < MiniTest::Spec
   end
 
   def test_find
-    refute_nil Widget.relation.find('05')
-    refute_nil Widget.relation.filter('color' => 'red').find('05')
-    assert_nil Widget.relation.filter('color' => 'blue').find('05')
+    refute_nil Widget.elastic_relation.find('05')
+    refute_nil Widget.elastic_relation.filter('color' => 'red').find('05')
+    assert_nil Widget.elastic_relation.filter('color' => 'blue').find('05')
   end
 
   def test_first
-    assert_equal '05', Widget.relation.first.id
-    assert_equal '05', Widget.relation.filter('color' => 'red').first.id
-    assert_equal '10', Widget.relation.filter('color' => 'blue').first.id
-    assert_nil Widget.relation.filter('color' => 'green').first
+    assert_equal '05', Widget.elastic_relation.first.id
+    assert_equal '05', Widget.elastic_relation.filter('color' => 'red').first.id
+    assert_equal '10', Widget.elastic_relation.filter('color' => 'blue').first.id
+    assert_nil Widget.elastic_relation.filter('color' => 'green').first
   end
 
   def test_last
-    assert_equal '10', Widget.relation.last.id
-    assert_equal '05', Widget.relation.filter('color' => 'red').last.id
-    assert_equal '10', Widget.relation.filter('color' => 'blue').last.id
-    assert_nil Widget.relation.filter('color' => 'green').last
+    assert_equal '10', Widget.elastic_relation.last.id
+    assert_equal '05', Widget.elastic_relation.filter('color' => 'red').last.id
+    assert_equal '10', Widget.elastic_relation.filter('color' => 'blue').last.id
+    assert_nil Widget.elastic_relation.filter('color' => 'green').last
   end
 
   def test_all
-    assert_equal 2, Widget.relation.all.size
-    assert_equal 1, Widget.relation.filter('color' => 'red').all.size
+    assert_equal 2, Widget.elastic_relation.all.size
+    assert_equal 1, Widget.elastic_relation.filter('color' => 'red').all.size
   end
 
   private

data/test/elastic_record/relation/merging_test.rb

@@ -2,8 +2,8 @@ require 'helper'
 
 class ElasticRecord::Relation::MergingTest < MiniTest::Spec
   def test_merge_single_values
-    relation = Widget.relation.limit(5)
-    other = Widget.relation.limit(10)
+    relation = Widget.elastic_relation.limit(5)
+    other = Widget.elastic_relation.limit(10)
 
     relation.merge! other
 
@@ -11,8 +11,8 @@ class ElasticRecord::Relation::MergingTest < MiniTest::Spec
   end
 
   def test_merge_multi_values
-    relation = Widget.relation.filter(color: 'green')
-    other = Widget.relation.filter(weight: 1.0)
+    relation = Widget.elastic_relation.filter(color: 'green')
+    other = Widget.elastic_relation.filter(weight: 1.0)
 
     relation.merge! other
 

data/test/elastic_record/relation/search_methods_test.rb

@@ -152,6 +152,6 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
 
   private
     def relation
-      @relation ||= Widget.relation
+      @relation ||= Widget.elastic_relation
     end
 end

data/test/elastic_record/relation_test.rb

@@ -7,39 +7,39 @@ class ElasticRecord::RelationTest < MiniTest::Spec
   end
 
   def test_to_hits
-    assert Widget.relation.to_hits.is_a?(ElasticSearch::Api::Hits)
+    assert Widget.elastic_relation.to_hits.is_a?(ElasticSearch::Api::Hits)
   end
 
   def test_to_ids
-    assert_equal ['5', '10'], Widget.relation.to_ids
+    assert_equal ['5', '10'], Widget.elastic_relation.to_ids
   end
 
   def test_to_a
-    array = Widget.relation.to_a
+    array = Widget.elastic_relation.to_a
 
     assert_equal 2, array.size
     assert array.first.is_a?(Widget)
   end
 
   def test_count
-    assert_equal 2, Widget.relation.count
+    assert_equal 2, Widget.elastic_relation.count
   end
 
   def test_facets
-    facets = Widget.relation.facet(Widget.arelastic.facet['popular_colors'].terms('color')).facets
+    facets = Widget.elastic_relation.facet(Widget.arelastic.facet['popular_colors'].terms('color')).facets
 
     assert_equal 2, facets['popular_colors']['total']
   end
 
   def test_equal
-    assert(Widget.relation.filter(color: 'green') == Widget.relation.filter(color: 'green'))
-    assert(Widget.relation.filter(color: 'green') != Widget.relation.filter(color: 'blue'))
+    assert(Widget.elastic_relation.filter(color: 'green') == Widget.elastic_relation.filter(color: 'green'))
+    assert(Widget.elastic_relation.filter(color: 'green') != Widget.elastic_relation.filter(color: 'blue'))
 
-    assert(Widget.relation.filter(color: 'magenta') == [])
+    assert(Widget.elastic_relation.filter(color: 'magenta') == [])
   end
 
   def test_inspect
-    assert_equal [].inspect, Widget.relation.filter(color: 'magenta').inspect
+    assert_equal [].inspect, Widget.elastic_relation.filter(color: 'magenta').inspect
   end
 
   private

data/test/elastic_record/searching_test.rb

@@ -6,7 +6,7 @@ class ElasticRecord::SearchingTest < MiniTest::Spec
   end
 
   def test_elastic_scope
-    model = Class.new(Widget) do
+    model = Widget.anon do
       elastic_scope :by_color, ->(color) { elastic_search.filter(color: color) } do
         def negative_offset
           -offset_value
@@ -16,7 +16,7 @@ class ElasticRecord::SearchingTest < MiniTest::Spec
 
     relation = model.by_color('blue')
 
-    assert_equal model.relation.filter(color: 'blue'), relation
+    assert_equal model.elastic_relation.filter(color: 'blue'), relation
     assert_equal -5, relation.offset(5).negative_offset
   end
 end

data/test/support/widget.rb

@@ -7,10 +7,19 @@ class Widget
       ids.map { |id| new(id: id, color: 'red') }
     end
 
+    def anon(&block)
+      Class.new(self) do
+        def self.name
+          'Widget'
+        end
+
+        instance_eval(&block)
+      end
+    end
 
     def reset_index!
-      elastic_connection.delete_index('widgets')
-      elastic_connection.create_index('widgets')
+      elastic_index.delete
+      elastic_index.create
       elastic_connection.update_mapping(
         {
           properties: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -68,6 +68,9 @@ extra_rdoc_files:
 files:
 - lib/elastic_record/config.rb
 - lib/elastic_record/connection.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/relation/batches.rb
@@ -75,11 +78,15 @@ files:
 - 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
 - test/elastic_record/config_test.rb
 - test/elastic_record/connection_test.rb
+- test/elastic_record/index/manage_test.rb
+- test/elastic_record/index/mapping_test.rb
+- test/elastic_record/index_test.rb
 - test/elastic_record/model_test.rb
 - test/elastic_record/relation/batches_test.rb
 - test/elastic_record/relation/delegation_test.rb