elastify 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9390c61d979851afb2b3ad0fbbdfc7f101ee60e7
-  data.tar.gz: f7cb608d84f1f8be941b3f31ede57a22f354e628
+  metadata.gz: fa548bd07b0b3431f9fe21c4e1bec9dbfd0105ca
+  data.tar.gz: 8480f5cd58f69422dae23ca1255b143743c36d4a
 SHA512:
-  metadata.gz: 2fce9c0bd9ff7830fa362ade0403963580a5428c2bc6a964178fa01756c84b995112df8cc0adc99aee56378c02af9aaf335ea1add2188a2bb739492a1a531aeb
-  data.tar.gz: 752e3f93e04c8624eec5ef23f73af6fa2c06e1485e6de0988ca53bdd027bd3b3522cfa88c873153d826087998f44be28fbe00c3385c783937449c8ae53765561
+  metadata.gz: 63a937116d4d8109b629638f82e76ea1e1bf560f120f83124b1023d433dc1fd9ceee98c57f2eeb6e5cb556c58e710856bab31a0c106a2cff2d827e8068f9eeee
+  data.tar.gz: f7cee3663f6c6e7652e2a17b9e453b697d67e0d223d622d187019c1e36a14dbc743871cac7a07131fdfbeb79c1fe211b437630327e20d8eafd96f4f23cca09e5

data/elastify.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "elastify"
   spec.version       = Elastify::VERSION
   spec.authors       = ["Bruno Bortolotti Ribeiro"]
-  spec.email         = ["b2bortolotti@gmail.com"]
+  spec.email         = ["brunobortolotti@icloud.com"]
 
   spec.summary       = %q{A gem to help with ActiveRecord-ElasticSeach integration}
   spec.description   = %q{A gem to help with ActiveRecord-ElasticSeach integration}
@@ -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'] = "TODO: Set to 'http://mygemserver.com'"
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."

data/lib/elastify/active_record_extensions.rb

@@ -8,29 +8,46 @@ module Elastify::ActiveRecordExtensions
     module ClassMethods
         extend ActiveSupport::Concern
 
-        def elastify_setup(&block)
+        def elastify_model(model_name)
             include Elastify::ActiveRecordExtensions::LocalMethods
             cattr_accessor :elastify_options
             attr_accessor :elastify_serialized_document
 
-            config = Elastify::Configurators::Model.new
-            yield(config) if block_given?
+            model = Elastify.models[model_name.to_sym]
+            yield(model) if block_given?
             self.elastify_options = {} if self.elastify_options.blank?
-            self.elastify_options[:base_url] = Elastify.configs[:base_url]
-            self.elastify_options[:index] = config.opt_index if config.opt_index.present?
-            self.elastify_options[:type] = config.opt_type if config.opt_type.present?
-            self.elastify_options[:map] = config.opt_mapping if config.opt_mapping.present?
-            self.elastify_options[:decode] = config.opt_decode if config.opt_decode.present?
-            self.elastify_options[:encode] = config.opt_encode if config.opt_encode.present?
-            self.elastify_options[:scroll_timeout] = config.opt_scroll_timeout if config.opt_scroll_timeout.present?
+            self.elastify_options[:base_url] = Elastify.configs.base_url
+            self.elastify_options[:index] = model.opt_index if model.opt_index.present?
+            self.elastify_options[:type] = model.opt_type if model.opt_type.present?
+            self.elastify_options[:map] = model.opt_mapping if model.opt_mapping.present?
+            self.elastify_options[:decode] = model.opt_decode if model.opt_decode.present?
+            self.elastify_options[:encode] = model.opt_encode if model.opt_encode.present?
+            self.elastify_options[:scroll_timeout] = model.opt_scroll_timeout if model.opt_scroll_timeout.present?
+        end
+
+        def elastify_setup
+            include Elastify::ActiveRecordExtensions::LocalMethods
+            cattr_accessor :elastify_options
+            attr_accessor :elastify_serialized_document
+
+            model = Elastify::Model.new
+            yield(model) if block_given?
+            self.elastify_options = {} if self.elastify_options.blank?
+            self.elastify_options[:base_url] = Elastify.configs.base_url
+            self.elastify_options[:index] = model.opt_index if model.opt_index.present?
+            self.elastify_options[:type] = model.opt_type if model.opt_type.present?
+            self.elastify_options[:map] = model.opt_mapping if model.opt_mapping.present?
+            self.elastify_options[:decode] = model.opt_decode if model.opt_decode.present?
+            self.elastify_options[:encode] = model.opt_encode if model.opt_encode.present?
+            self.elastify_options[:scroll_timeout] = model.opt_scroll_timeout if model.opt_scroll_timeout.present?
         end
 
         def elastify_search(dsl: nil, scroll_timeout: nil)
