lotus-rethinkdb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 737a2817a5f539d7027d688b4bc510037206d0c5
-  data.tar.gz: a118133ad334d38dd49b3cb505aa596e92af4ded
+  metadata.gz: 7dd4f3f3377f4a03062e673ee934296589c1ff1e
+  data.tar.gz: dcedbcd89c9aa0685e8d2a2c181006099c7057a2
 SHA512:
-  metadata.gz: eaebeddd187f711f8ac12cdfd88637543978e0297590bc2e90b343f8bddb3acdd2f5ced130911ba16b6e7ae45af5caf79bf9f986e6a9cdd43ceb3b4224d08b95
-  data.tar.gz: 5c235fe25c5c2a977f200e2877e3607caa2ad8585be679f669a5f187bd97404aa6fa35d0445dce415e42796b74e8a73a3b3d2e159e00c7e2e8691143c16209c6
+  metadata.gz: 643f2c1c4600ace72f144c2ff8788e27c21a069618e2cabede36988047278fb642e2bf3c1993a79deb473aaaddb36ab96b209c824c77a269d7db59ecd5bb1cce
+  data.tar.gz: 20455fed86bdb86691d7568b06db69fb82f8228f925374ee6c90dc8e06a485695c44f5f790ef34c0d7ada708d7d6e8481d281bd4599e58643cc5859ecc05486e

data/.travis.yml

@@ -10,7 +10,10 @@ rvm:
   - 2.1.5
   - 2.2.0
 
-services: rethinkdb
-
-before_script:
-  - sudo add-apt-repository ppa:rethinkdb/ppa && sudo apt-get update && sudo apt-get install rethinkdb
+before_install:
+  - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
+  - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
+  - sudo apt-get update -q
+  - sudo apt-get install rethinkdb
+  - sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf
+  - sudo service rethinkdb restart

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in lotus-rethinkdb.gemspec
 gemspec
+
+gem 'coveralls', require: false

data/README.md

@@ -1,6 +1,19 @@
 # Lotus::Model RethinkDB Adapter
 
