metka 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5621512784509f88e9861c6565536ca325d32d9915630427f912bb39b1a9ea15
-  data.tar.gz: fc3b37fee78a29229c580bd784137806c6059f8edfffbbbff826ae239fa91ca3
+  metadata.gz: d03117dddd97b8d5e4dadecbeac504796f15e931d5fac68cc294f2ffa940e6ec
+  data.tar.gz: 726433d8f58ebd159599b5617e9951004291b9e63f9f98e6a72a53459544d517
 SHA512:
-  metadata.gz: 411ded3fec01b9b111bdd95ce8a9c4b22d077b9e816160571c132883b7e07837a237abcc20993cac38cfb3cd2fd952634f2eed3cc823aeaefce4240288973cbc
-  data.tar.gz: 713866c547b15c6f11833acf593c56172508211c0c5732ea3ef6818e92ef5dd3c112c01ba449bd9d0d6b8d20930b406b172857f663067db3f418833a0a7d27dc
+  metadata.gz: 85dd6c3fa306dde5034e0a20ac966b689a07a6e5649ae1f9b607e1e28a62bf15f0207f9350ee79f824803c33eaa42754798ba048f4721988aef98dfd4b0af97a
+  data.tar.gz: d717a3389a9c0846454486e52b2383126b6a08e0654f9dafa112fa0bd8e130a444613a5fe344f05aaec6b5613d143eaecf56a2c776a8005a9b9112295e0dff2e

data/lib/generators/metka/sql_identifier.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Metka
+  module Generators
+    # Generator options land verbatim in the migration's SQL, so they are
+    # constrained to plain identifiers: a hostile-looking name fails closed
+    # instead of producing broken or surprising DDL.
+    module SqlIdentifier
+      IDENTIFIER = /\A[a-zA-Z_][a-zA-Z0-9_]*\z/
+
+      private
+
+      def validate_sql_identifiers!(names_by_option)
+        names_by_option.each do |option, names|
+          names.each do |name|
+            next if IDENTIFIER.match?(name)
+
+            raise Thor::Error, "#{option} #{name.inspect} must be a plain SQL identifier: " \
+              "letters, digits and underscores, not starting with a digit"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/metka/strategies/index/index_generator.rb

@@ -2,12 +2,14 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "../../sql_identifier"
 
 module Metka
   module Generators
     module Strategies
       class IndexGenerator < ::Rails::Generators::Base # :nodoc:
         include Rails::Generators::Migration
+        include Metka::Generators::SqlIdentifier
 
         DEFAULT_SOURCE_COLUMNS = [ "tags" ].freeze
 
@@ -36,6 +38,11 @@ module Metka
           desc: "List of the tagged columns names"
 
         def generate_migration
+          validate_sql_identifiers!(
+            "--source-table-name" => [ source_table_name ],
+            "--source-columns" => source_columns
+          )
+
           unless sqlite?
             say_status :skipped,
               "the index strategy targets SQLite; PostgreSQL GIN indexes already serve tag queries",

data/lib/generators/metka/strategies/table/table_generator.rb

@@ -2,12 +2,14 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "../../sql_identifier"
 
 module Metka
   module Generators
     module Strategies
       class TableGenerator < ::Rails::Generators::Base # :nodoc:
         include Rails::Generators::Migration
+        include Metka::Generators::SqlIdentifier
 
         DEFAULT_SOURCE_COLUMNS = [ "tags" ].freeze
 
@@ -32,6 +34,12 @@ module Metka
           desc: "Custom name for the resulting table"
 
         def generate_migration
+          validate_sql_identifiers!(
+            "--source-table-name" => [ source_table_name ],
+            "--source-columns" => source_columns,
+            "--table-name" => Array(options[:table_name])
+          )
+
           migration_template migration_template_file, "db/migrate/#{migration_name}.rb"
         end
 

data/lib/metka/model.rb

@@ -52,7 +52,7 @@ module Metka
     def define_tagged_with_scope(base)
       return if base.respond_to?(:tagged_with)
 
-      columns = @columns
+      columns = @columns.map(&:to_s)
       parser = tag_parser
       allowed = TAGGED_WITH_OPTIONS
 
@@ -66,10 +66,19 @@ module Metka
           raise ArgumentError, "Unknown tagged_with options #{unknown.inspect}, expected #{allowed.inspect}"
         end
 
+        # :on lands in raw SQL as identifiers, so it is checked against the
+        # declared columns rather than interpolated on trust — same contract
+        # as metka_cloud.
+        on = Array(options[:on] || columns).map(&:to_s)
+        unknown_columns = on - columns
+        if unknown_columns.any?
+          raise ArgumentError, "Unknown tag columns #{unknown_columns.inspect}, expected #{columns.inspect}"
+        end
+
         tag_list = parser.call(tags)
         next self if tag_list.empty?
 
