fish0 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a00a4bea56a945cd7b81b258645b09716c2c7a70
-  data.tar.gz: 6476e00ce9d49567a3875414273859daa9ad229f
+  metadata.gz: c92bbc56a6b40c928b87b597f5f877c2b43c5794
+  data.tar.gz: ce6816113e2138835a1ffbf16ec16249d73dfc9b
 SHA512:
-  metadata.gz: 60a3af9d7f5cf440e48a48b1a9271b2865b24fd06cdb04a275216d0f44e7e6404a9301adc1dc1ab8a4e5628892fb6076e0319e31957fceab03246c8d6572f3e8
-  data.tar.gz: 1886eb1e1d73018ff5a4c9fbca48a02bffb0c780c2952a9cdf00d595edf1c4f8c8fb600a7bb9fdcfeaf6d614e924c6268b1082b309230df7502f42973d06ed88
+  metadata.gz: 7f5d4a46724a931dd927884ec52cbab0eeeac30ed8715131aeb069a59fc7bc02dc8b3c2d05384cb1a6b58b3333fea8ee7208af3b8efc52829b9c933edc871a79
+  data.tar.gz: 1246a6a736ac3793e211873640c0cc5839437c2d8c611894abdc2c5a00ee34cb6eeac1ea6f9f233f91c6ea59a26c444271ec750758eb1c9176d292c471db2713

data/README.md

@@ -22,8 +22,8 @@ gem 'fish0'
 # config/initializers/fish0.rb
 
 Fish0::Configuration.configure do |config|
-  config.mongo_hosts = ['127.0.0.1:27017', '127.0.0.2:27017']
-  config.mongo_params = { database: 'project_db', read: { mode: :secondary } }
+  config.mongo_uri = 'mongodb://user:password@host_1:27017,replica_host_2:27017/project_db?auth_source=admin'
+  config.mongo_params = { read: { mode: :secondary } }
 end
 ```
 

data/lib/fish0.rb

@@ -18,16 +18,16 @@ module Fish0
   class << self
     def mongo_reader
       Mongo::Logger.logger = mongo_config['logger'] || Rails.logger
-      @mongo_reader ||= Mongo::Client.new(mongo_config[:hosts], mongo_config[:params])
+      @mongo_reader ||= Mongo::Client.new(mongo_config[:mongo_uri], mongo_config[:params])
     end
 
     def mongo_config
       if File.file?(File.expand_path('../config/mongo.yml', __FILE__))
         config = Rails.application.config_for(:mongo)
-        Configuration.mongo_hosts = config['hosts']
+        Configuration.mongo_uri = config['mongo_uri']
         Configuration.mongo_params = config['params']
       end
-      @mongo_config || { hosts: Configuration.mongo_hosts, params: Configuration.mongo_params }
+      @mongo_config || { mongo_uri: Configuration.mongo_uri, params: Configuration.mongo_params }
     end
   end
 end

data/lib/fish0/concerns/cacheable.rb

@@ -6,10 +6,9 @@ module Fish0
       included do
         def cache_key(*timestamp_names)
           if timestamp_names.any?
-            timestamp = max_updated_column_timestamp(timestamp_names)
-            "#{self.class.to_s.tableize}/#{primary_key_value}-#{timestamp.utc.to_s(:nsec)}"
-          elsif timestamp = max_updated_column_timestamp
-            "#{self.class.to_s.tableize}/#{primary_key_value}-#{timestamp.utc.to_s(:nsec)}"
+            cache_key_string(max_updated_column_timestamp(timestamp_names))
+          elsif (timestamp = max_updated_column_timestamp)
+            cache_key_string(timestamp)
           else
             "#{self.class.to_s.tableize}/#{primary_key_value}"
           end
@@ -28,6 +27,10 @@ module Fish0
             .map(&:to_time)
             .max
         end
+
+        def cache_key_string(timestamp)
+          "#{self.class.to_s.tableize}/#{primary_key_value}-#{timestamp.utc.to_s(:nsec)}"
+        end
       end
     end
   end

data/lib/fish0/configuration.rb

@@ -5,25 +5,26 @@ module Fish0
   # Usage:
   #   # config/initializers/fish0.rb
   #   Fish0::Configuration.configure do |config|
-  #     config.mongo_hosts = ['localhost:27017']
-  #     config.mongo_params = { database: 'your_data_development', read: { mode: :secondary } }
+  #     config.mongo_uri = 'mongodb://user:password@host_1:27017,replica_host_2:27017/'\
+  #       'fish0_development?auth_source=admin'
+  #     config.mongo_params = { read: { mode: :secondary } }
   #   end
-  ##
+  #
+
   class Configuration
     include ActiveSupport::Configurable
 
-    config_accessor :mongo_hosts do
-      ['localhost:27017']
+    # Usage:
+    # Enter your full mongo_uri (can include username, password, multiple hosts, ports, db name,
+    # and additional options as get-parameters
+    config_accessor :mongo_uri do
+      'mongodb://localhost:27017/fish0_development'
     end
 
-    ##
-    # Fish0::Configuration.mongo_params
-    #
     # Usage:
-    # Enter your database and another params as second arguement to MongoClient::New
-    ##
+    # Enter your as second argument to MongoClient::New
     config_accessor :mongo_params do
-      { database: 'fish0_development', read: { mode: :secondary } }
+      { read: { mode: :secondary } }
     end
   end
 end

data/lib/fish0/version.rb

@@ -1,3 +1,3 @@
 module Fish0
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/spec/dummy/config/mongo.yml

@@ -1,11 +1,7 @@
 development:
-  hosts:
-    - 'localhost:27017'
-  params:
-    :database: fish0_development
+  mongo_uri:
+    - 'mongodb://localhost:27017/fish0_development'
 
 test:
-  hosts:
-    - 'localhost:27017'
-  params:
-    :database: fish0_test
+  mongo_uri:
+    - 'mongodb://localhost:27017/fish0_development'

data/spec/dummy/log/test.log

@@ -190,3 +190,33 @@ MONGODB | Server localhost:27017 initializing.
 MONGODB | Topology type 'unknown' changed to type 'single'.
 MONGODB | Server description for localhost:27017 changed from 'unknown' to 'standalone'.
 MONGODB | There was a change in the members of the 'single' topology.
+MONGODB | Topology type 'unknown' initializing.
+MONGODB | Server localhost:27017 initializing.
+MONGODB | Topology type 'unknown' changed to type 'single'.
+MONGODB | Server description for localhost:27017 changed from 'unknown' to 'standalone'.
+MONGODB | There was a change in the members of the 'single' topology.
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.000748s
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.000248s
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.000263s
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.00021899999999999998s
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.000244s
+MONGODB | Topology type 'unknown' initializing.
+MONGODB | Server localhost:27017 initializing.
+MONGODB | Topology type 'unknown' changed to type 'single'.
+MONGODB | Server description for localhost:27017 changed from 'unknown' to 'standalone'.
+MONGODB | There was a change in the members of the 'single' topology.
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.000656s
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.00027299999999999997s
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.000223s
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.00024s
+MONGODB | localhost:27017 | fish0_development.dropDatabase | STARTED | {"dropDatabase"=>1}
+MONGODB | localhost:27017 | fish0_development.dropDatabase | SUCCEEDED | 0.000215s

data/spec/lib/repository_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 RSpec.describe Fish0::Repository do
-  let(:repository) { Fish0::Repository.new('articles') }
-  let(:scoped_repository) { Fish0::Repository.new('articles') }
+  let(:repository) { Fish0::Repository.new(collection: 'articles') }
+  let(:scoped_repository) { Fish0::Repository.new(collection: 'articles') }
 
   describe '#scope' do
     before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fish0
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitry Zuev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport