elasticsearch-resources 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c756ac85260a4494ea636097f1822781c5f77ae
-  data.tar.gz: 524f47bf9a8e792ff20ae9bdec1b2d815731d279
+  metadata.gz: 3786ed62f711a0d0d59098488e1e5ec2246af673
+  data.tar.gz: 954ed10b4e4d57570479061093996b59292984ac
 SHA512:
-  metadata.gz: 76593313dc578db22da8674d09a8ab42553fc0884ecfe6240cba92bc849f008f2581fe235b5288bb283bf242afcb49e1584e37080d57406329784256897e735d
-  data.tar.gz: eb77c111636f06b98c0fc55c2325c220986898997ed6655b7fb60c39e96919f67484c32f396615ee564138e9e85e46f9aeb25c9d4ce7c7ab5a4176f0170b9db6
+  metadata.gz: a921d3ed57b997a9c6c579615a8f03915aa922fbe26e2ab803ac371588a14e7b08b19c36e36e59ef596cfbd74c211daa589b0ce320e8447ddf894c0994d3b796
+  data.tar.gz: 02dfd1428fef704b47f4bd06d97904467e43823f64cad46e9dfdfece204dc6728f2866a805208b6fd5ab032ad878d03a59823e7d64a7420009d93af41d83cd83

data/README.md

@@ -1,7 +1,7 @@
 Elasticsearch::Resources
 ========================
 
