gummi 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f3d41b1cee339b337559814eef1a6dbb0c1192f0
+  data.tar.gz: d2c5193d3fe4ee93d474ea0fd01d984a5b90bd4f
+SHA512:
+  metadata.gz: 390812c6190cdb4f41f52b094fafdabcd051013979803dd5380bd98679426d499e3bba2a91e2307a5ebb1c08ee5dadd6a8bf50b04d37bacb2c29a2999a649813
+  data.tar.gz: 1f3e154cb11f49ac05d62d6f37cdc4fa378b275616600f39f62c78d5e1ea1d90bb701f99aaf91e4113723d4e7d26ab8b3bd0fa691c166ad14b3751706458f8ee

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p484
+2.1.1

data/lib/gummi/configuration.rb

@@ -3,36 +3,25 @@ require 'logger'
 module Gummi
   class Configuration
 
-    attr_accessor :logger
+    include Virtus.model
 
-    def initialize(options={})
-      @logger = options[:logger] || default_logger
-    end
-
-    private
+    attribute :hosts,              Array[String], default: :default_hosts
+    attribute :logger,             Object,        default: :default_logger
+    attribute :reload_connections, Boolean,       default: false
+    attribute :retry_on_failure,   Boolean,       default: false
+    attribute :reload_on_failure,  Boolean,       default: false
+    attribute :randomize_hosts,    Boolean,       default: false
 
     def default_logger
       if defined?(Rails)
         Rails.logger
       else
-        Logger.new(STDOUT)
+        Logger.new(STDERR)
       end
     end
-  end
-
-  def self.config
-    @config ||= Configuration.new
-  end
-
-  # Public: Yields the configuration instance.
-  #
-  def self.configure(&block)
-    yield config
-  end
 
-  # Public: Reset the configuration (useful for testing).
-  #
-  def self.reset!
-    @config = nil
+    def default_hosts
+      ENV.fetch('GUMMI_HOSTS', 'localhost:9200').split(',')
+    end
   end
 end

data/lib/gummi/db_layer/document/search/searching.rb

@@ -46,7 +46,7 @@ module Gummi
           end
 
           def client
-            Gummi::API.client
+            Gummi.client
           end
 
         end

data/lib/gummi/db_layer/document.rb

@@ -29,7 +29,7 @@ module Gummi
         #
         # Returns true or false
         def exists?(id)
-          client.exists index: index.name, type: document_type, id: id
+          client.exists with_options(id: id)
         end
 
         def create(*args)
@@ -37,13 +37,21 @@ module Gummi
           instance.create ? instance : nil
         end
 
-        def get(id, parent_id = nil)
-          options = { index: index.name, type: document_type, id: id, fields: %w{ _source _parent } }
-          if parent_id
-            options.merge! parent: parent_id
-          elsif parent_document_type
-            raise ArgumentError, "The parent_id attribute is required for getting #{name} from Elastic Search"
-          end
+        # Public: Get document using the (realtime) get api
+        #
+        # id        - The document id
+        #
+        # parent_id - The parent id (required if getting a child document)
+        #
+        # Examples
+        #
+        #   DB::Rating.get('123', parent_id: '456')
+        #
+        # Returns the document if found, nil if not found
+        def get(id, parent_id: nil)
+          raise ArgumentError, "parent_id is required for getting child documents" if parent_document_type && parent_id.blank?
+          options = with_options({ id: id, fields: %w{ _source _parent } })
+          options.merge!(parent: parent_id) if parent_id
           response = ActiveSupport::Notifications.instrument "search.elasticsearch", name: "Document#get", search: options do
             Hashie::Mash.new client.get options
           end
@@ -53,8 +61,13 @@ module Gummi
         end
         alias :find :get
 
-        def delete(*args)
-          delete! *args
+        def delete(id, parent_id: nil)
+          raise ArgumentError, "parent_id is required for deleting child documents" if parent_document_type && parent_id.blank?
+          options = with_options(id: id)
+          options.merge! parent: parent_id if parent_id
+          response = ActiveSupport::Notifications.instrument "search.elasticsearch", name: "Document#delete!", search: options do
+            Hashie::Mash.new client.delete options
+          end
         rescue ::Elasticsearch::Transport::Transport::Errors::NotFound
           nil
         end
@@ -83,6 +96,10 @@ module Gummi
           Hashie::Mash.new client.delete_by_query options
         end
 
+        def with_options(options = {})
+          {index: index.name, type: document_type}.merge options
+        end
+
         # –––––––––––––––––––––
         # Public Conversion API
         # –––––––––––––––––––––
