mutx 0.1.62 → 0.1.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: febbb8bf27d885ae1f8afc4f47fb1e18f8885785
-  data.tar.gz: 7486e983ba4a28b7162a211a43cf0da75b16bf54
+  metadata.gz: 18864110b5fce7d741a7c69be950a5208445100c
+  data.tar.gz: 0e5a3a91f9d06fb81a6f81f1636a378d7a5042f2
 SHA512:
-  metadata.gz: 033554916f5af9e158a6a620025c65d10a0e13bd9844f46b6455ee354133de2db68f40cce00f2d3c18ec6fb7c48f4b9ed3ad667cb55bde0b204fdb5ed50f7cdc
-  data.tar.gz: 94fd757f3bafac485e0ff8b8b7b884be002685783ac6d599921e1a39efffb1703845a01853a469486c4e9c74ec73cf68b4926d11cb83a83db8c5fee168e2dc94
+  metadata.gz: 02062fe7716c174576880e11e27e97088ea0d8f3a4ec0043e28f5dc188180aa74f87e9020939dca8165ffd131858614dcb94fd809b3b6223361201f6d0463007
+  data.tar.gz: e4a20c6e03e918c0acdc810ab858655c863aea3f84e028818dc1e4bba9d4eac06ff6e325092f16f2b0abe90627e89ebc25e0fbf2513acecb100fbda721aed085

data/.gitignore

@@ -1,5 +1,2 @@
 pkg
-Gemfile.lock
-mutx/
-mutx/*
 .DS_Store

data/.ruby-gemset

@@ -0,0 +1 @@
+mutx

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mutx (0.1.62)
+    mutx (0.1.63)
       basica
       bson_ext
       byebug

data/lib/mutx/database/middleware.rb

@@ -0,0 +1,18 @@
+module Mutx
+  module Database
+    class Middleware
+
+      def initialize(app)
+        @app = app
+      end
+      
+      def call(env)
+        configuration = Mutx::Support::Configuration.db_connection_data
+        Mutx::Database::MongoConnector.new(configuration)
+        @app.call(env)
+      ensure
+        Mutx::Database::MongoConnector.close
+      end
+    end
+  end
+end

data/lib/mutx/database/mongo_connection.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+require 'mongo'
+
+module Mutx
+  module Database
+    class MongoConnection
+
+      include Singleton
+
+      def client(**args)
+        mutex.synchronize {
+      	  @client ||= connect_to_database(args)
+        }
+      end
+
+      def db
+      	client.database
+      end
+
+      def close
+        mutex.synchronize {
+          @client.close if @client
+          @client = nil
+        }
+      end
+
+      private
+
+      def mutex
+      	@mutex ||= Mutex.new
+      end
+
+      def connect_to_database(**args)
+      	Mongo::Client.new(hosts(args), database: args[:database])
+      	#authenticate(args[:username], args[:pass])
+      end
+
+      def hosts(**args)
+      	["#{args[:host]}:#{args[:port]}"]
+      end
+
+      def authenticate(username, password)
+      	self.db.authenticate(username, password)
+      end
+    end
+  end
+end

data/lib/mutx/database/mongo_connector.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-#require 'mongoid'
-require 'mongo'
+require_relative './mongo_connection'
 
 module Mutx
   module Database
@@ -9,9 +8,15 @@ module Mutx
       #include Mongo
 
       def initialize(opts={host: "localhost", port: 27017, username: nil, pass: nil})
-        set_client(opts)
-        set_db
-        authenticate(opts)
+        project_name = Dir.pwd.split("/").last
+        mongo_connection = MongoConnection.instance
+        mongo_connection.client(host: opts[:host],
+                                port: opts[:port],
+                                database: "#{project_name}_mutx",
+                                username: opts[:username],
+                                password: opts[:pass])
+
+        $db = mongo_connection.db
         set_task_collection
         set_custom_param_collection
         set_config_collection
@@ -48,6 +53,10 @@ module Mutx
         $client = $client.close if $client
       end
 
+      def self.close
+        MongoConnection.instance.close
+      end
+
       def set_db
         Mutx::Support::Log.debug "Setting db" if Mutx::Support::Log
         $db = $client.database

data/lib/mutx/routes.rb

@@ -1,7 +1,9 @@
 # encoding: utf-8
 require "cuba"
 #include Basica
+require_relative './database/middleware' 
 
+Cuba.use Mutx::Database::Middleware
 Cuba.plugin Basica
 
 include Mote::Helpers
@@ -11,8 +13,6 @@ Mutx::Support::Configuration.get
 
 Cuba.define do
 
-  Mutx::Database::MongoConnector.new Mutx::Support::Configuration.db_connection_data
-
   $tasks_counter = 0
 
   request = Mutx::Support::Request.new(req)

data/lib/mutx/version.rb

@@ -1,3 +1,3 @@
 module Mutx
-  VERSION = "0.1.62"
+  VERSION = "0.1.63"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutx
 version: !ruby/object:Gem::Version
-  version: 0.1.62
+  version: 0.1.63
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -356,6 +356,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -429,6 +431,8 @@ files:
 - lib/mutx/custom/execution.rb
 - lib/mutx/custom/params.rb
 - lib/mutx/database/.DS_Store
+- lib/mutx/database/middleware.rb
+- lib/mutx/database/mongo_connection.rb
 - lib/mutx/database/mongo_connector.rb
 - lib/mutx/error/errors.rb
 - lib/mutx/execution.rb