-[![Build Status](https://travis-ci.org/delner/elasticsearch-resources.svg?branch=master)](https://travis-ci.org/delner/elasticsearch-resources) ![Gem Version](https://img.shields.io/gem/v/elasticsearch-resources.svg?maxAge=2592000)
+[![Build Status](https://travis-ci.org/delner/elasticsearch-resources.svg?branch=master)](https://travis-ci.org/delner/elasticsearch-resources) [![Gem Version](https://badge.fury.io/rb/elasticsearch-resources.svg)](https://badge.fury.io/rb/elasticsearch-resources)
 ###### *For Ruby 2.3+*
 
 `Elasticsearch::Resources` is a wrapper for the [Elasticsearch gem](https://github.com/elastic/elasticsearch-ruby) that provides a strongly typed interface for accessing your indexes, types, and documents.
@@ -11,7 +11,7 @@ Elasticsearch::Resources
 documents = film.search({ query: { match: { title: 'Tron' } } })
 documents # [#<Movie @title='Tron'>, #<Documentary @title='Making Tron'>]
 
-# Get a specific document: e.g. get { index: 'film', type: 'movie', id: 'tron' }
+# Get a specific document: e.g. get { index: 'film', type: 'movies', id: 'tron' }
 document = movies.get(id: 'tron') # #<Movie @title='Tron'>
 document.id # => 'tron'
 document.attributes # => { 'title' => 'Tron' }
@@ -44,7 +44,67 @@ gem 'elasticsearch/resources'
 
 And then `bundle install` to install the gem and its dependencies.
 
-### Usage
+### Common use cases
+
+##### Search all indexes in a cluster
+
+```ruby
+# Connects to default of '127.0.0.1:9200'
+cluster = Elasticsearch::Resources::Cluster.new
+
+# Hash can be any valid Elasticsearch query
+documents = cluster.search({ query: { match: { title: 'Tron' } } })
+```
+
+##### Search all types in an index
+
+```ruby
+# Connects to default of '127.0.0.1:9200'
+cluster = Elasticsearch::Resources::Cluster.new
+documents = cluster.search({ index: 'film', query: { match: { title: 'Tron' } } })
+
+# OR using a defined index
+index = Elasticsearch::Resources::Index.new(cluster: cluster) do |index|
+  index.name = 'film'
+end
+
+documents = index.search({ query: { match: { title: 'Tron' } } })
+```
+
+##### Search specific type in an index
+
+```ruby
+# Connects to default of '127.0.0.1:9200'
+cluster = Elasticsearch::Resources::Cluster.new
+documents = cluster.search({ index: 'film', type: 'movies', query: { match: { title: 'Tron' } } })
+
+# OR using a defined index & type
+index = Elasticsearch::Resources::Index.new(cluster: cluster) do |index|
+  index.name = 'film'
+end
+
+type = Elasticsearch::Resources::Type.new(index: index) do |type|
+  type.name = 'movies'
+end
+
+documents = type.search({ query: { match: { title: 'Tron' } } })
+```
+
+##### Creating a document
+
+```ruby
+# type: Elasticsearch::Resources::Type object
+document = Elasticsearch::Resources::Document.new(type: type, id: 'tron', attributes: { title: 'Tron' })
+document.create
+```
+
+##### Fetch a document
+
+```ruby
+document = type.get(id: 'tron')
+```
+
+### Resources
 
 There are four (4) basic resources which you can query with: `Cluster`, `Index`, `Type`, and `Document`.
 
@@ -62,6 +122,15 @@ cluster = Elasticsearch::Resources::Cluster.new do |cluster|
 end
 ```
 
+##### indexes
+
+Returns a `Hash` of well known indexes. Empty if no well-known indexes are defined (regardless of whether they actually exist in Elasticsearch.) See "Defining well known resources" and `define_indexes`.
+
+```ruby
+cluster.indexes
+# => { film: #<Elasticsearch::Resources::Index> }
+```
+
 ##### client
 
 Returns the underlying `Elasticsearch::Transport::Client`.
@@ -97,12 +166,30 @@ cluster.count({ query: { match: { title: 'Tron' } } })
 An `Elasticsearch::Resources::Index` represents an ElasticSearch index that contains multiple types. Requires a `Cluster` (see "Cluster" above.)
 
 ```ruby
-# Create an index
+# Create an index. You must set `name`.
 index = Elasticsearch::Resources::Index.new(cluster: cluster) do |index|
   index.name = 'film'
 end
 ```
 
+##### name
+
+Returns the name of the index, as it exists in Elasticsearch.
+
+```ruby
+index.name
+# => 'film'
+```
+
+##### types
+
+Returns a `Hash` of well known types. Empty if no well-known types are defined (regardless of whether they actually exist in Elasticsearch.) See "Defining well known resources" and `define_types`.
+
+```ruby
+index.types
+# => { movies: #<Elasticsearch::Resources::Type> }
+```
+
 ##### client
 
 Returns the underlying `Elasticsearch::Transport::Client`.
@@ -177,12 +264,21 @@ index.delete
 An `Elasticsearch::Resources::Type` represents an ElasticSearch type within an index. Requires a `Index` (see "Index" above.)
 
 ```ruby
-# Create a type
+# Create a type. You must set `name`.
 type = Elasticsearch::Resources::Type.new(index: index) do |type|
-  type.name = 'movies'
+  type.name = 'movie'
 end
 ```
 
+##### name
+
+Returns the name of the type, as it exists in Elasticsearch.
+
+```ruby
+type.name
+# => 'movie'
+```
+
 ##### client
 
 Returns the underlying `Elasticsearch::Transport::Client`.
@@ -263,6 +359,164 @@ type.get(id: 'tron')
 # => #<Elasticsearch::Resources::Document>
 ```
 
+#### Document
+
+An `Elasticsearch::Resources::Document` represents an ElasticSearch document within an index. Requires an `id` and `Type` (see "Type" above.)
+
+```ruby
+# Create a document
+document = Elasticsearch::Resources::Document.new(
+  type: type, # (Required)
+  id: 'tron', # (Required)
+  attributes: { title: 'Tron' } # (Optional)
+)
+```
+
+##### id
+
+Returns a `String` of the Document ID.
+
+```ruby
+document.id
+# => 'tron'
+```
+
+##### attributes
+
+Returns a `Hash` of the Document body.
+
+```ruby
+document.attributes
+# => { 'title' => 'Tron' }
+```
+
+##### client
+
+Returns the underlying `Elasticsearch::Transport::Client`.
+
+```ruby
+document.client
+```
+
+##### exists?
+
+Accepts `(options = {})` and calls [`exists?`](http://www.rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions#exists-instance_method) on the `Elasticsearch::Transport::Client`. Automatically adds the `index`, `type` and `id` option to your queries.
+
+Returns `true` or `false`.
+
+```ruby
+document.exists?
+# => true
+```
+
+##### create
+
+Accepts `(options = {})` and calls [`create`](http://www.rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions#create-instance_method) on the `Elasticsearch::Transport::Client`. Automatically adds the `index`, `type`, `id`, and `body` option to your queries.
+
+Throws error if document already exists.
+
+```ruby
+document.create
+```
+
+##### update
+
+Accepts `(options = {})` and calls [`update`](http://www.rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions#update-instance_method) on the `Elasticsearch::Transport::Client`. Automatically adds the `index`, `type`, `id`, and `body` option to your queries.
+
+```ruby
+document.update
+```
+
+##### delete
+
+Accepts `(options = {})` and calls [`delete`](http://www.rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions#delete-instance_method) on the `Elasticsearch::Transport::Client`. Automatically adds the `index`, `type` and `id` option to your queries.
+
+Throws error if document doesn't exist.
+
+```ruby
+document.delete
+```
+
+##### get
+
+Accepts `(options = {})` and calls [`get`](http://www.rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions#get-instance_method) on the `Elasticsearch::Transport::Client`. Automatically adds the `index`, `type` and `id` option to your queries.
+
+Returns `Elasticsearch::Resources::Document`.
+
+```ruby
+document.get
+# => #<Elasticsearch::Resources::Document>
+```
+
+### Defining well known resources
+
+#### Cluster
+
+```ruby
+class DavesAwesomeMovies < Elasticsearch::Resources::Cluster
+  # Set any default configuration settings here.
+  define_configuration defaults: -> { |cluster|
+    cluster.host = 'davesawesomemovies.com:9200'
+  }
+
+  # Provide a hash of keys to Index class names (either constants or strings)
+  define_indexes film: 'Film'
+end
+
+cluster = DavesAwesomeMovies.new
+cluster.indexes[:film] # => #<Film>
+```
+
+#### Index
+
+```ruby
+class Film < Elasticsearch::Resources::Index
+  # Set any default configuration settings here.
+  # Probably should set a name.
+  define_configuration defaults: -> { |index|
+    index.name = 'film'
+  }
+
+  # Provide a hash of keys to Type class names (either constants or strings)
+  define_type movie: 'Movie'
+end
+
+film = Film.new
+film.types[:movies] # => #<Movies>
+```
+
+#### Type
+
+```ruby
+class Movies < Elasticsearch::Resources::Type
+  # Set any default configuration settings here.
+  # Probably should set a name.
+  define_configuration defaults: -> { |type|
+    type.name = 'movie'
+  }
+
+  # Provide a Document class name (either constants or strings)
+  # If not called, type will return Elasticsearch::Resources::Document objects instead.
+  define_document 'Movie'
+end
+
+movies = Movies.new
+movies.get(id: 'tron') # => #<Movie>
+```
+
+#### Document
+
+```ruby
+class Movie < Elasticsearch::Resources::Document
+  # Provide a list of well known attributes
+  define_attributes :title, :year
+end
+
+movie = Movie.new(id: 'tron', type: movies, attributes: { title: 'Tron', year: 1982 })
+movie.title # => 'Tron'
+movie.year # => 1982
+```
+
 ## Development
 
 Install dependencies using `bundle install`. Run tests using `bundle exec rspec`

data/TODO

@@ -0,0 +1 @@
+[ ] Improve README

data/elasticsearch-resources.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Elasticsearch::Resources::VERSION
   spec.authors       = ["David Elner"]
   spec.email         = ["david@davidelner.com"]
+  spec.license       = 'Apache-2.0'
 
   spec.summary       = %q{Access well-known Elasticsearch indexes like resources.}
   spec.description   = %q{Allows you to strongly-type Elasticsearch types and query them more easily.}

data/lib/elasticsearch/resources/cluster.rb

@@ -4,12 +4,11 @@ module Elasticsearch
       include Resource
       include Queryable
       include Configurable
-      include Nameable
 
-      define_configuration class_name: Configuration::Cluster
+      define_configuration class_name: 'Elasticsearch::Resources::Configuration::Cluster'
 
       def initialize(&block)
-        configure(id: self.class.configuration.id, &block)
+        configure(&block)
       end
 
       def setup!
@@ -22,7 +21,21 @@ module Elasticsearch
       end
 
       def indexes
-        []
+        @indexes ||= self.class.indexes.collect do |key, index_class|
+          [
+            key,
+            build_index(key: key)
+          ]
+        end.to_h
+      end
+
+      def build_index(key:, index_class: nil)
+        index_class = self.class.indexes[key] if index_class.nil?
+        index_class&.new(cluster: self).tap do |index|
+          settings.index(key).tap do |settings|
+            index.settings = settings.dup unless settings.nil?
+          end
+        end
       end
 
       def search(body, options = {})
@@ -46,7 +59,7 @@ module Elasticsearch
       end
 
       def find_index(index:)
-        indexes.find do |i|
+        indexes.values.find do |i|
           i.find_index(index: index)
         end
       end
@@ -54,6 +67,20 @@ module Elasticsearch
       def find_type(index:, type:)
         find_index(index: index)&.find_type(index: index, type: type)
       end
+
+      def self.indexes
+        (@index_names ||= {}).collect do |key, index_name|
+          [key, Object.const_get(index_name)]
+        end.to_h
+      end
+
+      protected
+
+      def self.define_indexes(indexes = {})
+        @index_names = indexes.collect do |key, index|
+          [key.to_sym, index.class == Class ? index.name : index]
+        end.to_h
+      end
     end
   end
 end

data/lib/elasticsearch/resources/configurable.rb

@@ -13,25 +13,34 @@ module Elasticsearch
 
         protected
 
-        def define_configuration(options = {})
+        def define_configuration(attributes = {})
           @configuration = configuration.tap do |c|
-            options.each do |name, value|
-              c.send("#{name.to_s}=", value) if c.respond_to?("#{name.to_s}=") && !value.nil?
-            end
+            c.set_attributes(attributes)
           end
         end
       end
 
       module InstanceMethods
-        attr_reader :settings
+        attr_accessor :settings
 
         def default_settings
-          default_expression = self.class.configuration.default
-          default_expression ? self.instance_exec(&default_expression) : nil
+          self.class.configuration.configuration_class&.new.tap do |s|
+            defaults_block = self.class.configuration.defaults
+            self.instance_exec(s, &defaults_block) if defaults_block
+          end
+        end
+
+        def inherited_settings
+          inherit_block = self.class.configuration.inherit_from
+          if inherit_block
+            s = self.instance_exec(&inherit_block)&.dup
+          else
+            nil
+          end
         end
 
-        def configure(options = {}, &block)
-          @settings = default_settings&.dup || self.class.configuration.class_name&.new(**options)
+        def configure(&block)
+          @settings = inherited_settings || default_settings
           settings.tap do |s|
             yield(s) if block_given?
           end
@@ -39,10 +48,24 @@ module Elasticsearch
       end
 
       class Configuration
-        ATTRIBUTES = [:id, :class_name, :default].freeze
+        ATTRIBUTES = [:class_name, :inherit_from, :defaults].freeze
 
         attr_accessor *ATTRIBUTES
 
+        def set_attributes(attributes = {})
+          attributes.each do |name, value|
+            self.send("#{name.to_s}=", value) if self.respond_to?("#{name.to_s}=")
+          end
+        end
+
+        def class_name=(class_name)
+          @class_name = (class_name.class == Class ? class_name.name : class_name)
+        end
+
+        def configuration_class
+          class_name ? Object.const_get(class_name) : nil
+        end
+
         def ==(obj)
           ATTRIBUTES.all? { |a| obj.send(a) == self.send(a) }
         end

data/lib/elasticsearch/resources/configuration.rb

@@ -1,7 +1,8 @@
+require 'elasticsearch/resources/configuration/nameable'
+require 'elasticsearch/resources/configuration/settings'
 require 'elasticsearch/resources/configuration/type'
 require 'elasticsearch/resources/configuration/index'
 require 'elasticsearch/resources/configuration/cluster'
-require 'elasticsearch/resources/configuration/settings'
 
 module Elasticsearch
   module Resources

data/lib/elasticsearch/resources/configuration/cluster.rb

@@ -1,13 +1,7 @@
 module Elasticsearch
   module Resources
     module Configuration
-      class Cluster
-        attr_reader :id, :name
-
-        def initialize(id:)
-          @id = id
-        end
-
+      class Cluster < Settings
         def client
           @client ||= Elasticsearch::Client.new(host: host)
         end
@@ -16,17 +10,12 @@ module Elasticsearch
           @indexes ||= default_indexes
         end
 
-        def index(id)
-          indexes.find { |t| t.id == id.to_sym }.tap do |t|
+        def index(key)
+          indexes[key.to_sym].tap do |t|
             yield(t) if block_given?
           end
         end
 
-        def name=(name)
-          raise NullNameError.new if name.nil?
-          @name = name.to_s
-        end
-
         def host
           @host ||= '127.0.0.1:9200'
         end
@@ -36,16 +25,6 @@ module Elasticsearch
           @host = host
         end
 
-        class NullNameError < ArgumentError
-          def initialize
-            super(message)
-          end
-
-          def message
-            I18n.t('elasticsearch.resources.configuration.cluster.null_name_error.message')
-          end
-        end
-
         class NullHostError < ArgumentError
           def initialize
             super(message)
@@ -59,7 +38,7 @@ module Elasticsearch
         protected
 
         def default_indexes
-          []
+          {}
         end
       end
     end

data/lib/elasticsearch/resources/configuration/index.rb

@@ -1,43 +1,23 @@
 module Elasticsearch
   module Resources
     module Configuration
-      class Index
-        attr_reader :id, :name, :cluster
-
-        def initialize(id:, cluster:)
-          @id = id
-          @cluster = cluster
-        end
+      class Index < Settings
+        include Nameable
 
         def types
           @types ||= default_types
         end
 
-        def type(id)
-          types.find { |t| t.id == id.to_sym }.tap do |t|
+        def type(key)
+          types[key.to_sym].tap do |t|
             yield(t) if block_given? && !t.nil?
           end
         end
 
-        def name=(name)
-          raise NullNameError.new if name.nil?
-          @name = name.to_s
-        end
-
-        class NullNameError < ArgumentError
-          def initialize
-            super(message)
-          end
-
-          def message
-            I18n.t('elasticsearch.resources.configuration.index.null_name_error.message')
-          end
-        end
-
         protected
 
         def default_types
-          []
+          {}
         end
       end
     end

data/lib/elasticsearch/resources/configuration/nameable.rb

@@ -0,0 +1,34 @@
+module Elasticsearch
+  module Resources
+    module Configuration
+      module Nameable
+        def self.included(base)
+          base.extend(ClassMethods)
+          base.include(InstanceMethods)
+        end
+
+        module ClassMethods
+        end
+
+        module InstanceMethods
+          attr_reader :name
+
+          def name=(name)
+            raise NullNameError.new if name.nil?
+            @name = name.to_s
+          end
+        end
+
+        class NullNameError < ArgumentError
+          def initialize
+            super(message)
+          end
+
+          def message
+            I18n.t('elasticsearch.resources.configuration.nameable.null_name_error.message')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/elasticsearch/resources/configuration/settings.rb

@@ -2,23 +2,6 @@ module Elasticsearch
   module Resources
     module Configuration
       class Settings
-        def clusters
-          @clusters ||= default_clusters
-        end
-
-        def cluster(id)
-          clusters.find { |t| t.id == id.to_sym }.tap do |t|
-            yield(t) if block_given?
-          end
-        end
-
-        protected
-
-        def default_clusters
-          [
-            Elasticsearch::Resources::Configuration::Cluster.new(id: :default)
-          ]
-        end
       end
     end
   end

data/lib/elasticsearch/resources/configuration/type.rb

@@ -1,28 +1,8 @@
 module Elasticsearch
   module Resources
     module Configuration
-      class Type
-        attr_reader :id, :name, :index
-
-        def initialize(id:, index:)
-          @id = id
-          @index = index
-        end
-
-        def name=(name)
-          raise NullNameError.new if name.nil?
-          @name = name.to_s
-        end
-
-        class NullNameError < ArgumentError
-          def initialize
-            super(message)
-          end
-
-          def message
-            I18n.t('elasticsearch.resources.configuration.type.null_name_error.message')
-          end
-        end
+      class Type < Settings
+        include Nameable
       end
     end
   end

data/lib/elasticsearch/resources/describable.rb

@@ -8,7 +8,7 @@ module Elasticsearch
 
       module ClassMethods
         def attributes
-          @attributes ||= []
+          @attributes ||= superclass.respond_to?(:attributes) ? superclass.attributes.dup : []
         end
 
         protected

data/lib/elasticsearch/resources/document.rb

@@ -7,7 +7,7 @@ module Elasticsearch
       include Identifiable
       include Describable
 
-      def initialize(id:, attributes: {}, type:)
+      def initialize(type:, id:, attributes: {})
         self.type = type
         self.id = id
         self.attributes = attributes

data/lib/elasticsearch/resources/index.rb

@@ -7,13 +7,11 @@ module Elasticsearch
       include Clusterable
       include Nameable
 
-      define_configuration \
-        class_name: Configuration::Index,
-        default: -> { cluster.settings.index(self.class.configuration.id) }
+      define_configuration class_name: 'Elasticsearch::Resources::Configuration::Index'
 
       def initialize(cluster:, &block)
         self.cluster = cluster
-        configure(id: self.class.configuration.id, cluster: cluster.settings, &block)
+        configure(&block)
       end
 
       def setup!
@@ -35,11 +33,25 @@ module Elasticsearch
       end
 
       def name
-        settings.name || super
+        settings.name
       end
 
       def types
-        []
+        @types ||= self.class.types.collect do |key, type_class|
+          [
+            key,
+            build_type(key: key)
+          ]
+        end.to_h
+      end
+
+      def build_type(key:, type_class: nil)
+        type_class = self.class.types[key] if type_class.nil?
+        type_class&.new(index: self).tap do |type|
+          settings.type(key).tap do |settings|
+            type.settings = settings.dup unless settings.nil?
+          end
+        end
       end
 
       def query_index(action, options = {})
@@ -103,6 +115,20 @@ module Elasticsearch
           t.find_type(type: type)
         end
       end
+
+      def self.types
+        (@type_names ||= {}).collect do |key, type_name|
+          [key, Object.const_get(type_name)]
+        end.to_h
+      end
+
+      protected
+
+      def self.define_types(types = {})
+        @type_names = types.collect do |key, type|
+          [key.to_sym, type.class == Class ? type.name : type]
+        end.to_h
+      end
     end
   end
 end

data/lib/elasticsearch/resources/locales/en.yml

@@ -3,16 +3,11 @@ en:
     resources:
       configuration:
         cluster:
-          null_name_error:
-            message: 'Cluster cannot be assigned a nil name!'
           null_host_error:
             message: 'Cluster cannot be assigned a nil host!'
-        index:
-          null_name_error:
-            message: 'Index cannot be assigned a nil name!'
-        type:
+        nameable:
           null_name_error:
-            message: 'Type cannot be assigned a nil name!'
+            message: 'Cannot be assigned a nil name!'
       identifiable:
         null_id_error:
           message: "ID cannot be assigned a nil value!"

data/lib/elasticsearch/resources/nameable.rb

@@ -7,16 +7,11 @@ module Elasticsearch
       end
 
       module ClassMethods
-        attr_reader :default_name
-
-        def define_default_name(name)
-          @default_name = name&.to_s
-        end
       end
 
       module InstanceMethods
         def name
-          self.class.default_name
+          nil
         end
 
         def matches_name?(name)

data/lib/elasticsearch/resources/type.rb

@@ -7,9 +7,7 @@ module Elasticsearch
       include Indexable
       include Nameable
 
-      define_configuration \
-        class_name: Configuration::Type,
-        default: -> { index.settings.type(self.class.configuration.id) }
+      define_configuration class_name: 'Elasticsearch::Resources::Configuration::Type'
 
       ACTIONS = [
         :exists?,
@@ -21,7 +19,7 @@ module Elasticsearch
 
       def initialize(index:, &block)
         self.index = index
-        configure(id: self.class.configuration.id, index: index.settings, &block)
+        configure(&block)
       end
 
       def cluster
@@ -33,7 +31,7 @@ module Elasticsearch
       end
 
       def name
-        settings.name || super
+        settings.name
       end
 
       def query(action, options = {})
@@ -84,16 +82,16 @@ module Elasticsearch
       end
 
       def self.document_class
-        @document_class
+        Object.const_get(@document_class) if @document_class
       end
 
       protected
 
-      def self.define_document_class(document_class)
-        @document_class = document_class
+      def self.define_document(document_class)
+        @document_class = (document_class.class == Class ? document_class.name : document_class)
       end
 
-      define_document_class Elasticsearch::Resources::Document
+      define_document 'Elasticsearch::Resources::Document'
     end
   end
 end

data/lib/elasticsearch/resources/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Resources
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-resources
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - David Elner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -136,6 +136,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - bin/console
 - bin/setup
 - elasticsearch-resources.gemspec
@@ -146,6 +147,7 @@ files:
 - lib/elasticsearch/resources/configuration.rb
 - lib/elasticsearch/resources/configuration/cluster.rb
 - lib/elasticsearch/resources/configuration/index.rb
+- lib/elasticsearch/resources/configuration/nameable.rb
 - lib/elasticsearch/resources/configuration/settings.rb
 - lib/elasticsearch/resources/configuration/type.rb
 - lib/elasticsearch/resources/describable.rb
@@ -163,7 +165,8 @@ files:
 - lib/elasticsearch/resources/typeable.rb
 - lib/elasticsearch/resources/version.rb
 homepage: https://github.com/delner/elasticsearch-resources
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []