izolenta 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09bc2895fc70a6c50727f81242f0f06e90c4492d3c1193ba4e1a1bffb83599ec'
-  data.tar.gz: 14d8e61fbd7bb788b05054274418d14b55e18117fc5793d5f0b4a67af1e85a41
+  metadata.gz: fd520ce5cefeee28f6985c56bc36b29f102dfdb5972ee736d6cabd11928139b9
+  data.tar.gz: 8e3e5acc0b8d853e9f78a9a8b1bc25e3e08836c506e0787fdb465420700f81fd
 SHA512:
-  metadata.gz: 1d3fdb8446cd4698487c397bb7c8de99cdf1a44b911d84ce218c76d46f4aa98adc922813abfbbb231ad612bb0430137a538555d4620f77e813e2ac19e39c2d56
-  data.tar.gz: c9dc6ef925404436a15358c07a1c7a640f593a02f12fae1448b8b6429063c07629768e0f8f45dc78e44367ab482ade23bd53a5e5be926cf1f23d53910f13d62d
+  metadata.gz: d63396b28549ecde16b8e810c3c667c2a0245ee6fdce41cc9f1239abd5ebbad50e9b22a71780bf3b73ee7911bedd865e2d4f9315af6541ca226d5891b57f5dde
+  data.tar.gz: 8713a4d8039f843fe4d5eb9487a1dcf54146e83bc09564383a1673407034de28b3e1d6469b349dcf44ec23ca2f9b4a77b6d5d0dff23cc3828d87bd30fe25c9c6

data/.rubocop.yml

@@ -0,0 +1,92 @@
+inherit_gem:
+  rubocop-shopify: rubocop.yml
+#
+#Style/SingleLineMethods:
+#  Description: 'Avoid single-line methods.'
+#  StyleGuide: '#no-single-line-methods'
+#  Enabled: false
+#  VersionAdded: '0.9'
+#  VersionChanged: '1.8'
+#  AllowIfMethodIsEmpty: true
+#
+#Style/AsciiComments:
+#  Description: 'Use only ascii symbols in comments.'
+#  StyleGuide: '#english-comments'
+#  Enabled: false
+#  VersionAdded: '0.9'
+#  VersionChanged: '1.21'
+#  AllowedChars:
+#    - ©
+#
+#Layout/LineLength:
+#  Description: 'Checks that line length does not exceed the configured limit.'
+#  StyleGuide: '#max-line-length'
+#  Enabled: true
+#  VersionAdded: '0.25'
+#  VersionChanged: '1.4'
+#  Max: 120
+#  # To make it possible to copy or click on URIs in the code, we allow lines
+#  # containing a URI to be longer than Max.
+#  AllowHeredoc: true
+#  AllowURI: true
+#  URISchemes:
+#    - http
+#    - https
+#  # The IgnoreCopDirectives option causes the LineLength rule to ignore cop
+#  # directives like '# rubocop: enable ...' when calculating a line's length.
+#  IgnoreCopDirectives: true
+#  # The AllowedPatterns option is a list of !ruby/regexp and/or string
+#  # elements. Strings will be converted to Regexp objects. A line that matches
+#  # any regular expression listed in this option will be ignored by LineLength.
+#  AllowedPatterns: []
+#  IgnoredPatterns: [] # deprecated
+#  Exclude:
+#    - "./test/**/**/*"
+#
+#Metrics/ClassLength:
+#  Description: 'Avoid classes longer than 100 lines of code.'
+#  Enabled: false
+#  VersionAdded: '0.25'
+#  VersionChanged: '0.87'
+#  CountComments: false  # count full line comments?
+#  Max: 100
+#  CountAsOne: []
+#
+#Lint/MissingCopEnableDirective:
+#  Description: 'Checks for a `# rubocop:enable` after `# rubocop:disable`.'
+#  Enabled: true
+#  VersionAdded: '0.52'
+#  # Maximum number of consecutive lines the cop can be disabled for.
+#  # 0 allows only single-line disables
+#  # 1 would mean the maximum allowed is the following:
+#  #   # rubocop:disable SomeCop
+#  #   a = 1
+#  #   # rubocop:enable SomeCop
+#  # .inf for any size
+#  MaximumRangeSize: .inf
+#
+#Style/MethodCallWithArgsParentheses:
+#  Enabled: true
+#  IgnoredMethods:
+#    - require
+#    - require_relative
+#    - require_dependency
+#    - yield
+#    - raise
+#    - puts
+#  Exclude:
+#    - "/**/Gemfile"
+#    - "./db/**/*"
+#
+#Layout/EmptyLinesAroundBlockBody:
+#  # its more documentation than code, so it should be readable and
+#  # there are huge amount of multiline description, looks nasty without spaces
+#  Exclude:
+#    - "./app_doc/**/*"
+#
+#Style/ClassAndModuleChildren:
+#  Enabled: false
+#
+#Lint/UnderscorePrefixedVariableName:
+#  Exclude:
+#    - "./test/**/**/*"

data/CHANGELOG.md

@@ -1,5 +1,18 @@
+#0.0.6
+- new ruby 3 image for ruby 3 testing
+- fix get_new_column_type incompatibility with ruby 
+
+#0.0.5
+- rubocop-shopify added to dev dependencies
+- fixed ruby 3.0 incompatibility in delegate_uniqueness, now gem could be used with ruby 3+
+
+#0.0.4
+- removed 'OR REPLACE' in trigger definition, lowering Postgres version constraint 
+- trigger_condition added ( could replace partial uniq index ) 
+ 
 #0.0.3
 - wrapper_function options added, you can define function to convert to uniquely sortable types, for instance array to string 
+- moved all helper functions to internal module, just to keep things clear on the migrations
 
 #0.0.2
 - delegate_uniqueness helper is available as a migration method

data/Gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in izolenta.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
+gem "rake", "~> 12.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    izolenta (0.0.2)
+    izolenta (0.0.5)
       pg
 
 GEM
@@ -18,18 +18,41 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
+    ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
+    json (2.6.2)
     method_source (1.0.0)
     minitest (5.14.4)
-    pg (1.2.3)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    pg (1.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    rainbow (3.1.1)
     rake (12.3.3)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rubocop (1.31.2)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-shopify (2.8.0)
+      rubocop (~> 1.31)
+    ruby-progressbar (1.11.0)
     ruby_jard (0.3.1)
       byebug (>= 9.1, < 12.0)
       pry (~> 0.13.0)
@@ -37,6 +60,7 @@ GEM
     tty-screen (0.8.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
     zeitwerk (2.5.1)
 
 PLATFORMS
@@ -47,6 +71,8 @@ DEPENDENCIES
   izolenta!
   minitest (~> 5.0)
   rake (~> 12.0)
+  rubocop
+  rubocop-shopify
   ruby_jard
 
 BUNDLED WITH

data/README.md

@@ -46,6 +46,15 @@ class WithWrapperFunctionMigration < ActiveRecord::Migration[5.0]
     delegate_uniqueness( :your_table_name, :column_name, wrapper_function: 'type_conversion_function' )
   end
 end
+
+
+class WithWrapperFunctionMigration < ActiveRecord::Migration[5.0]
+  # apply trigger condition for partial uniqueness
+  def change
+    delegate_uniqueness( :your_table_name, :column_name, trigger_condition: 'NEW.type IS NOT NULL' )
+  end
+end
+
 ```
 
 ## Development
@@ -55,6 +64,9 @@ docker-compose build
 
 docker-compose run test /bin/bash
 > service postgresql start && rake test
+
+docker-compose run test3 /bin/bash
+> service postgresql start && rake test
 ```
 
 ## Future Features

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
@@ -7,4 +9,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/docker-compose.yml

@@ -8,3 +8,11 @@ services:
     volumes:
       - '.:/app'
 
+  test3:
+    build:
+      context: .
+      dockerfile: ruby3.Dockerfile
+    image: izolenta3
+    command: service postgresql start && rake test
+    volumes:
+      - '.:/app'

data/izolenta.gemspec

@@ -1,4 +1,6 @@
-require_relative 'lib/izolenta/version'
+# frozen_string_literal: true
+
+require_relative "lib/izolenta/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "izolenta"
@@ -6,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["alekseyl"]
   spec.email         = ["leshchuk@gmail.com"]
 
-  spec.summary       = %q{Migration helpers for delegated uniqueness in Postgres}
-  spec.description   = %q{Migration helpers for delegated uniqueness in Postgres}
+  spec.summary       = "Migration helpers for delegated uniqueness in Postgres"
+  spec.description   = "Migration helpers for delegated uniqueness in Postgres"
   spec.homepage      = "https://github.com/alekseyl/izolenta"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
@@ -20,14 +22,15 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    %x(git ls-files -z).split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "pg"
-  spec.add_development_dependency "activerecord", ">= 5"
-  spec.add_development_dependency "ruby_jard"
+  spec.add_dependency("pg")
+  spec.add_development_dependency("activerecord", ">= 5")
+  spec.add_development_dependency("rubocop-shopify")
+  spec.add_development_dependency("ruby_jard")
 end

data/lib/izolenta/active_record_migration.rb

@@ -1,71 +1,86 @@
-module Izolenta::ActiveRecordMigration
-  # options:
-  #   wrapper_function: 'some_func' # some_func should be defined prior
-  def delegate_uniqueness(origin_table, column, options = {})
-    helper_table_name = "#{column}_#{origin_table}_uniqs"
+# frozen_string_literal: true
 
-    reversible do |dir|
-      dir.up {
-        Helpers.create_helper_table(helper_table_name, column, Helpers.get_new_column_type(origin_table, column, options))
-        add_index( helper_table_name, column, unique: true )
+if defined? ActiveRecord
+  module Izolenta
+    module ActiveRecordMigration
+      # options:
+      #   wrapper_function: 'some_func' # some_func should be defined prior
+      def delegate_uniqueness(origin_table, column, **options)
+        helper_table_name = "#{column}_#{origin_table}_uniqs"
 
-        Helpers.create_sync_trigger( origin_table, column, helper_table_name, options )
-      }
+        reversible do |dir|
+          dir.up do
+            Helpers.create_helper_table(helper_table_name, column,
+              Helpers.get_new_column_type(origin_table, column, **options))
+            add_index(helper_table_name, column, unique: true)
 
-      dir.down {
-        drop_table( helper_table_name )
-        Helpers.drop_sync_trigger( origin_table, column )
-      }
-    end
-  end
+            Helpers.create_sync_trigger(origin_table, column, helper_table_name, options)
+          end
 
-  module Helpers
-    class << self
-      def create_helper_table(helper_table, column_name, column_type )
-        ActiveRecord::Base.connection.execute "CREATE TABLE #{helper_table} ( #{column_name} #{column_type} );"
+          dir.down do
+            drop_table(helper_table_name)
+            Helpers.drop_sync_trigger(origin_table, column)
+          end
+        end
       end
 
-      def create_sync_trigger(table, column_name, helper_table_name, options )
-        trg_name = "#{table}_#{column_name}_trg"
-        insert_value = options[:wrapper_function] ? "#{options[:wrapper_function]}(NEW.#{column_name})"
-          : "NEW.#{column_name}"
-        ActiveRecord::Base.connection.execute <<~SYNC_TRIGGER
-          CREATE OR REPLACE FUNCTION #{trg_name}() RETURNS trigger AS $$
-          BEGIN 
-            INSERT INTO #{helper_table_name} VALUES ( #{insert_value} );
-            RETURN NEW;
-          END $$ LANGUAGE plpgSQL;
-  
-          CREATE OR REPLACE TRIGGER #{trg_name} BEFORE INSERT ON #{table} FOR EACH ROW
-          EXECUTE FUNCTION #{trg_name}();
-        SYNC_TRIGGER
-      end
+      # helpers na
+      module Helpers
+        class << self
+          def create_helper_table(helper_table, column_name, column_type)
+            ActiveRecord::Base.connection.execute("CREATE TABLE #{helper_table} ( #{column_name} #{column_type} );")
+          end
 
-      def drop_sync_trigger(table, column_name)
-        trg_name = "#{table}_#{column_name}_trg"
+          def create_sync_trigger(table, column_name, helper_table_name, options)
+            trg_name = "#{table}_#{column_name}_trg"
+            insert_value = if options[:wrapper_function]
+              "#{options[:wrapper_function]}(NEW.#{column_name})"
+            else
+              "NEW.#{column_name}"
+            end
 
-        ActiveRecord::Base.connection.execute <<~SYNC_TRIGGER
-       DROP TRIGGER IF EXISTS #{trg_name} ON #{table};
-        SYNC_TRIGGER
-      end
+            trigger_condition = "WHEN( #{options[:trigger_condition]} )" if options[:trigger_condition]
 
-      def get_new_column_type(origin_table, column, wrapper_function: nil)
-        wrapper_function ? get_function_type(wrapper_function) : get_column_type(origin_table, column)
-      end
+            ActiveRecord::Base.connection.execute(<<~SYNC_TRIGGER)
+              CREATE OR REPLACE FUNCTION #{trg_name}() RETURNS trigger AS $$
+              BEGIN#{" "}
+                INSERT INTO #{helper_table_name} VALUES ( #{insert_value} );
+                RETURN NEW;
+              END $$ LANGUAGE plpgSQL;
 
-      def get_column_type(origin_table, column)
-        ActiveRecord::Base.connection.schema_cache.columns_hash(origin_table.to_s)[column.to_s]&.sql_type
-      end
+              CREATE TRIGGER #{trg_name} BEFORE INSERT ON #{table}#{" "}
+              FOR EACH ROW
+              #{trigger_condition}
+              EXECUTE FUNCTION #{trg_name}();
+            SYNC_TRIGGER
+          end
 
-      def get_function_type(wrapper_function)
-        ActiveRecord::Base
-          .connection
-          .execute("SELECT typname FROM pg_type WHERE oid=(SELECT prorettype FROM pg_proc WHERE proname ='#{wrapper_function}')")
-          .first['typname']
+          def drop_sync_trigger(table, column_name)
+            trg_name = "#{table}_#{column_name}_trg"
+
+            ActiveRecord::Base.connection.execute(<<~SYNC_TRIGGER)
+              DROP TRIGGER IF EXISTS #{trg_name} ON #{table};
+            SYNC_TRIGGER
+          end
+
+          def get_new_column_type(origin_table, column, wrapper_function: nil, **)
+            wrapper_function ? get_function_type(wrapper_function) : get_column_type(origin_table, column)
+          end
+
+          def get_column_type(origin_table, column)
+            ActiveRecord::Base.connection.schema_cache.columns_hash(origin_table.to_s)[column.to_s]&.sql_type
+          end
+
+          def get_function_type(wrapper_function)
+            ActiveRecord::Base
+              .connection
+              .execute("SELECT typname FROM pg_type WHERE oid=(SELECT prorettype FROM pg_proc WHERE proname ='#{wrapper_function}')") # rubocop:disable Layout/LineLength
+              .first["typname"]
+          end
+        end
       end
     end
   end
+end
 
-end if defined? ActiveRecord
-
-ActiveRecord::Migration.include(Izolenta::ActiveRecordMigration) if defined? ActiveRecord
+ActiveRecord::Migration.include(Izolenta::ActiveRecordMigration) if defined? ActiveRecord

data/lib/izolenta/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Izolenta
-  VERSION = "0.0.3"
+  VERSION = "0.0.6"
 end

data/lib/izolenta.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require "izolenta/version"
-require 'izolenta/active_record_migration'
+require "izolenta/active_record_migration"
 
 module Izolenta
   class Error < StandardError; end

data/ruby3.Dockerfile

@@ -0,0 +1,20 @@
+FROM ruby:3-bullseye
+
+WORKDIR /app
+RUN  apt-get update && apt-get -y install lsb-release
+#
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+    sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
+    apt-get update && apt-get -y install postgresql postgresql-client-12
+
+RUN sh -c 'echo "local   all             all                                     trust" > /etc/postgresql/14/main/pg_hba.conf' && \
+    service postgresql start && \
+    psql -U postgres -c 'CREATE DATABASE "izolenta-test"'
+
+RUN  gem install bundler
+
+COPY lib/izolenta/version.rb /app/lib/izolenta/version.rb
+COPY izolenta.gemspec /app/
+COPY Gemfil* /app/
+#
+RUN bundle install

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: izolenta
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-shopify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_jard
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -77,6 +92,7 @@ files:
 - lib/izolenta.rb
 - lib/izolenta/active_record_migration.rb
 - lib/izolenta/version.rb
+- ruby3.Dockerfile
 homepage: https://github.com/alekseyl/izolenta
 licenses:
 - MIT