-            return Elastify::Helpers::ElasticSearch::Document.new(self.elastify_options).search(dsl, scroll_timeout)
+            Elastify::Helpers::ElasticSearch::Document.new(self.elastify_options).search(dsl, scroll_timeout)
         end
 
         def elastify_scroll(scroll_id: nil, scroll_timeout: nil)
-            return Elastify::Helpers::ElasticSearch::Document.new(self.elastify_options).scroll(scroll_id, scroll_timeout)
+            Elastify::Helpers::ElasticSearch::Document.new(self.elastify_options).scroll(scroll_id, scroll_timeout)
         end
     end
 
@@ -39,7 +56,7 @@ module Elastify::ActiveRecordExtensions
 
         def elastify_create
             run_callbacks(:elastify_sync) do
-                if not self.elastify_serialized_document.blank?
+                unless self.elastify_serialized_document.blank?
                     run_callbacks(:elastify_create) do
                         Elastify::Helpers::ElasticSearch::Document.new(self.class.elastify_options).create(self.elastify_serialized_document)
                     end
@@ -49,7 +66,7 @@ module Elastify::ActiveRecordExtensions
 
         def elastify_update
             run_callbacks(:elastify_sync) do
-                if not self.elastify_serialized_document.blank?
+                unless self.elastify_serialized_document.blank?
                     run_callbacks(:elastify_update) do
                         Elastify::Helpers::ElasticSearch::Document.new(self.class.elastify_options).update(self.elastify_serialized_document)
                     end
@@ -59,7 +76,7 @@ module Elastify::ActiveRecordExtensions
 
         def elastify_destroy
             run_callbacks(:elastify_sync) do
-                if not self.elastify_serialized_document.blank?
+                unless self.elastify_serialized_document.blank?
                     run_callbacks(:elastify_destroy) do
                         Elastify::Helpers::ElasticSearch::Document.new(self.class.elastify_options).destroy(self.elastify_serialized_document)
                     end
@@ -90,9 +107,9 @@ module Elastify::ActiveRecordExtensions
                 if self.class.elastify_options[:encode].present?
                     encoder = self.class.elastify_options[:encode]
                 elsif self.respond_to?(:to_serial)
-                    encoder = Proc.new { |item| next item.to_serial }
+                    encoder = Proc.new { |i| next i.to_serial }
                 else
-                    encoder = Proc.new { |item| next item.serializable_hash }
+                    encoder = Proc.new { |i| next i.serializable_hash }
                 end
                 item.elastify_serialized_document = encoder.call(item)
             end

data/lib/elastify/config.rb

@@ -0,0 +1,30 @@
+module Elastify
+    class Config
+
+        attr_accessor :connection
+
+        def initialize
+            @connection = OpenStruct.new({protocol: 'http', host: 'localhost', port: '9200'})
+        end
+
+        def base_url=(uri)
+            m1 = /(http|https)\:\/\/([A-z0-9\_\-\.]+)\:([0-9]+)/.match(uri)
+            raise ArgumentError, 'Invalid URI' unless m1.present?
+            @connection.protocol = m1[1]
+            @connection.host = m1[2]
+            @connection.port = m1[3]
+        end
+
+        def base_url
+            "#{@connection.protocol}://#{@connection.host}:#{@connection.port}"
+        end
+
+
+        # OpenStruct.new({
+        #     connection: ,
+        #     indices: OpenStruct.new({default: ''}),
+        #     mappings: OpenStruct.new({autoload: true, autoload_path: Rails.root.join('config/elastify/mappings')}),
+        # })
+
+    end
+end

data/lib/elastify/configurators/model.rb

@@ -1,32 +1 @@
-module Elastify
-    module Configurators
-        class Model
 
-            attr_accessor :opt_index, :opt_type, :opt_mapping, :opt_encode, :opt_decode, :opt_scroll_timeout
-
-            def index(index)
-                @opt_index = index
-            end
-
-            def type(type)
-                @opt_type = type
-            end
-
-            def mapping(&block)
-                @opt_mapping = block.call() if block_given?
-            end
-
-            def encode(&block)
-                @opt_encode = block if block_given?
-            end
-
-            def decode(&block)
-                @opt_decode = block if block_given?
-            end
-
-            def scroll_timeout(scroll_timeout)
-                @opt_scroll_timeout = scroll_timeout
-            end
-        end
-    end
-end

data/lib/elastify/helpers/elastic_search/connector.rb

@@ -69,7 +69,6 @@ module Elastify
 
                 def self.create_mapping(options)
                     url = "#{options[:base_url]}/#{options[:index]}/_mappings/#{options[:type]}"
-                    puts options[:map]
                     JSON.parse(RestClient.put(url, options[:map].squish, {})).to_hash
                 end
             end

