pico_api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42f576489c0e3b0b4cc8ab9d23d3dd273f50f3fcd6cf29689b26a67ee6508c3f
-  data.tar.gz: 83723e1d3095b13f302d016b8a3f2b166220a7e42842b569ef77cfd86f76648e
+  metadata.gz: 14850439f778e937789908411715f6b5ce574ea99a4806fffb00ef649dfd8a80
+  data.tar.gz: e7a2151b9decd161b1b427e4980904ba63b2d00f3ca0e90d2d924dc64042574e
 SHA512:
-  metadata.gz: 7eb82db803e9e5f78d7c78ecf8a2054dfbd523f200331586e8ac1e9c45c38c837fdae794c4296c593627c97a976382aca69b77a478359d8473e882435dcb936f
-  data.tar.gz: 43935b1f888497e2dafc4f488d53ecc4b55fdd48efa112ef6ca659b37cc94c4f8bbdef392ef30857ac0c474490a88d4e60cf8c1c2e2fb0186a6e719727fb17cf
+  metadata.gz: 730b621fdc6d88fca903262364e0e911c5d941f9ba830d2beb6c1965d19b928531838b11e827b16941ad441a128b9024d1390ebe266973eae1a26de505b7d8ab
+  data.tar.gz: 195e3271e7198c9e515b9cb25d9f6d818d18c155e5f164d6fe90b6c0268175be5389c71794f12049da3fd498585935c586cdd15ef1326287610ff72d809c2104

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec
+
+group :test do
+  gem "rspec", "~> 3"
+  gem "pry"
+end

data/Gemfile.lock

@@ -0,0 +1,125 @@
+PATH
+  remote: .
+  specs:
+    pico_api (0.0.1)
+      erb (~> 2.2.3)
+      jsonapi-serializer (~> 2.2.0)
+      rackup (~> 0.2.2)
+      rake (~> 13.0.6)
+      roda (~> 3.61.0)
+      rom (~> 5.2.6)
+      rom-sql (~> 3.5.0)
+      zeitwerk (~> 2.6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    cgi (0.3.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    dry-container (0.11.0)
+      concurrent-ruby (~> 1.0)
+    dry-core (0.9.1)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.3.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.9, >= 0.9)
+      zeitwerk (~> 2.6)
+    dry-struct (1.5.2)
+      dry-core (~> 0.9, >= 0.9)
+      dry-types (~> 1.6)
+      ice_nine (~> 0.11)
+      zeitwerk (~> 2.6)
+    dry-types (1.6.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.9, >= 0.9)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.3, >= 1.3)
+      zeitwerk (~> 2.6)
+    erb (2.2.3)
+      cgi
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    jsonapi-serializer (2.2.0)
+      activesupport (>= 4.2)
+    method_source (1.0.0)
+    minitest (5.16.3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (3.0.0)
+    rackup (0.2.2)
+      rack (>= 3.0.0.beta1)
+      webrick
+    rake (13.0.6)
+    roda (3.61.0)
+      rack
+    rom (5.2.6)
+      rom-changeset (~> 5.2, >= 5.2.3)
+      rom-core (~> 5.2, >= 5.2.5)
+      rom-repository (~> 5.2, >= 5.2.2)
+    rom-changeset (5.2.3)
+      dry-core (~> 0.4)
+      rom-core (~> 5.2)
+      transproc (~> 1.0, >= 1.1.0)
+    rom-core (5.2.6)
+      concurrent-ruby (~> 1.1)
+      dry-container (~> 0.7)
+      dry-core (~> 0.4)
+      dry-equalizer (~> 0.2)
+      dry-inflector (~> 0.1)
+      dry-initializer (~> 3.0, >= 3.0.1)
+      dry-struct (~> 1.0)
+      dry-types (~> 1.0)
+      transproc (~> 1.0, >= 1.1.0)
+    rom-repository (5.2.2)
+      dry-core (~> 0.4)
+      dry-initializer (~> 3.0, >= 3.0.1)
+      rom-core (~> 5.2, >= 5.2.2)
+    rom-sql (3.5.0)
+      dry-core (~> 0.5, >= 0.5)
+      dry-types (~> 1.0)
+      rom (~> 5.2, >= 5.2.1)
+      sequel (>= 4.49)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    sequel (5.62.0)
+    transproc (1.1.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    webrick (1.7.0)
+    zeitwerk (2.6.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pico_api!
+  pry
+  rspec (~> 3)
+
+BUNDLED WITH
+   2.1.4

data/Readme.md

@@ -44,7 +44,7 @@ Migration info: https://rom-rb.org/5.0/learn/sql/migrations/
 - [x] Handle Errors
 - [ ] Create a Logger config
 - [ ] Create a testing environment
-- [ ] Allow multiple db gateways in the config
+- [x] Allow multiple db gateways in the config
 - [ ] Add irb/pry console script
 
 ## Contributing

data/lib/pico_api/configuration.rb

@@ -6,12 +6,7 @@ require 'yaml'
 module PicoApi
   class << self
     def configuration
-      @configuration ||= Configuration.new(db_config)
-    end
-
-    def db_config
-      template = ERB.new(File.new('./config/database.yml').read)
-      YAML.safe_load(template.result(binding))
+      @configuration ||= Configuration.new
     end
 
     def configure
@@ -20,11 +15,20 @@ module PicoApi
   end
 
   class Configuration
-    attr_reader :db_config
-    attr_accessor :namespace, :lib_path, :errors_map
+    attr_accessor :namespace, :lib_path, :errors_map, :db_yaml_path
+
+    def db_yaml_path
+      @db_yaml_path || "/config/database.yml"
+    end
+
+    def db_config
+      YAML.safe_load(read_db_yaml_file.result(binding))
+    end
+
+    private
 
-    def initialize(db_config)
-      @db_config = db_config
+    def read_db_yaml_file
+      ERB.new(File.new(db_yaml_path).read)
     end
   end
 end

data/lib/pico_api/database.rb

@@ -9,15 +9,21 @@ module PicoApi
       attr_accessor :container
 
       def setup!
-        database_config = PicoApi.configuration.db_config['default']
-        adapter = database_config['adapter'].to_sym
-        options = database_config['options'].symbolize_keys
-        connection_string = database_config['connection_string']
+        database_config = PicoApi.configuration.db_config.symbolize_keys
+        gateways = database_config.keys
 
-        config = ROM::Configuration.new(adapter, connection_string, options)
-        yield config if block_given?
+        configs = gateways.inject({}) do |memo, gateway|
+          adapter = database_config.dig(gateway, :adapter).to_sym
+          options = database_config.dig(gateway, :options).symbolize_keys
+          connection_string = database_config.dig(gateway, :connection_string)
 
-        @container = ROM.container(config)
+          memo[gateway] = [adapter, connection_string, options]
+          memo
+        end
+
+        @container = ROM.container(**configs) do |config|
+          yield config if block_given?
+        end
       end
     end
   end

data/lib/pico_api/generators/templates/config/database.yml

@@ -6,3 +6,9 @@ default:
   options:
     encoding:
 
+# Additional gateways supported
+# legacy:
+#   adapter:
+#   connection_string:
+#   options:
+#     encoding:

data/lib/pico_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PicoApi
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pico_api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex Avlonitis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2022-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -130,6 +130,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - Rakefile
 - Readme.md