@@ -178,7 +195,7 @@ module Gummi
         # –––––––––––––––––––––––––––
 
         def client
-          Gummi::API.client
+          Gummi.client
         end
 
         private
@@ -188,18 +205,7 @@ module Gummi
         # ––––––––––––––––––––––––
 
 
-        def delete!(id, parent_id = nil)
-          options = { index: index.name, type: document_type, id: id }
-          if parent_id
-            options.merge! parent: parent_id
-          elsif parent_document_type
-            raise ArgumentError, "The parent_id attribute is required for getting #{name} from Elastic Search"
-          end
-          response = ActiveSupport::Notifications.instrument "search.elasticsearch", name: "Document#delete!", search: options do
-            Hashie::Mash.new client.delete options
-          end
-          response.found
-        end
+
 
       end
 

data/lib/gummi/db_layer/index.rb

@@ -145,7 +145,7 @@ module Gummi
         end
 
         def client
-          Gummi::API.client
+          Gummi.client
         end
 
       end

data/lib/gummi/repository_layer/repository.rb

@@ -45,8 +45,8 @@ module Gummi
       end
 
       def set_id_and_version(entity, db_instance)
-        entity.id      = db_instance.id
-        entity.version = db_instance.version
+        entity.id      = db_instance['id']
+        entity.version = db_instance['version']
       end
 
     end

data/lib/gummi/version.rb

@@ -1,3 +1,3 @@
 module Gummi
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/gummi.rb

@@ -11,7 +11,6 @@ require 'repobahn/entity'
 
 require 'gummi/version'
 require 'gummi/errors'
-require 'gummi/api'
 require 'gummi/configuration'
 
 require 'gummi/db_layer/index'
@@ -46,4 +45,21 @@ module Gummi
       RAILS_ENV || 'development'
     end
   end
+
+  def self.config
+    @config ||= Configuration.new
+  end
+
+  def self.configure(&block)
+    yield config
+  end
+
+  def self.client
+    @client ||= ::Elasticsearch::Client.new Gummi.config.attributes
+  end
+
+  def self.reload_configuration!
+    @client = ::Elasticsearch::Client.new Gummi.config.attributes
+  end
+
 end

data/spec/lib/gummi/db_layer/document_spec.rb

@@ -110,7 +110,7 @@ describe Gummi::DbLayer::Document do
     let(:rating) { DB::Rating.create person_id: person.id, stars: 5 }
 
     it 'creates and retrieves child documents' do
-      persisted_rating = DB::Rating.get(rating.id, person.id)
+      persisted_rating = DB::Rating.get(rating.id, parent_id: person.id)
       persisted_rating.person_id.should == person.id
     end
 
@@ -122,16 +122,16 @@ describe Gummi::DbLayer::Document do
 
     describe '#delete_children_by_query' do
       before do
-        DB::Rating.get(rating.id, person.id)
+        DB::Rating.get(rating.id, parent_id: person.id)
         Gummi::DbLayer::DefaultIndex.refresh
       end
 
       it 'deletes children by a query' do
-        DB::Rating.get(rating.id, person.id).should be_true
+        DB::Rating.get(rating.id, parent_id: person.id).should be_true
         DB::Rating.delete_children_by_query(person.id, term: { stars: 3 }).should be_true
-        DB::Rating.get(rating.id, person.id).should be_true
+        DB::Rating.get(rating.id, parent_id: person.id).should be_true
         DB::Rating.delete_children_by_query(person.id, term: { stars: 5 }).should be_true
-        DB::Rating.get(rating.id, person.id).should be_nil
+        DB::Rating.get(rating.id, parent_id: person.id).should be_nil
       end
     end
 

metadata

@@ -1,190 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: gummi
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - bukowskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: leaflet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A small wrapper around Elasticsearch
@@ -194,9 +171,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -205,7 +182,6 @@ files:
 - bin/console
 - gummi.gemspec
 - lib/gummi.rb
-- lib/gummi/api.rb
 - lib/gummi/configuration.rb
 - lib/gummi/db_layer/default_index.rb
 - lib/gummi/db_layer/document.rb
@@ -264,27 +240,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A small wrapper around Elasticsearch
 test_files:
 - spec/lib/gummi/db_layer/document_spec.rb
@@ -311,4 +286,3 @@ test_files:
 - spec/support/models/db/ship.rb
 - spec/support/models/people.rb
 - spec/support/models/person.rb
-has_rdoc: 

data/lib/gummi/api.rb

@@ -1,9 +0,0 @@
-module Gummi
-  module API
-
-    def self.client
-      @client ||= ::Elasticsearch::Client.new log: false
-    end
-
-  end
-end