elastify 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3d823100945b0cb9a6129108a9505b2679e634c
-  data.tar.gz: 80b3798a246a0262592c94c47983a7cf26ddb949
+  metadata.gz: 52f92afd2a45df622a50571ed9a39d5ec3cb8518
+  data.tar.gz: 467a2373ede71ebadf822f31e7452e19ef4c7f71
 SHA512:
-  metadata.gz: 6b2d472e359aa8db1176980b981305cbc63c0b4789024f68836394b1b5b868b4535635fc17e8947f37ccf0d42a535b04ac366fd6b8548b3f8fb16b9f9879740d
-  data.tar.gz: d6878c1a436b7fdc189a0240964f7aab64b133235e6187305c1c766e4e0053e1124e2b32c1b01be15e23b19a1541f5bf07688f1778c99649acfb97041d388cc1
+  metadata.gz: 6c86d092e4fbbde756540849a5227398c735aa0c81757d2d177b0b4900838533a7e12bed990e836af6fcd64154002838315712a37dced0475441542ca5d0d240
+  data.tar.gz: 46a90cfc07fb96296b46a572a328799c2098a94f26e0b91689dce6b450677469bd99276781ecb6ac0af67b533462ad88e0815ca79a7bcb794406bd24e280e150

data/elastify.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."

data/lib/elastify/active_record_extensions.rb

@@ -7,18 +7,19 @@ module Elastify
         extend ActiveSupport::Concern
 
         module ClassMethods
-            def elastify options = {}, &block
+            def elastify elastify_options = {}, &block
                 include Elastify::ActiveRecordExtensions::LocalMethods
-                cattr_accessor :options, :elastify_model_block
+                cattr_accessor :elastify_options, :elastify_model_block
                 attr_accessor :elastify_serialized_document
 
-                self.options = {
+                self.elastify_options = {
                     base_url: Elastify.defaults[:base_url],
-                    index: options[:index] || Elastify.defaults[:default_index],
-                    type: options[:type] || Elastify.defaults[:default_type]
+                    index: elastify_options[:index] || Elastify.defaults[:default_index],
+                    type: elastify_options[:type] || Elastify.defaults[:default_type],
+                    map: elastify_options[:map] || Elastify.defaults[:default_map]
                 }
 
-                self.options.each do |key, value|
+                self.elastify_options.each do |key, value|
                     if value.blank? 
                         raise ElastifyError, "You must specify the #{key} value"
                     end
@@ -32,12 +33,40 @@ module Elastify
                     }
                 end
             end
-
-            
         end
 
         module LocalMethods
             extend ActiveSupport::Concern
+
+            def elastify_create
+                run_callbacks(:elastify_sync) do 
+                    if not self.elastify_serialized_document.blank?
+                        run_callbacks(:elastify_create) do
+                            ElasticSearchHelper::Document.new(self.elastify_options).create(self.elastify_serialized_document)
+                        end
+                    end
+                end
+            end
+
+            def elastify_update
+                run_callbacks(:elastify_sync) do 
+                    if not self.elastify_serialized_document.blank?
+                        run_callbacks(:elastify_update) do
+                            ElasticSearchHelper::Document.new(self.elastify_options).update(self.elastify_serialized_document)
+                        end
+                    end
+                end
+            end
+
+            def elastify_destroy 
+                run_callbacks(:elastify_sync) do 
+                    if not self.elastify_serialized_document.blank?
+                        run_callbacks(:elastify_destroy) do
+                            ElasticSearchHelper::Document.new(self.elastify_options).destroy(self.elastify_serialized_document)
+                        end
+                    end
+                end
+            end
             
             included do
                 define_model_callbacks :elastify_create
