rom-yesql 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aedcc9a8aee73d1d75cf44cf9ffcea7c2750e64
-  data.tar.gz: fb51885ac908e9131e4ceca401549ad214097391
+  metadata.gz: 71d682ad4bde9ef7d69778c1520c682907f2eeb3
+  data.tar.gz: 34ffde7f67a7da528281adb02abcc57ef50dbfdb
 SHA512:
-  metadata.gz: ae27fce18a060dcb5f88b6c0bb8eab3acbf5dd37e8996dd3b38a8012d4a84f4bd1c4d5285076272f9ccb6c1cae187e4fa3351d0ad1594fe5849cf622aaba2343
-  data.tar.gz: bec60620f2ae3ae65e806b00ff320c04fb291a8895691ee170fcce48ea65602618bb4c40290d649fedd7e714cac626c91ad4c6e20e6877cfe7f2ec077194c7e5
+  metadata.gz: 83ab884d970038302ef7275d47b26f9101eb8986b16aa5741e3a26e79b35b7cb79b44a89f1b306f78ffe299ffd321d36201ce87d185ce39c5e9187aa11dce54a
+  data.tar.gz: 62235b937beaf7a8cd723eee295fc9ca0b589d7fd65a6a93d1104e63513fac16db5b34d867ac79d1a629e8c599ee605acd1b05fbe7be96a752730426552205f4

data/.travis.yml

@@ -1,24 +1,26 @@
 language: ruby
+dist: trusty
 sudo: false
 cache: bundler
 bundler_args: --without tools
 script: "bundle exec rake ci"
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3.1
-  - rbx-2
-  - jruby-9.0.5.0
-  - jruby-head
-  - ruby-head
 env:
   global:
     - CODECLIMATE_REPO_TOKEN=15dad2a6b4f5f73f367783df8192230b73070b33fe1f193393e9867d50653885
     - JRUBY_OPTS='--dev -J-Xmx1024M'
+after_success:
+  # Send coverage report from the job #1 == current MRI release
+  - '[ "${TRAVIS_JOB_NUMBER#*.}" = "1" ] && [ "$TRAVIS_BRANCH" = "master" ] && bundle exec codeclimate-test-reporter'
+rvm:
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+  - jruby-9.1.7.0
+  - ruby-head
+  - rbx-3
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
 notifications:
   webhooks:
     urls:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.4.0 to-be-released
+
+Updated to work with rom 3.0.0
+
 ## v0.3.0 2016-07-31
 
 Updated to work with rom 2.0.0
@@ -12,7 +16,7 @@ Updated to work with rom 0.9.0
 
 ### Changed
 
