elastico 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWExODkwZTBhMGI1Y2RiYmY0YzlhNWRlOTExODZjODFmZGY5OTgwMA==
+    M2JkZTg4NmYzZjZkM2QwNjEyZjFjMjFiOGU2OGIzY2YyYjZmMzM1Nw==
   data.tar.gz: !binary |-
-    OTNjMWE2NGM4ZGU5YWI1MGQ2NDlkZDJjMWFjNmYxNWQ4YTkwZjZkOQ==
+    OGEwOTQ3ZDcwZWUzMDhkOGU5NjM4YWM0NTczMTE0N2U3MWQ0NDZiOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGVlZDQzZjMwZDdkNmRhNDBmMjBhYjBhMzM3ZDlmMjI5ZTMwNjAxZTgxZWI4
-    OTlhYWY1NzFkYzg4MDkyOGY4OGM0MjQ2YWEyOWZkY2ZiNWFjMWM5MGJiNGJh
-    Y2ZiY2Q1NmY2ZjQwNmQxNzdmMjQzYTc0MzA5Mjc5ZDMxZjYxZjQ=
+    OGRjYzhlZDUyNDhhOTZiYTg5MzYxNzVjMzhmMWE5NzgyNmQ4MTdjNTMwMWFl
+    MGZiMjBiMjY2ZDAwMGFlY2YyMDY0NWE4N2UxYmRkMmYyYTM2ZjNhNmZlMDZh
+    NTJjZjA1NGI5N2JkNWVhZTVjMWIxNWY1NjFlOGE1ZTM0YTM5NDA=
   data.tar.gz: !binary |-
-    ODU3MWMxYmJkMDM2NmMzYjcwMGZhYmQxYWM2OTNiNWQ1NzIwNmQ5NTYyYWIx
-    OWI5M2U1YjNhMDVhOWY4ZWQxYWRkM2ZkY2I2ZWVjYzRmZjI0NGJmZjQ1YzRk
-    NDdiZWNmMmFmMzlkNzdiYzJjNWY2ZDFjMmRiZTZkZDExNTE5NWQ=
+    NGZlZjQ1MzUyMTE2MGFlODIxMjQxZWVmYWZkYTkzMTcwNjE2YjZhZDZjYjIz
+    OTQ5ZGEwOGI3YmU2NjVmNDFhNmUxOWJkMjg2NmJlNGI2NTY2OTM1YTlmNjI5
+    ZDA2MTI2MTQzNmU2YmJkMjU3MmM1NzYyNmY3YzJmMjhhMWQ2ODI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elastico (0.0.1)
+    elastico (0.0.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -28,6 +28,18 @@ TODO: Write usage instructions here
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+Usage:
+
+In order to get a model work with elastic search you have to:
+1. Set Elastico::Configuration.url= to be the ip of your elasticsearch server (defaults to "localhost").
+2. Set Elastico::Index.settings_and_mappings_json= to be your settings and mapping json.
+3. Set up Elastico::Search.search_json= to be your standard search query for that model.
+4. Elastico will automatically save your active record models after every "save" call on that instance.
+5. In later versions I will add an auto rake task to import all of your Elastico models to elasticsearch server.
+
+
+In order to search this model, all you need to do is to do Model.elastic_search(term). This will return the elasticsearch results in an Elastico results object. You should override this method (elastic_search) if you want to get a better tailored solution.
+=======
 
 Usage:
 ======
@@ -75,4 +87,4 @@ settings_json[:settings] = {
                 }
               }
 
-a
+a

data/elastico.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Eyal Goren"]
   gem.email         = ["gneyal@gmail.com"]
   gem.description   = %q{A general way to use elasticsearch}
-  gem.summary       = %q{Elastico is a simple alternative to work with elasticsearch}
+  gem.summary       = %q{Elastico presents a simple way to work with elasticsearch. 1. Define your setup. 2. Define your search query. 3. Search.}
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($/)

data/lib/elastico/callbacks.rb