data/lib/elastify/model.rb

@@ -0,0 +1,34 @@
+module Elastify
+    class Model
+        attr_accessor :opt_index, :opt_type, :opt_mapping, :opt_encode, :opt_decode, :opt_scroll_timeout
+
+        def index(index)
+            @opt_index = index
+        end
+
+        def type(type)
+            @opt_type = type
+        end
+
+        def mapping(&block)
+            @opt_mapping = block.call() if block_given?
+        end
+
+        def mapping_file(file_name)
+            file_path = file_name.instance_of?(Pathname) ? file_name : Rails.root.join('config', 'elastify', 'mappings', file_name)
+            @opt_mapping = JSON.parse(File.read(file_path)).deep_symbolize_keys if File.exist?(file_path)
+        end
+
+        def encode(&block)
+            @opt_encode = block if block_given?
+        end
+
+        def decode(&block)
+            @opt_decode = block if block_given?
+        end
+
+        def scroll_timeout(scroll_timeout)
+            @opt_scroll_timeout = scroll_timeout
+        end
+    end
+end

data/lib/elastify/version.rb

@@ -1,3 +1,3 @@
 module Elastify
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/lib/elastify.rb

@@ -1,4 +1,6 @@
 require 'elastify/version'
+require 'elastify/config'
+require 'elastify/model'
 require 'elastify/errors/base'
 require 'elastify/errors/bad_request'
 require 'elastify/errors/connection'
@@ -11,35 +13,42 @@ require 'elastify/helpers/elastic_search/search_result_collection'
 
 
 module Elastify
-    
+
     class << self
-        def configure &block
-            mappings = {}
-            configs = OpenStruct.new({
-                base_url: 'http://localhost:9200',
-                mappings_path: Rails.root.join('config/elastify/mappings')
-            })
-            block.call(configs) if block_given?
-            dir = configs.mappings_path
-            if Dir.exist?(dir)
-                Dir.glob("#{dir}/*.json") do |file_path|
-                    mappings[File.basename(file_path, '.json')] = JSON.parse(File.read(file_path))
-                end
-            end
-            Rails.application.config.elastify = {
-                configs: configs,
-                mappings: mappings,
-            }
+
+        def init(&block)
+            load_configs(block)
+            load_models
         end
 
         def configs
-            return Rails.application.config.elastify[:configs]
-        end 
+            Rails.application.config.elastify_configs = Elastify::Config.new unless Rails.application.config.respond_to?(:elastify_configs)
+            Rails.application.config.elastify_configs
+        end
+
+        def models
+            Rails.application.config.elastify_models = {} unless Rails.application.config.respond_to?(:elastify_models)
+            Rails.application.config.elastify_models
+        end
 
-        def mappings
-            return Rails.application.config.elastify[:mappings]
-        end 
+        def register_model(model_name)
+            model = Elastify::Model.new
+            yield(model) if block_given?
+            models[model_name] = model
+        end
+
+        private
+            def load_configs(block)
+                block.call(configs) if block.present?
+            end
+
+            def load_models
+                path = Rails.root.join('config/elastify')
+                if Dir.exist?(path)
+                    Dir.glob("#{path}/*.rb") do |file_path|
+                        require file_path
+                    end
+                end
+            end
     end
-    
-    class ElastifyError < StandardError; end
 end

metadata

@@ -1,117 +1,117 @@
 --- !ruby/object:Gem::Specification
 name: elastify
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Bruno Bortolotti Ribeiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-07-10 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
@@ -158,12 +158,12 @@ dependencies:
         version: 0.9.9.3
 description: A gem to help with ActiveRecord-ElasticSeach integration
 email:
-- b2bortolotti@gmail.com
+- brunobortolotti@icloud.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -174,6 +174,8 @@ files:
 - elastify.gemspec
 - lib/elastify.rb
 - lib/elastify/active_record_extensions.rb
+- lib/elastify/config.rb
+- lib/elastify/configurators/initialization.rb
 - lib/elastify/configurators/model.rb
 - lib/elastify/errors/bad_request.rb
 - lib/elastify/errors/base.rb
@@ -183,29 +185,30 @@ files:
 - lib/elastify/helpers/elastic_search/search_result.rb
 - lib/elastify/helpers/elastic_search/search_result_collection.rb
 - lib/elastify/helpers/query_builder.rb
+- lib/elastify/model.rb
 - lib/elastify/version.rb
 homepage: https://github.com/brunobortolotti/elastify.git
 licenses:
 - MIT
 metadata:
-  allowed_push_host: 'TODO: Set to ''http://mygemserver.com'''
+  allowed_push_host: https://rubygems.org
 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.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to help with ActiveRecord-ElasticSeach integration