@@ -47,33 +76,15 @@ module Elastify
                 # define_model_callbacks :elastify_serialize
 
                 after_create { |item|
-                    run_callbacks(:elastify_sync) do 
-                        if not item.elastify_serialized_document.blank?
-                            run_callbacks(:elastify_create) do
-                                ElasticSearchHelper::Document.new(self.options).create(item.elastify_serialized_document)
-                            end
-                        end
-                    end
+                    item.elastify_create
                 }
 
                 after_update { |item|
-                    run_callbacks(:elastify_sync) do 
-                        if not item.elastify_serialized_document.blank?
-                            run_callbacks(:elastify_update) do
-                                ElasticSearchHelper::Document.new(self.options).update(item.elastify_serialized_document)
-                            end
-                        end
-                    end
+                    item.elastify_update
                 }
 
                 after_destroy { |item|
-                    run_callbacks(:elastify_sync) do 
-                        if not item.elastify_serialized_document.blank?
-                            run_callbacks(:elastify_destroy) do
-                                ElasticSearchHelper::Document.new(self.options).destroy(item.elastify_serialized_document)
-                            end
-                        end
-                    end
+                    item.elastify_destroy
                 }
 
                 before_elastify_sync { |item|
@@ -82,8 +93,12 @@ module Elastify
             end 
 
             module ClassMethods
-                def elastifind dsl
-                    return ElasticSearchHelper::Document.new(self.options).search(dsl)
+                def elastify_search(dsl: nil, scroll_timer: "1m")
+                    return ElasticSearchHelper::Document.new(self.elastify_options).search(dsl, scroll_timer)
+                end
+                
+                def elastify_scroll(scroll_id: nil, scroll_timer: "1m")
+                    return ElasticSearchHelper::Document.new(self.elastify_options).scroll(scroll_id, scroll_timer)
                 end
             end
         end

data/lib/elastify/elastic_search_helper.rb

@@ -6,20 +6,23 @@ module Elastify
                 self.options = options
             end
             def create model
-                Connector.create self.options, model
+                Connector.create(self.options, model)
             end
             def update model
-                Connector.update self.options, model
+                Connector.update(self.options, model)
             end
             def destroy model
-                Connector.destroy self.options, model
+                Connector.destroy(self.options, model)
             end
-            def search dsl
-                Connector.search self.options, dsl
+            def search dsl, scroll_timer = nil
+                Connector.search(self.options, dsl, scroll_timer)
+            end
+            def scroll scroll_id, scroll_timer = nil
+                Connector.scroll(self.options, scroll_id, scroll_timer)
             end
         end
         class Connector
-            def self.create options, data
+            def self.create(options, data)
                 if data.blank?
                     raise :elastify__create__required_data
                 end
@@ -49,22 +52,42 @@ module Elastify
                 url = "#{options[:base_url]}/#{options[:index]}/#{options[:type]}/#{data[:id]}"
                 response = JSON.parse(RestClient.delete(url)).to_hash
             end
-            def self.search options, dsl 
+            def self.search options, dsl, scroll_timer
                 if dsl.blank?
                     raise :elastify__search__required_dsl
                 end
                 url = "#{options[:base_url]}/#{options[:index]}/#{options[:type]}/_search"
+                url += "?scroll=#{scroll_timer}" if scroll_timer.present?
+                puts url
+                response = SearchResultSet.new(RestClient.post(url, dsl.to_json, {}))
+            end
+            def self.scroll options, scroll_id, scroll_timer
+                if scroll_id.blank?
+                    raise :elastify__search__required_scroll_id
+                end
+                url = "#{options[:base_url]}/_search/scroll"
+                dsl = { scroll: scroll_timer, scroll_id: scroll_id }
+                puts dsl.to_json
                 response = SearchResultSet.new(RestClient.post(url, dsl.to_json, {}))
             end
-            def self.destroy_type options
-                url = "#{options[:base_url]}/#{options[:index]}/#{options[:type]}"
+            def self.create_index options
+                url = "#{options[:base_url]}/#{options[:index]}"
+                response = JSON.parse(RestClient.put(url, {}.to_json, {})).to_hash
+            end
+            def self.destroy_index options
+                url = "#{options[:base_url]}/#{options[:index]}"
                 response = JSON.parse(RestClient.delete(url)).to_hash
             end
+            def self.create_mapping options
+                url = "#{options[:base_url]}/#{options[:index]}/_mappings/#{options[:type]}"
+                response = JSON.parse(RestClient.put(url, options[:map].to_json, {})).to_hash
+            end
         end
         class SearchResultSet
-            attr_accessor :took, :timed_out, :shards_total, :shards_successful, :shards_failed, :hits_total, :hits_maxscore, :hits
+            attr_accessor :scroll_id, :took, :timed_out, :shards_total, :shards_successful, :shards_failed, :hits_total, :hits_maxscore, :hits
             def initialize elasticsearch_search_result
                 esr = JSON.parse(elasticsearch_search_result)
+                self.scroll_id = esr["_scroll_id"]
                 self.took = esr["took"]
                 self.timed_out = esr["timed_out"]
                 self.shards_total = esr["_shards"]["total"]
@@ -78,11 +101,10 @@ module Elastify
         class SearchResult
             attr_accessor :index, :type, :id, :score, :source
             def initialize elasticsearch_search_result_hit
-                esrh = elasticsearch_search_result_hit
-                self.index = esrh["_index"]
-                self.type = esrh["_type"]
-                self.id = esrh["_id"]
-                self.source = OpenStruct.new(esrh["_source"])
+                self.index = elasticsearch_search_result_hit["_index"]
+                self.type = elasticsearch_search_result_hit["_type"]
+                self.id = elasticsearch_search_result_hit["_id"]
+                self.source = elasticsearch_search_result_hit["_source"]
             end
         end
     end

data/lib/elastify/version.rb

@@ -1,3 +1,3 @@
 module Elastify
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,117 +1,117 @@
 --- !ruby/object:Gem::Specification
 name: elastify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Bruno Bortolotti Ribeiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: backgrounded
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -163,7 +163,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -180,24 +180,24 @@ homepage: https://github.com/brunobortolotti/elastify.git
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
+  allowed_push_host: 'TODO: Set to ''http://mygemserver.com'''
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A gem to help with ActiveRecord-ElasticSeach integration