@@ -1,37 +1,20 @@
 module Elastico
-	module Callback
+	module Callbacks
 		def self.included(base)
-			update_conditions = lambda { update_index_with_instance }
+			update_conditions = lambda { update_index_with_instance_elastico }
 
 			base.send :after_save, update_conditions
 			base.send :after_destroy, update_conditions
-        	base.send :after_touch, update_conditions
+      base.send :after_touch, update_conditions
 		end
-	end
-end
-
-
 
-  module Callbacks
-    
-    def self.included(base)
-      update_conditions = lambda do
-                            if ElasticSearch.elasticsearch_alive
-                              acc_id = self.account_id
-                              if LG_FEATURES[:elastic_search].enabled? account_id
-                                Spawnling.new do
-                                    account = Admin::Account.find(acc_id)
-                                    account.connect_to_target_db
-                                    update_index_with_instance
-                                end
-                              end
-                            end
-                          end
-
-      if AppConfig["enable_tire_callbacks"] && base.respond_to?(:after_save) && base.respond_to?(:after_destroy)
-        base.send :after_save,    update_conditions
-        base.send :after_destroy, update_conditions
-        base.send :after_touch, update_conditions
-      end
+    def update_index_with_instance_elastico
+      type = self.class.elastico_type_name
+      index = self.class.elastico_index_name
+      id = self.id
+      url = self.class.elastico_url + index + "/" + type + "/" + id.to_s
+      instance = self.to_json
+      self.class.general_request(instance, url)
     end
-  end
+	end
+end

data/lib/elastico/client.rb

@@ -8,11 +8,11 @@ module Elastico
 			end
 		end
 
-		def general_request(url=Elastico::Configuration.url, content=nil)
-			RestClient.put(url, content, :content_type => :json, :accept => :json) do |response, request, result|
-			  puts JSON.pretty_generate(JSON.parse(response.to_str))
+		def general_request(content=nil, url=self.elastico_url, hash_respond_wanted = true)
+			RestClient.post(url, content, :content_type => :json, :accept => :json) do |response, request, result|
+			  ret = JSON.pretty_generate(JSON.parse(response.to_str))
+ 				hash_respond_wanted ? JSON.parse(ret) : ret
 			end
-			response
 		end
 
 		def elastico_search(hash_respond_wanted = true)

data/lib/elastico/index.rb

@@ -1,5 +1,9 @@
 module Elastico
 	module Index
+		def include_callbacks
+			include Elastico::Callbacks
+		end
+
 		def settings_and_mappings_json
 			@settings_and_mappings_json || nil
 		end

data/lib/elastico/search.rb

@@ -7,10 +7,5 @@ module Elastico
 		def search_query= json
 			@search_query = json
 		end
-
-		def raise_exception  
-		  raise 'An error has occured'  
-
-		end
 	end
 end

data/lib/elastico/version.rb

@@ -1,3 +1,3 @@
 module Elastico
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/elastico.rb

@@ -1,18 +1,18 @@
 require_relative "./elastico/configuration"
 require_relative "./elastico/version"
+require_relative "./elastico/callbacks"
 require_relative "./elastico/index"
 require_relative "./elastico/search"
 require_relative "./elastico/client"
 
 
 module Elastico
-  # Your code goes here...
-    
-    # making these modules class modules - meaning that the traits they define are set as class traits (not instance traits)
 	def self.included(base)
-    	base.extend Configuration
-    	base.extend Index
-    	base.extend Search
+  	base.extend Configuration
+  	base.extend Index
+  	base.extend Search
 		base.extend Client
-  	end
+
+		base.send :include_callbacks
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastico
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Eyal Goren
@@ -87,7 +87,8 @@ rubyforge_project:
 rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
-summary: Elastico is a simple alternative to work with elasticsearch
+summary: Elastico presents a simple way to work with elasticsearch. 1. Define your
+  setup. 2. Define your search query. 3. Search.
 test_files:
 - test/lib/elastico/client_test.rb
 - test/lib/elastico/configuration_test.rb