-* Updated to work with rom 0.8 (solnic)
+Updated to work with rom 0.8 (solnic)
 
 [Compare v0.1.0...v0.1.1](https://github.com/rom-rb/rom-yaml/compare/v0.1.0...v0.1.1)
 

data/lib/rom/yesql/gateway.rb

@@ -1,6 +1,6 @@
 require 'sequel'
 
-require 'rom/support/options'
+require 'rom/initializer'
 
 require 'rom/yesql/dataset'
 require 'rom/yesql/relation'
@@ -14,15 +14,19 @@ module ROM
     #
     # @api public
     class Gateway < ROM::Gateway
-      include Options
+      extend Initializer
+
+      # @!attribute [r] uri
+      #  @return [String] connection string
+      param :uri
 
       # @!attribute [r] path
       #   @return [String] a path to files with SQL queries
-      option :path, reader: true
+      option :path, reader: true, optional: true
 
       # @!attribute [r] queries
       #   @return [Hash] a hash with queries
-      option :queries, type: Hash, default: EMPTY_HASH, reader: true
+      option :queries, default: -> _ { EMPTY_HASH }, reader: true
 
       # @!attribute [r] query_proc
       #   This defaults to simple interpolation of the query using option hash passed to a relation
@@ -63,11 +67,10 @@ module ROM
       #   @option :query_proc [Proc]
       #
       # @api public
-      def initialize(uri, options = {})
+      def initialize(*)
         super
         @connection = Sequel.connect(uri, options)
-        initialize_queries
-        queries.freeze
+        @queries = @queries.merge(load_queries(path)).freeze
         Relation.query_proc(query_proc)
         Relation.load_queries(queries)
       end
@@ -99,18 +102,19 @@ module ROM
       # Loads queries from filesystem if :path was provided
       #
       # @api private
-      def initialize_queries
-        @queries = options[:queries].dup
-
-        return unless path
-
-        Dir["#{path}/*"].each do |dir|
-          dataset = File.basename(dir).to_sym
-          @queries[dataset] = {}
-          Dir["#{dir}/**/*.sql"].each do |file|
-            name = File.basename(file, '.*').to_sym
-            sql = File.read(file)
-            @queries[dataset][name] = sql.strip
+      def load_queries(path)
+        if path.nil?
+          {}
+        else
+          Dir["#{path}/*"].each_with_object({}) do |dir, fs_queries|
+            dataset = File.basename(dir).to_sym
+
+            fs_queries[dataset] = Dir["#{dir}/**/*.sql"].each_with_object({}) do |file, ds_queries|
+              query_name = File.basename(file, '.*').to_sym
+              sql = File.read(file).strip
+
+              ds_queries[query_name] = sql
+            end
           end
         end
       end

data/lib/rom/yesql/relation.rb

@@ -1,3 +1,5 @@
+require 'dry/core/class_attributes'
+
 require 'rom/relation'
 require 'rom/yesql/relation/class_interface'
 
@@ -31,7 +33,7 @@ module ROM
     class Relation < ROM::Relation
       adapter :yesql
 
-      extend ClassMacros
+      extend Dry::Core::ClassAttributes
 
       defines :query_proc
 

data/lib/rom/yesql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Yesql
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/rom-yesql.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rom/yesql/version'
@@ -18,8 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rom", "~> 2.0"
-  spec.add_runtime_dependency 'sequel', '~> 4.27'
+  spec.add_runtime_dependency "rom", "~> 3.0"
+  spec.add_runtime_dependency "dry-core", "~> 0.2", ">= 0.2.4"
+  spec.add_runtime_dependency "sequel", "~> 4.27"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/spec/integration/adapter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'ROM / Yesql' do
+RSpec.describe 'ROM / Yesql' do
   include_context 'users and tasks'
 
   let(:container) { ROM.container(configuration) }

data/spec/shared/database_setup.rb

@@ -1,4 +1,4 @@
-shared_context 'database setup' do
+RSpec.shared_context 'database setup' do
   include_context 'gateway setup'
 
   let!(:conn) { Sequel.connect(uri) }

data/spec/shared/repository_setup.rb

@@ -1,4 +1,4 @@
-shared_context 'gateway setup' do
+RSpec.shared_context 'gateway setup' do
   let(:root) { Pathname(__FILE__).dirname.join('../..') }
   let(:path) { root.join('spec/fixtures') }
 

data/spec/shared/users_and_tasks.rb

@@ -1,4 +1,4 @@
-shared_context 'users and tasks' do
+RSpec.shared_context 'users and tasks' do
   include_context 'database setup'
 
   before do

data/spec/spec_helper.rb

@@ -1,16 +1,14 @@
-# encoding: utf-8
-
 require 'bundler'
 Bundler.setup
 
-if RUBY_ENGINE == 'rbx'
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
+if RUBY_ENGINE == 'ruby' && ENV['CI'] == 'true'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
 end
 
 require 'rom-yesql'
-# FIXME: why do we need to require it manually??
-require 'sequel/adapters/sqlite' unless RUBY_ENGINE == 'jruby'
 require 'inflecto'
 require 'logger'
 
@@ -27,11 +25,13 @@ Dir[root.join('shared/*.rb').to_s].each { |f| require f }
 
 RSpec.configure do |config|
   config.before do
-    @constants = Object.constants
+    module Test
+    end
   end
 
   config.after do
-    added_constants = Object.constants - @constants
-    added_constants.each { |name| Object.send(:remove_const, name) }
+    Object.send(:remove_const, :Test)
   end
+
+  config.disable_monkey_patching!
 end

data/spec/unit/rom/yesql/repository_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ROM::Yesql::Gateway do
+RSpec.describe ROM::Yesql::Gateway do
   include_context 'gateway setup'
 
   it 'loads queries from file system when :path is provided' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-yesql
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,14 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement