elastic_mapper 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44bac02c15e1ea5ac170e5ead716ed32d2a2e0c9
-  data.tar.gz: 1b1263a1980b20109be0a125776b56c597014066
+  metadata.gz: 8ef34e64a60623b87c60e8477416604d19138a10
+  data.tar.gz: b55837db1a514c41e356618b1e2681115e08a8fa
 SHA512:
-  metadata.gz: 7d034a538c4f0f657cddff452dbfe87e88db7e911dd5b52f9226f4706ec71b067ecb7cd035884fa1f4d7f72befa28193a8af30475a39fb2dac702ab665a7d5b5
-  data.tar.gz: 5dd79e2a9978c2ad677e4d85da8e05c6e3cca2add42df49cc8755d316e4a317fb755349f296d036a8ffb3b2ff9199be8805b4f5c3e57d9017d1c9034e2cc6f0f
+  metadata.gz: 1c9bdd0df778f890e22fe167a7eb5c4239ab7cf55e4910bd3661da841c96cb346bef64b633409b178b9b6eea961c70e035af937b905b4bff4c133160df73abf7
+  data.tar.gz: 91ecda07f660e90de9f2f2ab9819154a1f9189b78a8ab25a81e76d14d84ab70d765017d32fe0cbb90bb5493f4cc6ff8c15de0d6383c7c57e5f5a31103e633fbe

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile.lock

@@ -0,0 +1,70 @@
+PATH
+  remote: .
+  specs:
+    elastic_mapper (0.2.1)
+      faraday (~> 0.8.9)
+      stretcher
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    active_hash (1.3.0)
+      activesupport (>= 2.2.2)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
+    excon (0.33.0)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware-multi_json (0.0.6)
+      faraday_middleware
+      multi_json
+    hashie (2.1.1)
+    i18n (0.6.9)
+    json (1.8.1)
+    minitest (5.3.4)
+    multi_json (1.10.1)
+    multipart-post (1.2.0)
+    rake (10.3.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    stretcher (1.21.1)
+      excon (>= 0.16)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.9.0)
+      faraday_middleware-multi_json (~> 0.0.5)
+      hashie (>= 1.2.0)
+      multi_json (>= 1.0)
+    thread_safe (0.3.3)
+    tzinfo (1.2.0)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_hash
+  activesupport
+  bundler (~> 1.5)
+  elastic_mapper!
+  rake
+  rspec
+  simplecov

data/README.md

@@ -74,6 +74,20 @@ class Article < ActiveRecord::Base
 end
 ```
 
+Deleting a Document
+-------------------
+
+To remove a document from ElasticSearch, use the `delete_from_index` method.
+
+```ruby
+class Article < ActiveRecord::Base
+
+	include ElasticMapper
+
+	after_destroy :delete_from_index
+end
+```
+
 Searching
 ---------
 

data/elasticmapper.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "stretcher"
+  spec.add_dependency "faraday", "~>0.8.9"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rspec"

data/lib/elastic_mapper/index.rb

@@ -9,6 +9,13 @@ module ElasticMapper::Index
     ElasticMapper.index.type(mapping_name).put(self.id, index_hash)
   end
 
+  # Remove the document from the ElasticSearch index.
+  def delete_from_index
+    mapping_name = self.class.instance_variable_get(:@_mapping_name)
+
+    ElasticMapper.index.type(mapping_name).delete(self.id)
+  end
+
   # Generate a hash representation of the model.
   #
   # @return [Hash] hash representation of model.

data/lib/elastic_mapper/version.rb

@@ -1,3 +1,3 @@
 module ElasticMapper
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/spec/elastic_mapper/index_spec.rb

@@ -26,7 +26,7 @@ describe ElasticMapper::Index do
 
   describe "index" do
 
-    before(:each) do 
+    before(:each) do
       reset_index
       IndexModel.put_mapping
       ElasticMapper.index.refresh
@@ -45,4 +45,24 @@ describe ElasticMapper::Index do
       results.first.bar.should == 'Coe'
     end
   end
+
+  describe "delete_from_index" do
+    before(:each) do
+      reset_index
+      IndexModel.put_mapping
+      ElasticMapper.index.refresh
+    end
+    
+    it "removes the document from the search index" do
+      instance.index
+      ElasticMapper.index.refresh
+      instance.delete_from_index
+
+      results = ElasticMapper.index.type(:index_models)
+        .search({ size: 12, query: { "query_string" => {"query" => '*'} } })
+        .results
+
+      results.count.should == 1
+    end
+  end
 end

data/spec/elastic_mapper/mapping_spec.rb

@@ -31,7 +31,7 @@ describe ElasticMapper::Mapping do
     end
 
     it "creates unique name for field in mapping, if a collision occurs" do
-      mapping.has_key?(:foo_2).should == true      
+      mapping.has_key?(:foo_2).should == true
     end
 
     it "populates mapping entry with default options, if none given" do
@@ -78,12 +78,10 @@ describe ElasticMapper::Mapping do
 
   describe "put_mapping" do
 
-    let(:expected_properties) do 
+    let(:expected_properties) do
       {
         "foo" => { "type" => "string" },
-        "foo_2" => { "type" => "string", "index" => "not_analyzed",
-            "norms" => { "enabled" => false}, "index_options" => "docs"
-        },
+        "foo_2" => { "type" => "string", "index" => "not_analyzed"},
         "bar" => { "type" => "string" },
         "id" => { "type" => "integer", "index" => "no" }
       }.stringify_keys
@@ -92,10 +90,11 @@ describe ElasticMapper::Mapping do
 
     it "creates the mapping in ElasticSearch" do
       Model.put_mapping
-      
+
       properties = ElasticMapper.index
         .get_mapping
         .elastic_mapper_tests
+        .mappings
         .models
         .properties
         .to_hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_mapper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Benjamin Coe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stretcher
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +132,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -151,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A dead simple DSL for integrating ActiveModel with ElasticSearch.
@@ -160,4 +175,3 @@ test_files:
 - spec/elastic_mapper/mapping_spec.rb
 - spec/elastic_mapper/search_spec.rb
 - spec/spec_helper.rb
-has_rdoc: