lb-persistence 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34f142eee2a8be5aae73687655f819eb5b54f77fc286bd7bf03fd60ccd598c0a
-  data.tar.gz: 9d145a34e867be9d70d64668eba6ee3823b6b9319e86ba1985cd829f5d007b8e
+  metadata.gz: 10650bcb263b3de597e131ce4845195860359394fe2cf06736a31d82e488377b
+  data.tar.gz: 5e0bb4741af426964b54db10bc2852aea3d7d56c53efe0d5cdf540bbaf4c6bac
 SHA512:
-  metadata.gz: 4409e4fbe16f39c07460807d7e36e6eb6f76e813a7f61703612bd9906902708464e78680e99984f8cdb0d88d932aa88316a5792c63d904cacf3c9862efadbda7
-  data.tar.gz: 43fea15f325e80d76ca632531fca42d0eb51ee37bf951f8394fb55100ace30347ed69b85cdcbdb7821860ac2ab4f2d69e19bb10925521d2c4758fe77a5d06814
+  metadata.gz: bc3cbbffd86a14edb1880e61cd55a3e6c48ee4827206b269c18978ac5b062093a4b63f427215e8093c0918632d736ceb49108b975363da7a6ad5eb12622563e7
+  data.tar.gz: 7b4ed1360817c34611391c6f47963ea9b061128fee48b4a0e07b82cf65c5ff305396c9f01730652bfd104c3b860cdd2334a60da39e7283d7b974bd2b1917a079

data/.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: CI
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby_version: ['2.5.x', '2.6.x', '2.7.x']
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libsqlite3-dev
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake ci

data/Guardfile

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 guard :bundler do
   watch('Gemfile')
@@ -28,7 +27,7 @@ guard :rspec, cmd: 'bundle exec rspec ' +
     Dir["spec/unit/#{m[1]}/#{m[2]}*"]
   end
 
-  watch("lib/#{File.basename(File.expand_path('../', __FILE__))}.rb") do
+  watch("lib/#{File.basename(File.expand_path(__dir__))}.rb") do
     'spec'
   end
 

data/README.md

@@ -1,10 +1,10 @@
 [gem]: https://rubygems.org/gems/lb-persistence
-[ci]: https://circleci.com/gh/lb-rb/lb-persistence/tree/master
+[ci]: https://github.com/lb-rb/lb-persistence/actions
 
 # lb-persistence
 
 [![Gem Version](https://badge.fury.io/rb/lb-persistence.svg)][gem]
-[![Build Status](https://img.shields.io/circleci/project/lb-rb/lb-persistence.svg)][ci]
+[![Build Status](https://github.com/lb-rb/lb-persistence/workflows/CI/badge.svg)][ci]
 
 ## Credits
 

data/Rakefile

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require 'devtools'
 

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 77
+total_score: 72

data/lb-persistence.gemspec

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
-require File.expand_path('../lib/lb/persistence/version', __FILE__)
+require File.expand_path('lib/lb/persistence/version', __dir__)
 
 Gem::Specification.new do |gem|
   gem.name        = 'lb-persistence'
@@ -24,15 +23,15 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files      = %w[README.md]
   gem.required_ruby_version = '>= 2.4'
 
-  gem.add_dependency 'dry-struct',       '~> 0.4', '< 0.5'
-  gem.add_dependency 'rom',              '~> 4.2'
-  gem.add_dependency 'rom-sql',          '~> 2.4'
+  gem.add_dependency 'dry-struct',       '~> 1.3'
+  gem.add_dependency 'rom',              '~> 5.2'
+  gem.add_dependency 'rom-sql',          '~> 3.2'
 
-  gem.add_development_dependency 'devtools',       '~> 0.1.20'
-  gem.add_development_dependency 'guard',          '~> 2.14'
-  gem.add_development_dependency 'guard-bundler',  '~> 2.1'
+  gem.add_development_dependency 'devtools',       '~> 0.1.25'
+  gem.add_development_dependency 'guard',          '~> 2.16'
+  gem.add_development_dependency 'guard-bundler',  '~> 3.0'
   gem.add_development_dependency 'guard-rspec',    '~> 4.7', '>= 4.7.3'
   gem.add_development_dependency 'guard-rubocop',  '~> 1.3'
-  gem.add_development_dependency 'rubocop',        '~> 0.52.1'
+  gem.add_development_dependency 'rubocop',        '~> 0.79'
   gem.add_development_dependency 'sqlite3',        '~> 1.3'
 end

data/lib/lb/persistence.rb

@@ -9,7 +9,6 @@ require 'lb/persistence/settings'
 
 # Helpers
 require 'lb/persistence/relation/joins'
-require 'lb/persistence/model/attributes'
 require 'lb/persistence/functions'
 
 # LB namespace

data/lib/lb/persistence/functions.rb

@@ -37,11 +37,11 @@ module LB
 
         {
           group: :remove_key_prefix_inject_for,
-          wrap:  :remove_key_prefix_inject_hash_for
+          wrap: :remove_key_prefix_inject_hash_for
         }.each do |operation, inject|
-          # rubocop:disable Metrics/LineLength
+          # rubocop:disable Layout/LineLength
           define_method :"#{operation}_prefix" do |array, key, keys, prefix, model = nil|
-            # rubocop:enable Metrics/LineLength
+            # rubocop:enable Layout/LineLength
             compose do |ops|
               ops << t(operation, key, keys)
               ops << t(:map_array,
@@ -88,8 +88,8 @@ module LB
             t(:remove_key_prefix_inject, prefix, model)).call(hash)
         end
 
-        def reject_array(array, fn)
-          Array(array).reject { |value| fn[value] }
+        def reject_array(array, function)
+          Array(array).reject { |value| function[value] }
         end
 
         def empty_hash?(hash)

data/lib/lb/persistence/types.rb

@@ -4,7 +4,7 @@ module LB
   class Persistence
     # Custom Types
     module Types
-      include Dry::Types.module
+      include Dry.Types(default: :nominal)
     end
   end
 end

data/lib/lb/persistence/version.rb

@@ -3,6 +3,6 @@
 module LB
   class Persistence
     # Version
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 if ENV['COVERAGE'] == 'true'
   require 'simplecov'
@@ -10,7 +9,7 @@ if ENV['COVERAGE'] == 'true'
     add_filter 'config'
     add_filter 'spec'
 
-    minimum_coverage 89
+    minimum_coverage 88
   end
 end
 
@@ -21,7 +20,7 @@ require 'lb-persistence'
 require 'devtools/spec_helper'
 
 # require spec support files and shared behavior
-Dir[File.expand_path('../{support,shared}/**/*.rb', __FILE__)].each do |file|
+Dir[File.expand_path('{support,shared}/**/*.rb', __dir__)].sort.each do |file|
   require file
 end
 

data/spec/unit/lb/persistence/functions/class_methods/group_prefix_spec.rb

@@ -18,7 +18,7 @@ describe LB::Persistence::Functions, '.group_prefix' do
     nested = nested_class
     Class.new(Dry::Struct) do
       module Types
-        include Dry::Types.module
+        include Dry.Types(default: :nominal)
       end
 
       attribute :a, Types::Strict::String
@@ -29,7 +29,7 @@ describe LB::Persistence::Functions, '.group_prefix' do
   let(:nested_class) do
     Class.new(Dry::Struct) do
       module Types
-        include Dry::Types.module
+        include Dry.Types(default: :nominal)
       end
 
       attribute :a, Types::Strict::String

data/spec/unit/lb/persistence/functions/class_methods/wrap_prefix_spec.rb

@@ -18,7 +18,7 @@ describe LB::Persistence::Functions, '.wrap_prefix' do
     nested = nested_class
     Class.new(Dry::Struct) do
       module Types
-        include Dry::Types.module
+        include Dry.Types(default: :nominal)
       end
 
       attribute :a,    Types::Strict::String
@@ -29,7 +29,7 @@ describe LB::Persistence::Functions, '.wrap_prefix' do
   let(:nested_class) do
     Class.new(Dry::Struct) do
       module Types
-        include Dry::Types.module
+        include Dry.Types(default: :nominal)
       end
 
       attribute :a, Types::Strict::String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lb-persistence
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Firas Zaidan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -16,90 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rom-sql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: devtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.25
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0.79'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: '0.79'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +164,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -178,7 +173,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- circle.yml
 - config/devtools.yml
 - config/flay.yml
 - config/flog.yml
@@ -190,7 +184,6 @@ files:
 - lib/lb-persistence.rb
 - lib/lb/persistence.rb
 - lib/lb/persistence/functions.rb
-- lib/lb/persistence/model/attributes.rb
 - lib/lb/persistence/relation/joins.rb
 - lib/lb/persistence/settings.rb
 - lib/lb/persistence/types.rb
@@ -204,7 +197,6 @@ files:
 - spec/unit/lb/persistence/container_spec.rb
 - spec/unit/lb/persistence/functions/class_methods/group_prefix_spec.rb
 - spec/unit/lb/persistence/functions/class_methods/wrap_prefix_spec.rb
-- spec/unit/lb/persistence/model/redefine_attribute_spec.rb
 - spec/unit/lb/persistence/repository_spec.rb
 - spec/unit/lb/persistence/uri_spec.rb
 homepage: https://github.com/lb-rb/lb-persistence
@@ -228,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: LB Persistence API
@@ -241,6 +233,5 @@ test_files:
 - spec/unit/lb/persistence/container_spec.rb
 - spec/unit/lb/persistence/functions/class_methods/group_prefix_spec.rb
 - spec/unit/lb/persistence/functions/class_methods/wrap_prefix_spec.rb
-- spec/unit/lb/persistence/model/redefine_attribute_spec.rb
 - spec/unit/lb/persistence/repository_spec.rb
 - spec/unit/lb/persistence/uri_spec.rb

data/circle.yml

@@ -1,23 +0,0 @@
-defaults: &defaults
-  working_directory: ~/lb-project
-  steps:
-    - checkout
-    - run: bundle install
-    - run: bundle exec rake ci
-
-version: 2
-jobs:
-  ruby_2_4:
-    <<: *defaults
-    docker:
-      - image: circleci/ruby:2.4.4
-  ruby_2_5:
-    <<: *defaults
-    docker:
-      - image: circleci/ruby:2.5.1
-workflows:
-  version: 2
-  test:
-    jobs:
-      - ruby_2_4
-      - ruby_2_5

data/lib/lb/persistence/model/attributes.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module LB
-  class Persistence
-    module Model
-      # Helper for dry-struct attributes
-      module Attributes
-        def delete_attribute(name)
-          @schema.delete(name)
-          equalizer.instance_variable_get('@keys').delete(name)
-          superclass.instance_variable_get('@schema').delete(name)
-          @constructor = Dry::Types['coercible.hash']
-                         .public_send(constructor_type, @schema)
-
-          self
-        end
-
-        def redefine_attribute(name, type)
-          delete_attribute(name)
-          attribute(name, type)
-        end
-      end
-    end
-  end
-end

data/spec/unit/lb/persistence/model/redefine_attribute_spec.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe LB::Persistence::Model::Attributes, '#redefine_attribute' do
-  include_context 'settings'
-
-  subject { object }
-
-  let(:model_base_class) do
-    Class.new(Dry::Struct) do
-      module Types
-        include Dry::Types.module
-      end
-
-      attribute :a, Types::Strict::Symbol
-      attribute :b, Types::Strict::String
-      attribute :c, Types::Strict::Hash
-    end
-  end
-
-  let(:model_child_class) do
-    Class.new(model_base_class) do
-      extend LB::Persistence::Model::Attributes
-
-      redefine_attribute :b, Types::Strict::Bool
-    end
-  end
-
-  let(:object) { model_child_class.new(values) }
-
-  let(:base_values) do
-    {
-      a: :symbol,
-      c: { key: 'value' }
-    }
-  end
-
-  let(:values) { base_values.merge(b: true) }
-
-  it 'should create model with redefined attribute' do
-    expect(subject.b).to be(true)
-  end
-
-  context 'with invalid value' do
-    let(:values) { base_values.merge(b: 'true') }
-    let(:expected_msg) { /has invalid type for #{Regexp.escape(':b')}/ }
-
-    it 'should not create model with old attribute' do
-      expect { subject }.to raise_error(Dry::Struct::Error, expected_msg)
-    end
-  end
-end