-        where(::Metka::QueryBuilder.instance.call(self, options[:on] || columns, tag_list, {
+        where(::Metka::QueryBuilder.instance.call(self, on, tag_list, {
           any: options.fetch(:any, false),
           exclude: options[:exclude],
           join_operator: options[:join_operator] || ::Metka::OR

data/lib/metka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Metka
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: metka
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
-- Igor Alexandrov
-- Andrey Morozov
-bindir: exe
+- Igor Aleksandrov
+bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -24,34 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -122,47 +93,18 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
-description: Rails tagging system based on PostgreSQL arrays
+description: Rails tagging system that stores tags in a PostgreSQL array column or
+  an SQLite JSON column — no join tables, no extra models, no N+1 queries.
 email:
 - igor.alexandrov@gmail.com
-- andrey.morozov@jetrockets.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/workflows/lint_code.yml"
-- ".github/workflows/lint_docs.yml"
-- ".github/workflows/release.yml"
-- ".github/workflows/tests.yml"
-- ".gitignore"
-- ".mdlrc"
-- ".rubocop-md.yml"
-- ".rubocop.yml"
-- ".ruby-version"
 - CODE_OF_CONDUCT.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- assets/metka-icon.svg
-- assets/metka-logo.svg
-- benchmark/Gemfile
-- benchmark/README.md
-- benchmark/benchmark.rb
-- benchmark/results.sqlite.txt
-- benchmark/results.txt
-- bin/console
-- bin/setup
-- docs/superpowers/plans/2026-08-18-cloud-table-naming.md
-- docs/superpowers/specs/2026-08-18-cloud-table-naming-design.md
-- forspell.dict
-- gemfiles/rails71.gemfile
-- gemfiles/rails72.gemfile
-- gemfiles/rails80.gemfile
-- gemfiles/rails81.gemfile
-- gemfiles/railsmain.gemfile
-- gemfiles/rubocop.gemfile
+- lib/generators/metka/sql_identifier.rb
 - lib/generators/metka/strategies/index/index_generator.rb
 - lib/generators/metka/strategies/index/templates/migration.rb.erb
 - lib/generators/metka/strategies/table/table_generator.rb
@@ -175,7 +117,6 @@ files:
 - lib/metka/tag_list.rb
 - lib/metka/tags_query.rb
 - lib/metka/version.rb
-- metka.gemspec
 homepage: https://github.com/metka-ruby/metka
 licenses:
 - MIT
@@ -183,6 +124,7 @@ metadata:
   homepage_uri: https://github.com/metka-ruby/metka
   source_code_uri: https://github.com/metka-ruby/metka
   bug_tracker_uri: https://github.com/metka-ruby/metka/issues
+  changelog_uri: https://github.com/metka-ruby/metka/releases
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -200,5 +142,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: Rails tagging system based on PostgreSQL arrays
+summary: Rails tagging system based on PostgreSQL arrays and SQLite JSON columns
 test_files: []

data/.github/ISSUE_TEMPLATE.md

@@ -1,15 +0,0 @@
-# Tell us about your environment
-
-**Ruby Version:**
-
-**Rails Version:**
-
-**PostgreSQL Version:**
-
-**Metka Version:**
-
-## What did you do?
-
-## What did you expect to happen?
-
-## What actually happened?

data/.github/workflows/lint_code.yml

@@ -1,24 +0,0 @@
-name: Lint Code
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  rubocop:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: gemfiles/rubocop.gemfile
-    steps:
-    - uses: actions/checkout@v5
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "3.4"
-        bundler-cache: true
-    - name: RuboCop
-      run: bundle exec rubocop

data/.github/workflows/lint_docs.yml

@@ -1,56 +0,0 @@
-name: Lint Docs
-
-on:
-  push:
-    branches:
-    - master
-    paths:
-    - "*.md"
-    - "**/*.md"
-  pull_request:
-    paths:
-    - "*.md"
-    - "**/*.md"
-
-permissions:
-  contents: read
-
-jobs:
-  markdownlint:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v5
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "3.4"
-    - name: Run Markdown linter
-      run: |
-        gem install mdl
-        mdl README.md .github/*.md
-  rubocop:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: gemfiles/rubocop.gemfile
-    steps:
-    - uses: actions/checkout@v5
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "3.4"
-        bundler-cache: true
-    - name: Lint Markdown files with RuboCop
-      run: bundle exec rubocop -c .rubocop-md.yml
-  forspell:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v5
-    - name: Install Hunspell
-      run: |
-        sudo apt-get update
-        sudo apt-get -yqq install hunspell
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "3.4"
-    - name: Install Forspell
-      run: gem install forspell
-    - name: Run Forspell
-      run: forspell *.md .github/*.md

data/.github/workflows/release.yml

@@ -1,23 +0,0 @@
-name: Release
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  contents: read
-
-jobs:
-  push:
-    runs-on: ubuntu-latest
-    environment: rubygems
-    permissions:
-      contents: write
-      id-token: write
-    steps:
-    - uses: actions/checkout@v5
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "3.4"
-        bundler-cache: true
-    - uses: rubygems/release-gem@v1

data/.github/workflows/tests.yml

@@ -1,97 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-  schedule:
-    - cron: "0 3 * * 1" # Every monday at 3 AM
-
-permissions:
-  contents: read
-
-jobs:
-  minitest:
-    runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }} / PostgreSQL ${{ matrix.postgres }}
-    continue-on-error: ${{ matrix.allow-failure || false }}
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
-      CI: true
-      RAILS_ENV: test
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - ruby: "3.4"
-          postgres: "18"
-          gemfile: "gemfiles/rails81.gemfile"
-        - ruby: "3.4"
-          postgres: "17"
-          gemfile: "gemfiles/rails80.gemfile"
-        - ruby: "3.3"
-          postgres: "17"
-          gemfile: "gemfiles/rails72.gemfile"
-        - ruby: "3.2"
-          postgres: "16"
-          gemfile: "gemfiles/rails71.gemfile"
-        - ruby: "3.4"
-          postgres: "18"
-          gemfile: "gemfiles/railsmain.gemfile"
-          allow-failure: true
-    services:
-      postgres:
-        image: postgres:${{ matrix.postgres }}
-        ports: ["5432:5432"]
-        env:
-          POSTGRES_PASSWORD: postgres
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-    - uses: actions/checkout@v5
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Prepare test database
-      run: |
-        bundle exec rake dummy:db:create
-        bundle exec rake dummy:db:migrate:reset
-    - name: Run Minitest
-      run: bundle exec rake test
-
-  minitest-sqlite:
-    runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }} / SQLite
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
-      CI: true
-      RAILS_ENV: test
-      DB: sqlite
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - ruby: "3.4"
-          gemfile: "gemfiles/rails81.gemfile"
-        - ruby: "3.2"
-          gemfile: "gemfiles/rails71.gemfile"
-    steps:
-    - uses: actions/checkout@v5
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Prepare test database
-      run: bundle exec rake dummy:db:migrate
-    - name: Run Minitest
-      run: bundle exec rake test

data/.gitignore

@@ -1,27 +0,0 @@
-/.idea/
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/test/reports/
-/tmp/
-/test/tmp/
-
-test/debug.log
-*.gem
-
-test/dummy/log/test.log
-test/dummy/log/development.log
-
-# Gemfile.lock is not committed for gems: the supported dependency range is
-# expressed in metka.gemspec and exercised by the gemfiles/ matrix.
-Gemfile.lock
-gemfiles/*.lock
-
-# Generated by running the dummy app's migrations
-test/dummy/db/schema.rb
-test/dummy/db/*.sqlite3
-benchmark/*.sqlite3
-test/dummy/tmp/

data/.mdlrc

@@ -1 +0,0 @@
-rules "~MD013", "~MD026", "~MD029", "~MD034", "~MD041"

data/.rubocop-md.yml

@@ -1,20 +0,0 @@
-inherit_from: ".rubocop.yml"
-
-require:
-  - rubocop-md
-
-
-AllCops:
-  Include:
-    - '**/*.md'
-
-Lint/Void:
-  Exclude:
-    - '**/*.md'
-
-Lint/DuplicateMethods:
-  Exclude:
-    - '**/*.md'
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: space

data/.rubocop.yml

@@ -1,19 +0,0 @@
-inherit_gem:
-  rubocop-rails-omakase: rubocop.yml
-
-inherit_mode:
-  merge:
-    - Exclude
-
-AllCops:
-  Exclude:
-    - 'bin/*'
-    - 'tmp/**/*'
-    - 'docs/**/*'
-    - 'Gemfile'
-    - 'vendor/**/*'
-    - 'gemfiles/**/*'
-    # Generated by running the dummy app's migrations
-    - 'test/dummy/db/schema.rb'
-  DisplayCopNames: true
-  TargetRubyVersion: 3.2

data/.ruby-version

@@ -1 +0,0 @@
-3.4.8

data/Gemfile

@@ -1,12 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in metka.gemspec
-gemspec
-
-local_gemfile = "#{File.dirname(__FILE__)}/Gemfile.local"
-
-if File.exist?(local_gemfile)
-  eval(File.read(local_gemfile)) # rubocop:disable Lint/Eval
-else
-  gem 'activerecord', '>= 7.1'
-end

data/Rakefile

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.warning = false
-  t.verbose = false
-end
-
-namespace :dummy do
-  require_relative 'test/dummy/config/application'
-  Dummy::Application.load_tasks
-end
-
-task default: :test

data/assets/metka-icon.svg

@@ -1,23 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96 96" width="96" height="96">
-  <style>
-    .ink { fill: none; stroke: #24292f; }
-    @media (prefers-color-scheme: dark) {
-      .ink { stroke: #e6edf3; }
-    }
-  </style>
-  <!-- array brackets -->
-  <path class="ink" d="M32 16 H18 V80 H32" stroke-width="8" stroke-linecap="round" stroke-linejoin="round"/>
-  <path class="ink" d="M64 16 H78 V80 H64" stroke-width="8" stroke-linecap="round" stroke-linejoin="round"/>
-  <!-- back tag -->
-  <g transform="translate(48 48) scale(0.88) translate(-48 -48)">
-  <g transform="translate(27 30) rotate(-18)">
-    <path fill="#fb7185" fill-rule="evenodd" d="M12 0 H34 Q40 0 40 6 V20 Q40 26 34 26 H12 L2 15.6 Q0 13 2 10.4 Z
-      M12 13 m-3.2 0 a3.2 3.2 0 1 0 6.4 0 a3.2 3.2 0 1 0 -6.4 0"/>
-  </g>
-  <!-- front tag -->
-  <g transform="translate(23 48) rotate(-18)">
-    <path fill="#e11d48" fill-rule="evenodd" d="M12 0 H34 Q40 0 40 6 V20 Q40 26 34 26 H12 L2 15.6 Q0 13 2 10.4 Z
-      M12 13 m-3.2 0 a3.2 3.2 0 1 0 6.4 0 a3.2 3.2 0 1 0 -6.4 0"/>
-  </g>
-  </g>
-</svg>

data/assets/metka-logo.svg

@@ -1,28 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 336 96" width="336" height="96">
-  <style>
-    .ink { fill: none; stroke: #24292f; }
-    .word { fill: #24292f; }
-    @media (prefers-color-scheme: dark) {
-      .ink { stroke: #e6edf3; }
-      .word { fill: #e6edf3; }
-    }
-  </style>
-  <!-- array brackets -->
-  <path class="ink" d="M32 16 H18 V80 H32" stroke-width="8" stroke-linecap="round" stroke-linejoin="round"/>
-  <path class="ink" d="M64 16 H78 V80 H64" stroke-width="8" stroke-linecap="round" stroke-linejoin="round"/>
-  <!-- back tag -->
-  <g transform="translate(48 48) scale(0.88) translate(-48 -48)">
-  <g transform="translate(27 30) rotate(-18)">
-    <path fill="#fb7185" fill-rule="evenodd" d="M12 0 H34 Q40 0 40 6 V20 Q40 26 34 26 H12 L2 15.6 Q0 13 2 10.4 Z
-      M12 13 m-3.2 0 a3.2 3.2 0 1 0 6.4 0 a3.2 3.2 0 1 0 -6.4 0"/>
-  </g>
-  <!-- front tag -->
-  <g transform="translate(23 48) rotate(-18)">
-    <path fill="#e11d48" fill-rule="evenodd" d="M12 0 H34 Q40 0 40 6 V20 Q40 26 34 26 H12 L2 15.6 Q0 13 2 10.4 Z
-      M12 13 m-3.2 0 a3.2 3.2 0 1 0 6.4 0 a3.2 3.2 0 1 0 -6.4 0"/>
-  </g>
-  </g>
-  <!-- wordmark -->
-  <text class="word" x="104" y="63" font-family="'Inter','SF Pro Display','Segoe UI','Helvetica Neue',Arial,sans-serif"
-        font-size="46" font-weight="700" letter-spacing="-1">Metka</text>
-</svg>

data/benchmark/Gemfile

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'rails', '~> 8.0'
-gem 'pg'
-gem 'sqlite3'
-
-gem 'metka', path: '..'
-
-gem 'acts-as-taggable-on'
-gem 'acts-as-taggable-array-on'
-gem 'gutentag'
-gem 'tag_columns'
-
-gem 'benchmark'
-gem 'benchmark-ips'