monorm 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70e55e28e97f452652e044fbe3b22b9036b5d370
-  data.tar.gz: f5928c6292f3b27e2357b9e122402de48919fd0b
+  metadata.gz: b323a8b45af457e2866229139b7c3e371f966845
+  data.tar.gz: f14b7bc66a797590accd3720e1b426f0d05f2108
 SHA512:
-  metadata.gz: de45839dc3f0e8a65a9974eb911c4fe738d8815d9e69ba274df2350d766a8aeb7d5bf5b1e08cac6acff8e8bd01bb37a6375e1c48f82dc3c6dc8420544a212196
-  data.tar.gz: 52329bbb20d82f1e17301ab88c3f7124566cc60edb707af3a23699b7f74be44371142123779d6d663565f153df39b3aadcb6bc3dc4ed625296dc5d18d49c8368
+  metadata.gz: 4ce6f690d4412c354ea0608adbbc755c7fb5a91ab8cff3becc5fd09bb2b4d416f114c74dd5272280914c98ecf2f10609ed821a4123d8e1641c0c572f3c42128c
+  data.tar.gz: cb57f8ae43ad841b6e65984744551bbcae45c738ba0ff27d51651b858a44862a0f47792a2ddfb4329738ed572a156d9bf87da5e2c3f375aa8d358de77da40a04

data/lib/monorm.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'erb'
+require 'uri'
 
 require "monorm/version"
 
@@ -23,11 +24,7 @@ module MonoRM
   def self.db_config
     File.join config, 'database.yml'
   end
-  #
-  # def self.bin
-  #   File.join root, 'bin'
-  # end
-  #
+
   def self.lib
     File.join root, 'lib'
   end
@@ -35,18 +32,17 @@ module MonoRM
   def self.monorm
     File.join lib, 'monorm'
   end
-  DB_CONFIG = YAML.load ERB.new(IO.read("#{self.db_config}")).result
-  # DB_CONFIG = YAML.load(File.open("#{self.db_config}"))
 
   class MonoRM::DBInitializer
     def self.load_db_adapter
 
-      adapter = DB_CONFIG['default']['adapter']
+      adapter = URI.parse(ENV['DATABASE_URL']).scheme
+
       case adapter
-      when 'postgresql'
+      when 'postgres'
         adapter_path = File.join('monorm', 'adapters', 'pg_connection')
         require adapter_path
-      when 'sqlite3'
+      when 'sqlite'
         adapter_path = File.join('monorm', 'adapters', 'sqlite_connection')
         require adapter_path
       else

data/lib/monorm/adapters/pg_connection.rb

@@ -3,13 +3,13 @@ require 'pg'
 class MonoRM::DBConnection
 
   def self.open
-    # uri = URI.parse(ENV['DATABASE_URL'])
+    uri = URI.parse(ENV['DATABASE_URL'])
     @conn = PG::Connection.new(
-    dbname: MonoRM::DB_CONFIG['default']['database']
-    # user: uri.user,
-    # password: uri.password,
-    # host: uri.host,
-    # port: uri.port,
+    user: uri.user,
+    password: uri.password,
+    host: uri.host,
+    port: uri.port,
+    dbname: uri.path[1..-1]
     )
 
     @conn

data/lib/monorm/adapters/sqlite_connection.rb

@@ -47,8 +47,8 @@ class MonoRM::DBConnection
 
   def self.load_db_path
     dir = File.dirname(__FILE__)
-    db_name = "#{MonoRM::DB_CONFIG['default']['database']}.db"
-    @db_path = File.join(MonoRM::PROJECT_ROOT_DIR, "db", "sqlite_db", "#{db_name}")
+    db_name = URI.parse(ENV['DATABASE_URL']).path[1..-1]
+    @db_path = File.join(MonoRM::PROJECT_ROOT_DIR, "db", "sqlite_db", "#{db_name}.db")
   end
 
   private

data/lib/monorm/version.rb

@@ -1,3 +1,3 @@
 module MonoRM
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

data/monorm.gemspec

@@ -36,9 +36,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'byebug', '~> 9.0'
   spec.add_development_dependency 'pry', '~> 0.10.4'
+  spec.add_development_dependency 'dotenv', '~> 2.2'
 
   spec.add_runtime_dependency 'activesupport', '~> 5.0'
 
-
+  spec.required_ruby_version = '~> 2.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monorm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Chilton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.4
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -132,9 +146,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="