elastico 0.0.7 → 0.0.8

data/README.md

@@ -6,8 +6,10 @@ __Simple__. Elastico is built in a way so your configuration and usage is as sim
 
 __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.
 
-There is one reason for building it Simple and Full:
-Elasticsearch community is large. Its supportive, and very helpful. Though most of it does not use ruby. Its most likely that you want to spend your time on feaguring out how to use elasticsearch rather than how to use the gem that works with elasticsearch. If you use Elastico, its most likely that your time will go to the former, and will be able to take advantage of the elasticsearch community.
+There is one main reason for building it Simple and Full:
+Elasticsearch community is large. Its supportive, and very helpful, though most of it does not use ruby. Its most likely that you want to spend your time on feaguring out how to use elasticsearch rather than how to use the gem that works with elasticsearch. If you use Elastico, its most likely that your time will go to the former, and will be able to take advantage of the elasticsearch community.
+
+
 
 You should give Elastico a try if you want to use elasticsearch full api. 
 
@@ -49,19 +51,30 @@ Or install it yourself as:
 In your model:
 
     class Apple < ActiveRecord::Base
-      include Elastico
-      attr_accessible :color, :name
 
+      attr_accessible :color, :name
+      
       def self.prepare_elastico_settings_and_mappings_json
-        json = { "apple" => 
+        json = { "settings" => 
                   {
-                    "properties" => 
+                    "number_of_shards" => 3
+                  },
+                  "mappings" =>
+                  {
+                      "apple" => 
                       {
-                        "name" => {"type" => "string"},
-                        "color" => {"type" => "string"}
+                        "properties" => 
+                        {
+                          "name" => {"type" => "string"},
+                          "color" => {"type" => "string"}
+                        }
                       }
-                }}.to_json
-      end    
+                  }
+                }.to_json
+      end
+
+      # include elastico only after you declared your settings and mappings json in the method prepare_elastico_settings_and_mappings_json
+      include Elastico
     end
 
 
@@ -118,11 +131,13 @@ __Optional__
 
 4. Run Apple.elastico_import_all to import all your data.
 
+5. Controll what fields are indexed by declaring a method called 'elastico_to_indexed_json'.
+
 Use it.
 -------
 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.
+2. Import current database by Apple.elastico_import_all.
 
 3. Search it: call Apple.elastico_search to get your results, or override it to better suit your needs.
 

data/lib/elastico/callbacks.rb

@@ -9,7 +9,7 @@ module Elastico
       base.send :after_touch, update_conditions
 
       base.send :settings_and_mappings_json=, base.prepare_elastico_settings_and_mappings_json
-      base.send :send_settings_mappings_to_elasticsearch_server
+      # base.send :send_settings_mappings_to_elasticsearch_server
 		end
 
     def update_index_with_instance_elastico
@@ -17,7 +17,11 @@ module Elastico
       index = self.class.elastico_index_name
       id = self.id
       url = self.class.elastico_url + index + "/" + type + "/" + id.to_s
-      instance = self.to_json
+      if self.respond_to? :elastico_to_indexed_json
+        instance = self.elastico_to_indexed_json
+      else
+        instance = self.to_json 
+      end
       self.class.general_request(instance, url)
     end
 

data/lib/elastico/client.rb

@@ -2,7 +2,6 @@ module Elastico
 	module Client
 		def send_settings_mappings_to_elasticsearch_server
 			to_url = self.elastico_url + self.elastico_index_name
-			puts to_url
 			RestClient.put(to_url, self.settings_and_mappings_json, :content_type => :json, :accept => :json) do |response, request, result|
 			  puts JSON.pretty_generate(JSON.parse(response.to_str))
 			end

data/lib/elastico/version.rb

@@ -1,3 +1,3 @@
 module Elastico
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastico
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake