elastico 0.0.4 → 0.0.5

data/Gemfile.lock

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

data/README.md

@@ -2,7 +2,7 @@
 
 Elastico is a __simple__ layer that enables you to use elasticsearch __full__ API. The elasticsearch team created this [great API](http://www.elasticsearch.org/guide/) which enables you to do almost anything todays search engines allow you to do. 
 
-__Simple__. Elastico is built in a way so your configuration and usage is as simple and streat forward as possible. 
+__Simple__. Elastico is built in a way so your configuration and usage is as simple and straightforward as possible. 
 
 __Full__. Elastico is built to be transparent, non-blocking, non-opinionated layer between your code to elasticsearch API. Meaning Elastico won't force anything about how to index your active records models, neither how to search it.
 
@@ -21,6 +21,14 @@ In general, in order to be able to use elasticsearch search capabilities you sho
 
 ## Installation
 
+Install elasticsearch:
+
+    cd ~
+    wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.5.tar.gz .
+    tar -zxvf elasticsearch-0.90.5.tar.gz /bin/
+    rm elasticsearch-0.90.5.tar.gz
+    /bin/elasticsearch-0.90.5/bin/elasticsearch -f
+
 Add this line to your application's Gemfile:
 
     gem 'elastico'
@@ -37,21 +45,19 @@ Or install it yourself as:
 
 In your model:
 
-  class Apple < ActiveRecord::Base
-
-    def self.prepare_elastico_settings_and_mappings_json
-      json = { "apple" => {
-            "properties" => {
-                "name" => {"type" => "string"},
-                "color" => {"type" => "string"}
-            }
-        }}.to_json
+    class Apple < ActiveRecord::Base
+      include Elastico
+      attr_accessible :color, :name
+
+      def self.prepare_elastico_settings_and_mappings_json
+        json = { "apple" => {
+              "properties" => {
+                  "name" => {"type" => "string"},
+                  "color" => {"type" => "string"}
+              }
+          }}.to_json
+      end    
     end
-    include Elastico
-
-    attr_accessible :color, :name
-    
-  end
 
 
 In your controller:
@@ -80,7 +86,7 @@ In your controller:
 
 Learn by Example
 ================
-Fork the example app that shows how to use Elastico [here](https://github.com/gneyal/ElasticoExample).
+Fork/Clone the example app that shows how to use Elastico [here](https://github.com/gneyal/ElasticoExample).
 
 
 Configure it
@@ -102,9 +108,11 @@ __Optional__
 
 3. Set up Apple.elastico\_type\_name (optional - defaults to your class name; here it will be Apple).
 
+4. Run Apple.elastico_import_all to import all your data.
+
 Use it.
 -------
-1. After every save Elastico will automatically save you instance in elasticsearch.
+1. After every save Elastico will automatically save your instance in elasticsearch.
 
 2. Import current database instances by creating a rake task to "save" them all.
 

data/lib/elastico/callbacks.rb

@@ -3,7 +3,8 @@ module Elastico
 		def self.included(base)
 			update_conditions = lambda { update_index_with_instance_elastico }
       destroy_instance = lambda { destroy_instance_in_elastic_search }
-			base.send :after_save, update_conditions
+			
+      base.send :after_save, update_conditions
 			base.send :after_destroy, destroy_instance
       base.send :after_touch, update_conditions
 

data/lib/elastico/client.rb

@@ -13,8 +13,6 @@ module Elastico
 		end
 
 		def general_request(content=nil, url=self.elastico_url, options = { :hash_respond_wanted => :true })
-
-				logger.info("========== in post ")
 				RestClient.post(url, content, :content_type => :json, :accept => :json) do |response, request, result|
 				  ret = JSON.pretty_generate(JSON.parse(response.to_str))
 	 				options[:hash_respond_wanted] ? JSON.parse(ret) : ret

data/lib/elastico/import.rb

@@ -0,0 +1,11 @@
+module Elastico
+	module Import
+		def elastico_import_all
+			self.find_each do |instance|
+				result = instance.update_index_with_instance_elastico
+				logger.info result
+			end
+			puts "Index for #{self.name} has finished. Errors regarding specific instances have been logged."
+		end
+	end
+end

data/lib/elastico/index.rb

@@ -26,6 +26,11 @@ module Elastico
 
 		def elastico_type_name= type_name
 			@type_name = type_name
-		end	
+		end
+
+		# This method should be over written in the model that includes elastico
+		def prepare_elastico_settings_and_mappings_json
+		  nil
+  	end
 	end
 end

data/lib/elastico/version.rb

@@ -1,3 +1,3 @@
 module Elastico
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/elastico.rb

@@ -4,7 +4,7 @@ require_relative "./elastico/callbacks"
 require_relative "./elastico/index"
 require_relative "./elastico/search"
 require_relative "./elastico/client"
-
+require_relative "./elastico/import"
 
 module Elastico
 	def self.included(base)
@@ -12,6 +12,7 @@ module Elastico
   	base.extend Index
   	base.extend Search
 		base.extend Client
+		base.extend Import
 
 		base.send :include_callbacks
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastico
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -77,6 +77,7 @@ files:
 - lib/elastico/callbacks.rb
 - lib/elastico/client.rb
 - lib/elastico/configuration.rb
+- lib/elastico/import.rb
 - lib/elastico/index.rb
 - lib/elastico/search.rb
 - lib/elastico/version.rb