stairwell 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c4e331d0e1037b7e3a1e52cc0390bf84797e4898fa4d978e73a99454b81f37f
-  data.tar.gz: b58a61a030aa209e8b04511011a6dc1319d984d7347c5fdd23b581669a6220f2
+  metadata.gz: a9eb7f5f503d74ee340bc8e9011dcf587604c20d6fd959a5b006def17769b71a
+  data.tar.gz: 6bcbbc5866685ef8d767428a33b5862b58952a849e37237f869622ba720806d0
 SHA512:
-  metadata.gz: cc90cda2b768f201a94b04241b3f09bb555433e18ddfc8781ceb33f5a88ec641a1ad602f69f17c4da55b425757bfcb12115f95ec09c512ec999691f80ca688a0
-  data.tar.gz: 80c07a75ad1970ca578374a48757990edd1e1d19f37b97fb1bae8ceba3c236e629a7c4ba8ae5b03d44d4837835a49c2ce875851576d09d22f005c07f5a329e97
+  metadata.gz: fc068d002df5eddc9026ae6ce34c786697712c2b475255fdcf5e0a0e8eaedbe9b3dc138f505ca6328342cc2e7a99648fd78087ae26b6946a481ddaefec35d943
+  data.tar.gz: 8d9b86448fe37776e4aef1c4a7620946af302f016516c06fe931975e6d00b9128ee1ce2d087567850bc384ff0fa147fbbf82a93cb6a2e94de9daf09918e009c4

data/.bin/bundle

@@ -0,0 +1,109 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../Gemfile", __dir__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_requirement
+    @bundler_requirement ||=
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
+  end
+
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
+
+    bundler_gem_version = Gem::Version.new(version)
+
+    bundler_gem_version.approximate_recommendation
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

data/.bin/coderay

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'coderay' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("coderay", "coderay")

data/.bin/pry

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("pry", "pry")

data/.bin/rake

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/Gemfile

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

data/Gemfile.lock

@@ -1,48 +1,54 @@
 PATH
   remote: .
   specs:
-    stairwell (0.1.2)
+    stairwell (0.5.0)
       activerecord (>= 4.2.11)
+      rake
       sqlite3
+      zeitwerk (~> 2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    activemodel (7.1.1)
+      activesupport (= 7.1.1)
+    activerecord (7.1.1)
+      activemodel (= 7.1.1)
+      activesupport (= 7.1.1)
+      timeout (>= 0.4.0)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    i18n (1.8.5)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    drb (2.1.1)
+      ruby2_keywords
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.14.2)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rake (12.3.3)
-    sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
+    minitest (5.20.0)
+    mutex_m (0.1.2)
+    rake (13.1.0)
+    ruby2_keywords (0.0.5)
+    sqlite3 (1.6.7-x86_64-darwin)
+    timeout (0.4.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.12)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
-  minitest (~> 5.0)
-  pry
-  rake (~> 12.0)
   stairwell!
 
 BUNDLED WITH
-   2.1.4
+   2.4.10

data/README.md

@@ -18,6 +18,12 @@ Or install it yourself as:
 
     $ gem install stairwell
 
+## Why?
+Although ActiveRecord serves as an excellent tool for the majority of database queries, certain scenarios call for more customized queries.
+This project was initially conceived to help transition a development team and their project from PHP to Ruby. This PHP project had thousands of complex SQL queries, thus the necessity of making SQL a first-class citizen in the ruby project enabled a smoother transition.
+So, why not Arel? Arel is a powerful tool, but it's worth noting that it is considered a private API and is likely to remain so for the forseeable future.
+Does this approach make queries less composable? Yes, if you are used to chaining your arel queries and AR scopes then you're probably not going to use this. However, it provides an interface that enables you to leverage SQL securely in your Ruby projects without the need to reinvent the wheel.
+
 ## Usage
 
 Define a class in your app that inherits from `Stairwell::Query`. We're going to assume you are in a rails app, but this will work in any ruby app, although ActiveRecord is a dependency of this gem.
@@ -57,7 +63,7 @@ binds = {
   name: "First",
   age: 99,
   active: true,
-  gpa: 4.2
+  gpa: 4.2,
   date_joined: "2008-08-28",
   created_at: "2008-08-28 23:41:18",
   favorite_numbers: [4, 7, 100]

data/Rakefile

@@ -1,10 +1,12 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,14 +1,13 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "stairwell"
+require 'bundler/setup'
+require 'stairwell'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
-Pry.start
 
-# require "irb"
-# IRB.start(__FILE__)
+require 'irb'
+IRB.start(__FILE__)

data/lib/stairwell/bind_transformer.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Stairwell
   class BindTransformer
-
-    attr_accessor :sql, :bind_hash, :depleting_bind_hash, :converted_sql
+    attr_reader :sql, :bind_hash, :depleting_bind_hash, :converted_sql
 
     def initialize(sql, bind_hash)
       @sql = sql
@@ -16,32 +17,33 @@ module Stairwell
     # and error will raise
     # The sql string will then have the appropropriate values substituted
     # with quoted values to ensure safety.
-    # Note: $2 is The match for the first, second, etc. parenthesized groups in the last regex
-    def transform
+    def run
       convert_sql
       validate_bind_hash
       converted_sql
     end
 
+    private
+
     def convert_sql
-      @converted_sql ||= sql.gsub(/(:?):([a-zA-Z]\w*)/) do |_|
-        replace = $2.to_sym
+      @converted_sql = sql.gsub(/(:?):([a-zA-Z]\w*)/) do |_|
+        replace = ::Regexp.last_match(2).to_sym
         validate_sql(replace)
         bind_hash[replace].quote
       end
     end
 
-    private
-
-      def validate_sql(attr)
-        raise SqlBindMismatch, ":#{attr} in your query is missing from your args" unless bind_hash[attr]
+    def validate_sql(attr)
+      raise SqlBindMismatch, ":#{attr} in your query is missing from your args" unless bind_hash[attr]
 
-        depleting_bind_hash.delete(attr)
-      end
+      depleting_bind_hash.delete(attr)
+    end
 
-      def validate_bind_hash
-        raise SqlBindMismatch, ":#{depleting_bind_hash.keys.join(', ')} in your bind hash is missing from your query: #{sql}" unless depleting_bind_hash.empty?
-      end
+    def validate_bind_hash
+      return if depleting_bind_hash.empty?
 
+      raise SqlBindMismatch,
+            ":#{depleting_bind_hash.keys.join(', ')} in your bind hash is missing from your query: #{sql}"
+    end
   end
 end

data/lib/stairwell/query.rb

@@ -1,62 +1,33 @@
-require "stairwell/bind_transformer"
-require "stairwell/types/boolean_type"
-require "stairwell/types/column_name_type"
-require "stairwell/types/date_time_type"
-require "stairwell/types/date_type"
-require "stairwell/types/float_type"
-require "stairwell/types/integer_type"
-require "stairwell/types/in_type"
-require "stairwell/types/string_type"
-require "stairwell/types/null_type"
-require "stairwell/types/table_name_type"
+# frozen_string_literal: true
 
 module Stairwell
   class Query
-
     class << self
-      attr_accessor :bind_hash, :all_validations, :sql_string
-
       def validate_type(*args)
         @all_validations ||= {}
         @all_validations.merge!(Hash[*args])
       end
 
       def sql(**args)
-        @bind_hash = args
-        validate!
-        transformed_sql_string
+        raise InvalidBindCount, 'Incorrect amount of args passed' if args.keys.sort != all_validations.keys.sort
+
+        @type_hash = args.each_with_object({}) do |(name, value), hash|
+          hash[name] = TypeObjectAssigner.run(name:, value:, all_validations:)
+        end
+        transformer.run
       end
 
       def query(string)
-        @sql_string = string
+        @sql_string = string.squish
       end
 
       private
 
-        def validate!
-          raise InvalidBindCount.new("Incorrect amount of args passed") unless correct_args?
-
-          bind_hash.each do |bind_name, bind_value|
-            type = all_validations[bind_name]
-            if type.is_a?(Array)
-              type = type.first
-              type_object = Types::InType.new(bind_value, type)
-            end
-            type_object ||= Object.const_get(TYPE_CLASSES[type]).new(bind_value)
-
-            raise InvalidBindType.new("#{bind_name} is not #{all_validations[bind_name]}") unless type_object.valid?
+      attr_reader :type_hash, :all_validations, :sql_string
 
-            bind_hash[bind_name] = type_object
-          end
-        end
-
-        def transformed_sql_string
-          BindTransformer.new(sql_string.squish!, bind_hash).transform
-        end
-
-        def correct_args?
-          bind_hash.keys.sort == all_validations.keys.sort
-        end
+      def transformer
+        BindTransformer.new(sql_string, type_hash)
+      end
     end
   end
 end

data/lib/stairwell/type_object_assigner.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Stairwell
+  class TypeObjectAssigner
+    attr_reader :name, :value, :all_validations
+
+    def self.run(...)
+      new(...).run
+    end
+
+    def initialize(name:, value:, all_validations:)
+      @name = name
+      @value = value
+      @all_validations = all_validations
+    end
+
+    def run
+      type_object
+    end
+
+    private
+
+    def proposed_type
+      all_validations[name]
+    end
+
+    def type_object
+      if proposed_type.is_a?(Array)
+        Types::InType.new(value, proposed_type.first)
+      else
+        Object.const_get(TYPE_CLASSES[proposed_type]).new(value)
+      end
+    end
+  end
+end

data/lib/stairwell/types/base_type.rb

@@ -1,17 +1,32 @@
-module Stairwell::Types
-  class BaseType
-    attr_reader :value
+# frozen_string_literal: true
 
-    def initialize(value)
-      @value = value
-    end
+module Stairwell
+  module Types
+    class BaseType
+      attr_reader :value
 
-    def quote
-      connection.quote(value)
-    end
+      def initialize(value)
+        @value = value
+        validate!
+      end
+
+      def quote
+        connection.quote(value)
+      end
+
+      def connection
+        @connection ||= ActiveRecord::Base.connection
+      end
+
+      def validate!
+        return if valid?
+
+        raise InvalidBindType, "#{value} is not #{type_name}"
+      end
 
-    def connection
-      @connection ||= ActiveRecord::Base.connection
+      def type_name
+        self.class.name.split('::').last.gsub('Type', '').downcase
+      end
     end
   end
 end

data/lib/stairwell/types/boolean_type.rb

@@ -1,9 +1,11 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class BooleanType < BaseType
-    def valid?
-      value.is_a?(TrueClass) || value.is_a?(FalseClass)
+module Stairwell
+  module Types
+    class BooleanType < BaseType
+      def valid?
+        value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      end
     end
   end
 end

data/lib/stairwell/types/column_name_type.rb

@@ -1,13 +1,15 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class ColumnNameType < BaseType
-    def valid?
-      value.is_a?(String)
-    end
+module Stairwell
+  module Types
+    class ColumnNameType < BaseType
+      def valid?
+        value.is_a?(String)
+      end
 
-    def quote
-      connection.quote_column_name(value)
+      def quote
+        connection.quote_column_name(value)
+      end
     end
   end
 end

data/lib/stairwell/types/date_time_type.rb

@@ -1,9 +1,11 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class DateTimeType < BaseType
-    def valid?
-      value.is_a?(String)
+module Stairwell
+  module Types
+    class DateTimeType < BaseType
+      def valid?
+        value.is_a?(String)
+      end
     end
   end
 end

data/lib/stairwell/types/date_type.rb

@@ -1,9 +1,11 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class DateType < BaseType
-    def valid?
-      value.is_a?(String)
+module Stairwell
+  module Types
+    class DateType < BaseType
+      def valid?
+        value.is_a?(String)
+      end
     end
   end
 end

data/lib/stairwell/types/float_type.rb

@@ -1,9 +1,11 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class FloatType < BaseType
-    def valid?
-      value.is_a?(Float)
+module Stairwell
+  module Types
+    class FloatType < BaseType
+      def valid?
+        value.is_a?(Float)
+      end
     end
   end
 end

data/lib/stairwell/types/in_type.rb

@@ -1,28 +1,30 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class InType
-    attr_reader :value, :type
+module Stairwell
+  module Types
+    class InType
+      attr_reader :value, :type
 
-    def initialize(value, type)
-      @value = value
-      @type = type
-    end
+      def initialize(value, type)
+        @value = value
+        @type = type
+      end
 
-    def quote
-      contained_values.map(&:quote).join(", ")
-    end
+      def quote
+        contained_values.map(&:quote).join(', ')
+      end
 
-    def valid?
-      value.is_a?(Array) && contained_values.all?(&:valid?)
-    end
+      def valid?
+        value.is_a?(Array) && contained_values.all?(&:valid?)
+      end
 
-    private
+      private
 
       def contained_values
         value.map do |contained|
           Object.const_get(Stairwell::TYPE_CLASSES[type]).new(contained)
         end
       end
+    end
   end
 end

data/lib/stairwell/types/integer_type.rb

@@ -1,9 +1,11 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class IntegerType < BaseType
-    def valid?
-      value.is_a?(Integer)
+module Stairwell
+  module Types
+    class IntegerType < BaseType
+      def valid?
+        value.is_a?(Integer)
+      end
     end
   end
 end

data/lib/stairwell/types/null_type.rb

@@ -1,9 +1,11 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class NullType < BaseType
-    def valid?
-      value.is_a?(NilClass)
+module Stairwell
+  module Types
+    class NullType < BaseType
+      def valid?
+        value.is_a?(NilClass)
+      end
     end
   end
 end

data/lib/stairwell/types/string_type.rb

@@ -1,9 +1,11 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class StringType < BaseType
-    def valid?
-      value.is_a?(String)
+module Stairwell
+  module Types
+    class StringType < BaseType
+      def valid?
+        value.is_a?(String)
+      end
     end
   end
 end

data/lib/stairwell/types/table_name_type.rb

@@ -1,13 +1,15 @@
-require "stairwell/types/base_type"
+# frozen_string_literal: true
 
-module Stairwell::Types
-  class TableNameType < BaseType
-    def valid?
-      value.is_a?(String)
-    end
+module Stairwell
+  module Types
+    class TableNameType < BaseType
+      def valid?
+        value.is_a?(String)
+      end
 
-    def quote
-      connection.quote_table_name(value)
+      def quote
+        connection.quote_table_name(value)
+      end
     end
   end
 end

data/lib/stairwell/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Stairwell
-  VERSION = "0.2.0"
+  VERSION = '0.5.0'
 end

data/lib/stairwell.rb

@@ -1,7 +1,6 @@
-require "active_record"
-require "date"
-require "stairwell/query"
-require "stairwell/version"
+# frozen_string_literal: true
+
+require 'active_record'
 
 module Stairwell
   class Error < StandardError; end
@@ -10,22 +9,30 @@ module Stairwell
   class SqlBindMismatch < StandardError; end
 
   TYPE_CLASSES = {
-    string: "Stairwell::Types::StringType",
-    integer: "Stairwell::Types::IntegerType",
-    boolean: "Stairwell::Types::BooleanType",
-    float: "Stairwell::Types::FloatType",
-    date: "Stairwell::Types::DateType",
-    date_time: "Stairwell::Types::DateTimeType",
-    null: "Stairwell::Types::NullType",
-    column_name: "Stairwell::Types::ColumnNameType",
-    table_name: "Stairwell::Types::TableNameType"
+    string: 'Stairwell::Types::StringType',
+    integer: 'Stairwell::Types::IntegerType',
+    boolean: 'Stairwell::Types::BooleanType',
+    float: 'Stairwell::Types::FloatType',
+    date: 'Stairwell::Types::DateType',
+    date_time: 'Stairwell::Types::DateTimeType',
+    null: 'Stairwell::Types::NullType',
+    column_name: 'Stairwell::Types::ColumnNameType',
+    table_name: 'Stairwell::Types::TableNameType'
   }.freeze
 
   # for development and testing
   unless defined?(Rails)
-    ActiveRecord::Base.establish_connection(
+    ::ActiveRecord::Base.establish_connection(
       adapter: 'sqlite3',
       database: 'test.db'
     )
   end
 end
+
+require 'date'
+require 'zeitwerk'
+
+loader = Zeitwerk::Loader.for_gem
+loader.ignore("#{__dir__}/kamal/sshkit_with_ext.rb")
+loader.setup
+loader.eager_load # We need all commands loaded.

data/stairwell.gemspec

@@ -1,35 +1,37 @@
+# frozen_string_literal: true
+
 require_relative 'lib/stairwell/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "stairwell"
+  spec.name          = 'stairwell'
   spec.version       = Stairwell::VERSION
-  spec.authors       = ["tobyond"]
+  spec.authors       = ['tobyond']
 
-  spec.summary       = %q{stairwell for sql}
-  spec.description   = %q{Sanitize and quote raw SQL for rails and any project in ruby}
-  spec.homepage      = "https://github.com/tobyond/stairwell"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.summary       = 'stairwell for sql'
+  spec.description   = 'I actually like SQL, and want to use it in my Ruby projects.'
+  spec.homepage      = 'https://github.com/tobyond/stairwell'
+  spec.license       = 'MIT'
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.2.0')
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/tobyond/stairwell"
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/tobyond/stairwell'
   # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
 
   # 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
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord', '>= 4.2.11'
+  spec.add_dependency 'rake'
+  spec.add_dependency 'zeitwerk', '~> 2.5'
 
   # for development and testing
-  unless defined?(Rails)
-    spec.add_dependency 'sqlite3'
-  end
+  spec.add_dependency 'sqlite3' unless defined?(Rails)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stairwell
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - tobyond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.11
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -38,12 +66,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Sanitize and quote raw SQL for rails and any project in ruby
+description: I actually like SQL, and want to use it in my Ruby projects.
 email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bin/bundle"
+- ".bin/coderay"
+- ".bin/pry"
+- ".bin/rake"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -56,6 +88,7 @@ files:
 - lib/stairwell.rb
 - lib/stairwell/bind_transformer.rb
 - lib/stairwell/query.rb
+- lib/stairwell/type_object_assigner.rb
 - lib/stairwell/types/base_type.rb
 - lib/stairwell/types/boolean_type.rb
 - lib/stairwell/types/column_name_type.rb
@@ -84,14 +117,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: stairwell for sql