simple-sql 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a64abeaf64f527b10d9381fcecbb47c712184ebc
-  data.tar.gz: 8ad02d882e3f281c4880af342c7b15c33e189e4f
+  metadata.gz: 35cf2798d086495d8716eb22b6ce08bea72a5ab1
+  data.tar.gz: 6e332f0a12d3442ee7a28e319cff5b8759a8affb
 SHA512:
-  metadata.gz: fec8ff260a4551b5f5e73640291cf1db92792aa108fc73e218825e27890e8275028617c52fa9acde204373155bebad645d894515461bf09dc1f2ccac592efa7e
-  data.tar.gz: fb5648febf02c8a08e25c31e30602838bdaff934ddd1097d597291b3b09a03d8451218f1a9594a77ac0fe66be9b2366ce1406477e2b1fa3dc72e7ff30f5cf97e
+  metadata.gz: 45f2f76f763f1587b4e1d330e00f3d24e87c8f7dca32a08abc9fed7f1076f5d87d42cc1dc06eeb20a2ac2a5c92d3a8312a31642edcb80f7940bfb46cc02d5bb9
+  data.tar.gz: d5efb732d0ebf9f8be40cf1dae1c3ba33782b4df0c92be284608fc74818b78b920177186da5fb5ef9ae6f704f11a49d2ae33cf8bd423df834b4a905bab694061

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    simple-sql (0.1.3)
-      activerecord (~> 4)
+    simple-sql (0.2.0)
+      pg (~> 0.20)
       pg_array_parser (~> 0)
 
 GEM
@@ -77,6 +77,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (~> 4)
   database_cleaner (~> 1)
   factory_girl (= 4.8.0)
   pg (= 0.20)

data/lib/simple/sql.rb

@@ -97,7 +97,59 @@ module Simple
     end
 
     def connection
-      ActiveRecord::Base.connection.raw_connection
+      @connector.call
+    end
+
+    def connector=(connector)
+      @connector = connector
+    end
+
+    self.connector = lambda { 
+      connect_to_active_record
+    }
+
+    def connect_to_active_record
+      return ActiveRecord::Base.connection.raw_connection if defined?(ActiveRecord)
+
+      STDERR.puts <<-SQL
+simple-sql works out of the box with ActiveRecord-based postgres connections.
+
+To use it without ActiveRecord you must connect to a database via
+
+    Simple::SQL.connect!("postgresql://username:password@dbhost:port/dbname").
+SQL
+
+      raise ArgumentError, "simple-sql: missing connection"
+    end
+
+    public
+
+    def connect!(url)
+      require "pg"
+
+      config = db_config_from_url(url)
+      connection = PG::Connection.new(config)
+      self.connector = lambda { connection }
+    end
+
+    def db_config_from_url(url)
+      require "uri"
+
+      raise ArgumentError, "Invalid URL #{url.inspect}" unless url.is_a?(String)
+      raise ArgumentError, "Invalid URL #{url.inspect}" unless url =~ /^postgres(ql)?s?:\/\//
+
+      uri = URI.parse(url)
+      raise ArgumentError, "Invalid URL #{url}" unless uri.hostname && uri.path
+
+      config = {
+        dbname: uri.path.sub(%r{^/}, ""),
+        host:   uri.hostname
+      }
+      config[:port] = uri.port if uri.port
+      config[:user] = uri.user if uri.user
+      config[:password] = uri.password if uri.password
+      config[:sslmode] = uri.scheme == "postgress" || uri.scheme == "postgresqls" ? "require" : "prefer"
+      config
     end
   end
 end

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/simple-sql.gemspec

@@ -27,12 +27,13 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '~> 2.3'
 
-  gem.add_dependency 'activerecord', '~> 4'
   gem.add_dependency 'pg_array_parser', '~> 0'
+  gem.add_dependency 'pg', '~> 0.20'
 
   # optional gems (required by some of the parts)
 
   # development gems
+  gem.add_development_dependency 'activerecord', '~> 4'
   gem.add_development_dependency 'pg', '0.20'
   gem.add_development_dependency 'rake', '~> 11'
   gem.add_development_dependency 'rspec', '~> 3.7'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - radiospiel
@@ -12,33 +12,47 @@ cert_chain: []
 date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: pg_array_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg_array_parser
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement