elastify 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52f92afd2a45df622a50571ed9a39d5ec3cb8518
-  data.tar.gz: 467a2373ede71ebadf822f31e7452e19ef4c7f71
+  metadata.gz: 39b47345213b76f73caeca0ede7a9eee9714f969
+  data.tar.gz: dd96aae8aa98923485139aee53348e6d4749d989
 SHA512:
-  metadata.gz: 6c86d092e4fbbde756540849a5227398c735aa0c81757d2d177b0b4900838533a7e12bed990e836af6fcd64154002838315712a37dced0475441542ca5d0d240
-  data.tar.gz: 46a90cfc07fb96296b46a572a328799c2098a94f26e0b91689dce6b450677469bd99276781ecb6ac0af67b533462ad88e0815ca79a7bcb794406bd24e280e150
+  metadata.gz: 1a751e4ac6c914c472b472155a4090bceba325b8f341bf9ce2f03a4ad03a5204c23261241056ca6218f9e51b48eb68115268ba55155e12cf1d1297cd78c8e277
+  data.tar.gz: 1e958d6c57eeeceb74d4374231109b7c5596a496667236cda47e6638e3d794f8ba4bd3fc8e762c957039410e03c41e82fdda4b06d4b3cf3dccd3f0a7ddc0109c

data/lib/elastify/active_record_extensions.rb

@@ -1,22 +1,23 @@
 require 'active_record'
 require 'backgrounded'
 require 'elastify/elastic_search_helper'
+require 'elastify'
 
 module Elastify
     module ActiveRecordExtensions
         extend ActiveSupport::Concern
 
         module ClassMethods
-            def elastify elastify_options = {}, &block
+            def elastify type, index, &block
                 include Elastify::ActiveRecordExtensions::LocalMethods
                 cattr_accessor :elastify_options, :elastify_model_block
                 attr_accessor :elastify_serialized_document
 
                 self.elastify_options = {
-                    base_url: Elastify.defaults[:base_url],
-                    index: elastify_options[:index] || Elastify.defaults[:default_index],
-                    type: elastify_options[:type] || Elastify.defaults[:default_type],
-                    map: elastify_options[:map] || Elastify.defaults[:default_map]
+                    base_url: Elastify.configs[:base_url],
+                    index: index,
+                    type: type,
+                    map: Elastify.mappings.symbolize_keys[type.to_sym]
                 }
 
                 self.elastify_options.each do |key, value|
@@ -28,9 +29,13 @@ module Elastify
                 if block_given?
                     self.elastify_model_block = block
                 else 
-                    self.elastify_model_block = Proc.new { |item|
-                        next Hash.new
-                    }
+                    if self.respond_to?(:to_elastify)
+                        self.elastify_model_block = Proc.new { |item| next item.to_elastify }
+                    elsif self.respond_to?(:to_serial)
+                        self.elastify_model_block = Proc.new { |item| next item.to_serial }
+                    else   
+                        self.elastify_model_block = Proc.new { |item| next item.serializable_hash }
+                    end
                 end
             end
         end
@@ -106,4 +111,4 @@ module Elastify
     end
 end
 
-ActiveRecord::Base.send(:include, Elastify::ActiveRecordExtensions)
+ActiveRecord::Base.send(:include, Elastify::ActiveRecordExtensions)

data/lib/elastify/elastic_search_helper.rb

@@ -80,7 +80,8 @@ module Elastify
             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
+                puts options[:map]
+                response = JSON.parse(RestClient.put(url, options[:map].squish, {})).to_hash
             end
         end
         class SearchResultSet

data/lib/elastify/version.rb

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

data/lib/elastify.rb

@@ -2,12 +2,35 @@ require "elastify/version"
 require "elastify/active_record_extensions"
 
 module Elastify
-    cattr_accessor :defaults
     
-
     class << self
-        
-    end
+        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,
+            }
+        end
+
+        def configs
+            return Rails.application.config.elastify[:configs]
+        end 
 
+        def mappings
+            return Rails.application.config.elastify[:mappings]
+        end 
+    end
+    
     class ElastifyError < StandardError; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastify
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Bruno Bortolotti Ribeiro