-This adapter implements persistence layer for RethinkDB. Under development.
+This adapter implements a [Lotus::Model](https://github.com/lotus/model) persistence layer for [RethinkDB](http://rethinkdb.com).
+
+## Status
+
+[![Gem Version](https://badge.fury.io/rb/lotus-rethinkdb.svg)](http://badge.fury.io/rb/lotus-rethinkdb)
+[![Build Status](https://secure.travis-ci.org/angeloashmore/lotus-rethinkdb.svg?branch=master)](http://travis-ci.org/angeloashmore/lotus-rethinkdb?branch=master)
+[![Coverage Status](https://img.shields.io/coveralls/angeloashmore/lotus-rethinkdb.svg)](https://coveralls.io/r/angeloashmore/lotus-rethinkdb)
+[![Code Climate](https://codeclimate.com/github/angeloashmore/lotus-rethinkdb/badges/gpa.svg)](https://codeclimate.com/github/angeloashmore/lotus-rethinkdb)
+[![Inline docs](http://inch-ci.org/github/angeloashmore/lotus-rethinkdb.svg?branch=master&style=flat)](http://inch-ci.org/github/angeloashmore/lotus-rethinkdb)
+
+## Links
+
+* API Doc: [http://rdoc.info/gems/lotus-rethinkdb](http://rdoc.info/gems/lotus-rethinkdb)
+* Bugs/Issues: [https://github.com/angeloashmore/lotus-rethinkdb/issues](https://github.com/angeloashmore/lotus-rethinkdb/issues)
 
 ## Installation
 
@@ -20,7 +33,36 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Please refer to the [Lotus::Model](https://github.com/lotus/model#usage) docs for any details related to Entity, Repository, Data Mapper and Adapter.
+
+### Repository methods
+
+See the [complete list](https://github.com/lotus/model#repositories) of Repository methods provided by ```Lotus::Model```.
+
+Following methods are not supported since it's incompatible with RethinkDB:
+
+* first
+* last
+
+### Query methods
+
+Generic query methods supported by the RethinkDB adapter:
+
+* [all](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#all-instance_method)
+* [where](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#where-instance_method)
+* [limit](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#limit-instance_method)
+* [order](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#order-instance_method) (alias: ```asc```)
+* [desc](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#desc-instance_method)
+* [sum](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#dum-instance_method)
+* [average](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#average-instance_method) (alias: ```avg```)
+* [max](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#max-instance_method)
+* [min](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#min-instance_method)
+* [count](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#count-instance_method)
+
+RethinkDB-specific methods:
+
+* [pluck](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#pluck-instance_method)
+* [has_fields](http://rubydoc.info/gems/lotus-rethinkdb/Lotus/Model/Adapters/Rethinkdb/Query#has_fields-instance_method)
 
 ## Contributing
 

data/lib/lotus/model/adapters/rethinkdb/collection.rb

@@ -105,6 +105,21 @@ module Lotus
             _collection(super, @mapped_collection)
           end
 
+          # Filters the current scope with a `has_fields` directive.
+          #
+          # @param args [Array] the array of arguments
+          #
+          # @see Lotus::Model::Adapters::Rethinkdb::Query#has_fields
+          #
+          # @return [Lotus::Model::Adapters::Rethinkdb::Collection] the filtered
+          #   collection
+          #
+          # @api private
+          # @since 0.1.0
+          def has_fields(*args) # rubocop:disable Style/PredicateName
+            _collection(super, @mapped_collection)
+          end
+
           # Filters the current scope with a `limit` directive.
           #
           # @param args [Array] the array of arguments
@@ -136,6 +151,86 @@ module Lotus
             _collection(super, @mapped_collection)
           end
 
+          # Returns the sum of the values for the given field.
+          #
+          # @param args [Array] the array of arguments
+          #
+          # @see Lotus::Model::Adapters::Rethinkdb::Query#sum
+          #
+          # @return [Numeric]
+          #
+          # @api private
+          # @since 0.1.0
+          def sum(*args)
+            _run do
+              super
+            end
+          end
+
+          # Returns the average of the values for the given column.
+          #
+          # @param args [Array] the array of arguments
+          #
+          # @see Lotus::Model::Adapters::Rethinkdb::Query#avg
+          #
+          # @return [Numeric]
+          #
+          # @api private
+          # @since 0.1.0
+          def avg(*args)
+            _run do
+              super.default(nil)
+            end
+          end
+
+          # Returns the maximum value for the given field.
+          #
+          # @param args [Array] the array of arguments
+          #
+          # @see Lotus::Model::Adapters::Rethinkdb::Query#max
+          #
+          # @return [Numeric]
+          #
+          # @api private
+          # @since 0.1.0
+          def max(field, *args)
+            _run do
+              super[field].default(nil)
+            end
+          end
+
+          # Returns the minimum value for the given field.
+          #
+          # @param args [Array] the array of arguments
+          #
+          # @see Lotus::Model::Adapters::Rethinkdb::Query#min
+          #
+          # @return [Numeric]
+          #
+          # @api private
+          # @since 0.1.0
+          def min(field, *args)
+            _run do
+              super[field].default(nil)
+            end
+          end
+
+          # Returns a count of the documents for the current conditions.
+          #
+          # @param args [Array] the array of arguments
+          #
+          # @see Lotus::Model::Adapters::Rethinkdb::Query#count
+          #
+          # @return [Numeric]
+          #
+          # @api private
+          # @since 0.1.0
+          def count
+            _run do
+              super
+            end
+          end
+
           # Resolves self by fetching the documents from the database and
           # translating them into entities.
           #

data/lib/lotus/model/adapters/rethinkdb/query.rb

@@ -132,6 +132,30 @@ module Lotus
             self
           end
 
+          # Only include documents with the given fields.
+          #
+          # @param fields [Array<Symbol>]
+          #
+          # @return self
+          #
+          # @since 0.1.0
+          #
+          # @example Single column
+          #
+          #   query.has_fields(:name)
+          #
+          #   # => r.has_fields(:name)
+          #
+          # @example Multiple columns
+          #
+          #   query.has_fields(:name, :year)
+          #
+          #   # => r.has_fields(:name, :year)
+          def has_fields(*fields) # rubocop:disable Style/PredicateName
+            conditions.push([:has_fields, *fields])
+            self
+          end
+
           # Limit the number of documents to return.
           #
           # This operation is performed at the database level with r.limit().
@@ -229,14 +253,112 @@ module Lotus
           #
           # @example Mixed fields and index
           #
-          #   query.desc(r.desc(:name), r.desc(:year), index: r.desc(:date))
+          #   query.desc(:name, :year, { index: r.desc(:date) })
           #
-          #   # => r.order_by(:name, :year, index: :date)
+          #   # => r.order_by(r.desc(:name), r.desc(:year), { index:
+          #                   r.desc(:date) })
           def desc(*fields)
             conditions.push([:order_by, *_desc_wrapper(*fields)])
             self
           end
 
+          # Returns the sum of the values for the given field.
+          #
+          # @param field [Symbol] the field name
+          #
+          # @return [Numeric]
+          #
+          # @since 0.1.0
+          #
+          # @example
+          #
+          #    query.sum(:comments_count)
+          #
+          #    # => r.sum(:comments_count)
+          def sum(field)
+            scoped.sum(field)
+          end
+
+          # Returns the average of the values for the given field.
+          #
+          # @param field [Symbol] the column name
+          #
+          # @return [Numeric]
+          #
+          # @since 0.1.0
+          #
+          # @example
+          #
+          #    query.average(:comments_count)
+          #
+          #    # => r.avg(:comments_count)
+          def average(field)
+            scoped.avg(field)
+          end
+
+          alias_method :avg, :average
+
+          # Returns the maximum value for the given field.
+          #
+          # @param field [Symbol] the field name
+          #
+          # @return result
+          #
+          # @since 0.1.0
+          #
+          # @example With numeric type
+          #
+          #    query.max(:comments_count)
+          #
+          #    # r.max(:comments_count)
+          #
+          # @example With string type
+          #
+          #    query.max(:title)
+          #
+          #    # => r.max(:title)
+          def max(field)
+            has_fields(field)
+            scoped.max(field)
+          end
+
+          # Returns the minimum value for the given field.
+          #
+          # @param field [Symbol] the field name
+          #
+          # @return result
+          #
+          # @since 0.1.0
+          #
+          # @example With numeric type
+          #
+          #    query.min(:comments_count)
+          #
+          #    # => r.min(:comments_count)
+          #
+          # @example With string type
+          #
+          #    query.min(:title)
+          #
+          #    # => r.min(:title)
+          def min(field)
+            has_fields(field)
+            scoped.min(field)
+          end
+
+          # Returns a count of the records for the current conditions.
+          #
+          # @return [Fixnum]
+          #
+          # @since 0.1.0
+          #
+          # @example
+          #
+          #    query.where(author_id: 23).count # => 5
+          def count
+            scoped.count
+          end
+
           # Apply all the conditions and returns a filtered collection.
           #
           # This operation is idempotent, and the returned result didn't

data/lib/lotus/model/adapters/rethinkdb_adapter.rb

@@ -16,6 +16,13 @@ module Lotus
       class RethinkdbAdapter < Abstract
         include ::RethinkDB::Shortcuts
 
+        # @attr_reader parsed_uri [Hash] the database connection details parsed
+        #   from a URI
+        #
+        # @since 0.1.0
+        # @api private
+        attr_reader :parsed_uri
+
         # Initialize the adapter.
         #
         # Lotus::Model uses RethinkDB.
@@ -30,9 +37,9 @@ module Lotus
         #
         # @api private
         # @since 0.1.0
-        def initialize(mapper, connection)
-          super(mapper)
-          @connection = connection
+        def initialize(mapper, uri)
+          super
+          @connection = r.connect(_parse_uri)
         end
 
         # Creates or updates a document in the database for the given entity.
@@ -192,6 +199,26 @@ module Lotus
 
         private
 
+        # Sets a parsed URI hash to be used when creating the database
+        # connection.
+        #
+        # @api private
+        # @since 0.1.0
+        def _parse_uri
+          parsed = URI.parse(@uri)
+          db = parsed.path.gsub(/^\//, '')
+
+          fail DatabaseAdapterNotFound if parsed.scheme != 'rethinkdb'
+          fail "No database specified in #{@uri}" if db.empty? || db.nil?
+
+          {
+            auth_key: parsed.password,
+            host: parsed.host,
+            port: parsed.port || 28_015,
+            db: db
+          }
+        end
+
         # Returns a collection from the given name.
         #
         # @param name [Symbol] a name of the collection (it must be mapped).

data/lib/lotus/rethinkdb/version.rb

@@ -1,16 +1,12 @@
 module Lotus
-  module Model
-    module Adapters
-      # Adapter for RethinkDB databases
-      #
-      # @api private
-      # @since 0.1.0
-      module Rethinkdb
-        # Defines the version
-        #
-        # @since 0.1.0
-        VERSION = '0.1.1'
-      end
-    end
+  # Adapter for RethinkDB databases
+  #
+  # @api private
+  # @since 0.1.0
+  module Rethinkdb
+    # Defines the version
+    #
+    # @since 0.1.0
+    VERSION = '0.2.0'
   end
 end

data/lotus-rethinkdb.gemspec

@@ -5,7 +5,7 @@ require 'lotus/rethinkdb/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'lotus-rethinkdb'
-  spec.version       = Lotus::Model::Adapters::Rethinkdb::VERSION
+  spec.version       = Lotus::Rethinkdb::VERSION
   spec.authors       = ['Angelo Ashmore']
   spec.email         = ['angeloashmore@gmail.com']
   spec.summary       = 'RethinkDB adapter for Lotus::Model'
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rethinkdb',     '~> 1.15'
   spec.add_runtime_dependency 'activesupport', '~> 4.2'
 
-  spec.add_development_dependency 'bundler',       '~> 1.7'
+  spec.add_development_dependency 'bundler',       '~> 1.6'
   spec.add_development_dependency 'minitest',      '~> 5.5'
   spec.add_development_dependency 'minitest-line', '~> 0.6.2'
   spec.add_development_dependency 'rake',          '~> 10.0'

data/test/model/adapters/rethinkdb_adapter_test.rb

@@ -39,7 +39,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
     end.load!
 
     @adapter = Lotus::Model::Adapters::RethinkdbAdapter.new(
-      @mapper, RETHINKDB_TEST_CONNECTION
+      @mapper, RETHINKDB_TEST_URI
     )
   end
 
@@ -263,7 +263,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
       @adapter.clear(collection)
     end
 
-    let(:user1) { TestUser.new(name: 'L', age: '32') }
+    let(:user1) { TestUser.new(name: 'L', age: 32) }
     let(:user2) { TestUser.new(name: 'MG', age: 31) }
 
     describe 'where' do
@@ -408,6 +408,67 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
       end
     end
 
+    describe 'has_fields' do
+      describe 'with an empty collection' do
+        it 'returns an empty result' do
+          result = @adapter.query(collection) do
+            has_fields(:age)
+          end.all
+
+          result.must_be_empty
+        end
+      end
+
+      describe 'with a filled collection' do
+        before do
+          @adapter.create(collection, user1)
+          @adapter.create(collection, user2)
+          @adapter.create(collection, user3)
+        end
+
+        let(:user1) { TestUser.new(name: 'L', age: 32) }
+        let(:user3) { TestUser.new(name: 'S') }
+        let(:users) { [user1, user2, user3] }
+
+        it 'returns documents that have the selected fields' do
+          query = proc do
+            has_fields(:age)
+          end
+
+          result = @adapter.query(collection, &query).all
+          result.each do |user|
+            user.age.wont_be_nil
+          end
+        end
+
+        it 'returns only the select of requested records' do
+          name = user2.name
+
+          query = proc do
+            where(name: name).pluck(:age)
+          end
+
+          result = @adapter.query(collection, &query).all
+          result.each do |user|
+            user.age.wont_be_nil
+          end
+        end
+
+        it 'returns only the multiple select of requested records' do
+          name = user2.name
+
+          query = proc do
+            where(name: name).pluck(:name, :age)
+          end
+
+          result = @adapter.query(collection, &query).all
+          result.each do |user|
+            user.age.wont_be_nil
+          end
+        end
+      end
+    end
+
     describe 'order' do
       describe 'with an empty collection' do
         it 'returns an empty result set' do
@@ -558,5 +619,291 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
         end
       end
     end
+
+    describe 'count' do
+      describe 'with an empty collection' do
+        it 'returns 0' do
+          result = @adapter.query(collection) do
+            all
+          end.count
+
+          result.must_equal 0
+        end
+      end
+
+      describe 'with a filled collection' do
+        before do
+          @adapter.create(collection, user1)
+          @adapter.create(collection, user2)
+        end
+
+        it 'returns the count of all the records' do
+          query = proc do
+            all
+          end
+
+          result = @adapter.query(collection, &query).count
+          result.must_equal 2
+        end
+
+        it 'returns the count from an empty query block' do
+          query = proc do
+          end
+
+          result = @adapter.query(collection, &query).count
+          result.must_equal 2
+        end
+
+        it 'returns only the count of requested records' do
+          name = user2.name
+
+          query = proc do
+            where(name: name)
+          end
+
+          result = @adapter.query(collection, &query).count
+          result.must_equal 1
+        end
+      end
+    end
+
+    describe 'sum' do
+      describe 'with an empty collection' do
+        it 'returns 0' do
+          result = @adapter.query(collection) do
+            all
+          end.sum(:age)
+
+          result.must_equal 0
+        end
+      end
+
+      describe 'with a filled collection' do
+        before do
+          @adapter.create(collection, user1)
+          @adapter.create(collection, user2)
+          @adapter.create(collection, TestUser.new(name: 'S'))
+        end
+
+        it 'returns the sum of all the records' do
+          query = proc do
+            all
+          end
+
+          result = @adapter.query(collection, &query).sum(:age)
+          result.must_equal 63
+        end
+
+        it 'returns the sum from an empty query block' do
+          query = proc {}
+
+          result = @adapter.query(collection, &query).sum(:age)
+          result.must_equal 63
+        end
+
+        it 'returns only the sum of requested records' do
+          name = user2.name
+
+          query = proc do
+            where(name: name)
+          end
+
+          result = @adapter.query(collection, &query).sum(:age)
+          result.must_equal 31
+        end
+      end
+    end
+
+    describe 'average' do
+      describe 'with an empty collection' do
+        it 'returns nil' do
+          result = @adapter.query(collection) do
+            all
+          end.average(:age)
+
+          result.must_be_nil
+        end
+      end
+
+      describe 'with a filled collection' do
+        before do
+          @adapter.create(collection, user1)
+          @adapter.create(collection, user2)
+          @adapter.create(collection, TestUser.new(name: 'S'))
+        end
+
+        it 'returns the average of all the records' do
+          query = proc do
+            all
+          end
+
+          result = @adapter.query(collection, &query).average(:age)
+          result.must_equal 31.5
+        end
+
+        it 'returns the average from an empty query block' do
+          query = proc {}
+
+          result = @adapter.query(collection, &query).average(:age)
+          result.must_equal 31.5
+        end
+
+        it 'returns only the average of requested records' do
+          name = user2.name
+
+          query = proc do
+            where(name: name)
+          end
+
+          result = @adapter.query(collection, &query).average(:age)
+          result.must_equal 31
+        end
+      end
+    end
+
+    describe 'avg' do
+      let(:user1) { TestUser.new(name: 'L', age: 32) }
+      let(:user2) { TestUser.new(name: 'MG', age: 31) }
+
+      describe 'with an empty collection' do
+        it 'returns nil' do
+          result = @adapter.query(collection) do
+            all
+          end.avg(:age)
+
+          result.must_be_nil
+        end
+      end
+
+      describe 'with a filled collection' do
+        before do
+          @adapter.create(collection, user1)
+          @adapter.create(collection, user2)
+          @adapter.create(collection, TestUser.new(name: 'S'))
+        end
+
+        it 'returns the average of all the records' do
+          query = proc do
+            all
+          end
+
+          result = @adapter.query(collection, &query).avg(:age)
+          result.must_equal 31.5
+        end
+
+        it 'returns the average from an empty query block' do
+          query = proc {}
+
+          result = @adapter.query(collection, &query).avg(:age)
+          result.must_equal 31.5
+        end
+
+        it 'returns only the average of requested records' do
+          name = user2.name
+
+          query = proc do
+            where(name: name)
+          end
+
+          result = @adapter.query(collection, &query).avg(:age)
+          result.must_equal 31
+        end
+      end
+    end
+
+    describe 'max' do
+      describe 'with an empty collection' do
+        it 'returns nil' do
+          result = @adapter.query(collection) do
+            all
+          end.max(:age)
+
+          result.must_be_nil
+        end
+      end
+
+      describe 'with a filled collection' do
+        before do
+          @adapter.create(collection, user1)
+          @adapter.create(collection, user2)
+          @adapter.create(collection, TestUser.new(name: 'S'))
+        end
+
+        it 'returns the maximum of all the records' do
+          query = proc do
+            all
+          end
+
+          result = @adapter.query(collection, &query).max(:age)
+          result.must_equal 32
+        end
+
+        it 'returns the maximum from an empty query block' do
+          query = proc do
+          end
+
+          result = @adapter.query(collection, &query).max(:age)
+          result.must_equal 32
+        end
+
+        it 'returns only the maximum of requested records' do
+          name = user2.name
+
+          query = proc do
+            where(name: name)
+          end
+
+          result = @adapter.query(collection, &query).max(:age)
+          result.must_equal 31
+        end
+      end
+    end
+
+    describe 'min' do
+      describe 'with an empty collection' do
+        it 'returns nil' do
+          result = @adapter.query(collection) do
+            all
+          end.min(:age)
+
+          result.must_be_nil
+        end
+      end
+
+      describe 'with a filled collection' do
+        before do
+          @adapter.create(collection, user1)
+          @adapter.create(collection, user2)
+          @adapter.create(collection, TestUser.new(name: 'S'))
+        end
+
+        it 'returns the minimum of all the records' do
+          query = proc do
+            all
+          end
+
+          result = @adapter.query(collection, &query).min(:age)
+          result.must_equal 31
+        end
+
+        it 'returns the minimum from an empty query block' do
+          query = proc {}
+
+          result = @adapter.query(collection, &query).min(:age)
+          result.must_equal 31
+        end
+
+        it 'returns only the minimum of requested records' do
+          name = user1.name
+
+          query = proc do
+            where(name: name)
+          end
+
+          result = @adapter.query(collection, &query).min(:age)
+          result.must_equal 32
+        end
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -5,25 +5,21 @@ require 'minitest/autorun'
 $LOAD_PATH.unshift 'lib'
 require 'lotus-rethinkdb'
 
+require 'coveralls'
+Coveralls.wear!
+
 include RethinkDB::Shortcuts
 
-RETHINKDB_TEST_CONNECTION = r.connect
+RETHINKDB_TEST_URI = 'rethinkdb://localhost:28015/test'
 
-def run
-  yield.run(RETHINKDB_TEST_CONNECTION)
-end
+conn = r.connect
 
-begin
-  run { r.table_create('test_users') }
-rescue RethinkDB::RqlRuntimeError => _e
-  puts 'Table `test_users` already exists'
-end
+[:test_users, :test_devices].each do |t_name|
+  begin
+    r.table_create(t_name).run(conn)
+  rescue RethinkDB::RqlRuntimeError => _e
+    puts "Table `#{t_name}` already exists"
+  end
 
-begin
-  run { r.table_create('test_devices') }
-rescue RethinkDB::RqlRuntimeError => _e
-  puts 'Table `test_devices` already exists'
+  r.table(t_name).delete
 end
-
-run { r.table('test_users').delete }
-run { r.table('test_devices').delete }

data/test/version_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
-describe Lotus::Model::Adapters::Rethinkdb::VERSION do
+describe Lotus::Rethinkdb::VERSION do
   it 'returns current version' do
-    Lotus::Model::Adapters::Rethinkdb::VERSION.must_equal '0.1.1'
+    Lotus::Rethinkdb::VERSION.must_equal '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus-rethinkdb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Angelo Ashmore
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement