attribeauty 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e210c51252c3ef22e45a6c8c2d544725a9ebfd521f34ecfcc66856eae73c1c15
-  data.tar.gz: 9787f43ec2bb540e09e2704c1fad4a0cb5601f6af493bbfd824d4b99090f47b3
+  metadata.gz: 7c705d3129b34e6dbc91c53163face634eafbc288a2b36b2768faf97a77a7f8a
+  data.tar.gz: 1553078b6ae388c7d75c367e9f70b2e1153b59b4999ce7fbe7da7bf078d64725
 SHA512:
-  metadata.gz: 0c7ebda74a3daa2cd25f5ab394a6fe464ddded6f7e2111304f63087d70a0de93e62c0630d6ae6d2a36501701109f55f475d6d5eb567646245f09c840c38529c9
-  data.tar.gz: 38ccdac185319b5999c23cfde69d971d5c294b5f0d7fccbc52394f31b1a6d8b9f432342728bd01567f339f74b0e7db2070031a25e352a12cd7490975c9d296e3
+  metadata.gz: efb29ddb06c0c1391d661efcc43b4b1e122233a7c0a481f0fe5bb96a00fe190e0bd05e87640f8f16872ca32c9bd6aaf7120665a6f931b8d41d60109dc8ac49af
+  data.tar.gz: 9c10fb519ec0eaaffd5a31d02c5aea808917fd2ce0b3421ba4e4edf1c4b8dba796ac2fddda907e62e79ba9edf8c8c2355dc37a564346b7377979994ef57ea603

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/racc

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'racc' 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("racc", "racc")

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/.bin/rubocop

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' 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("rubocop", "rubocop")

data/.bin/ruby-parse

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'ruby-parse' 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("parser", "ruby-parse")

data/.bin/ruby-rewrite

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'ruby-rewrite' 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("parser", "ruby-rewrite")

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.2
 
 Style/StringLiterals:
   Enabled: true
@@ -11,3 +11,21 @@ Style/StringLiteralsInInterpolation:
 
 Layout/LineLength:
   Max: 120
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/MethodLength:
+  Max: 30
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.3.0] - 2024-06-21
+
+- Experimental params coercion
+- No documentation yet, but tests passing
+
 ## [0.1.0] - 2023-08-09
 
 - Initial release

data/Gemfile

@@ -5,8 +5,10 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in attribeauty.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "minitest"
+gem "rake"
+gem "rubocop"
 
-gem "minitest", "~> 5.0"
-
-gem "rubocop", "~> 1.21"
+group :development, :test do
+  gem "zeitwerk"
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attribeauty (0.1.0)
+    attribeauty (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -34,15 +34,18 @@ GEM
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     unicode-display_width (2.4.2)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-darwin-22
 
 DEPENDENCIES
   attribeauty!
-  minitest (~> 5.0)
-  rake (~> 13.0)
-  rubocop (~> 1.21)
+  minitest
+  rake
+  rubocop
+  zeitwerk
 
 BUNDLED WITH
-   2.4.10
+   2.5.3

data/README.md

@@ -62,7 +62,57 @@ instance.wild_animal # => "the_wildest_animals_are_koalas"
 
 ```
 
-Note, failing to call `inspect` on the value when casting is likely to raise an error.
+To use rails types add to your config:
+```
+# config/initializers/attribeauty.rb
+
+Rails.application.reloader.to_prepare do
+  Attribeauty.configure do |config|
+    config.types[:string] = ActiveModel::Type::String
+    config.types[:boolean] = ActiveModel::Type::Boolean
+    config.types[:date] = ActiveModel::Type::Date
+    config.types[:time] = ActiveModel::Type::Time
+    config.types[:datetime] = ActiveModel::Type::DateTime
+    config.types[:float] = ActiveModel::Type::Float
+    config.types[:integer] = ActiveModel::Type::Integer
+  end
+end
+
+```
+
+## Params
+
+Experimental params sanitizer is now available. This will cast your params, and remove elements you want to exclude if `nil` or `empty`
+
+```
+# app/controllers/my_controller.rb
+class MyController
+  def update
+    MyRecord.update(update_params)
+   
+    redirect_to index_path
+  end
+
+  private
+
+  def params_filter
+    Attribeauty::Params.with(request.params)
+  end
+
+  def update_params
+    params_filter.accept do
+      attribute :title, :string, allow_nil: false, required: true
+      attribute :email do
+        attribute :address, :string, allow_empty: false
+        attribute :valid, :boolean, allow_nil: false
+        attribute :ip_address, :string, allow_blank: true
+      end
+    end
+  end
+```
+
+See `test/test_params.rb` for what is expected.
+
 
 ## Development
 

data/lib/attribeauty/base.rb

@@ -11,7 +11,7 @@ module Attribeauty
       @attributes[name] = type
 
       class_eval(<<-CODE, __FILE__, __LINE__ + 1)
-        def #{name}=(value); @#{name} = Cast.cast(value, #{type.inspect}); end
+        def #{name}=(value); @#{name} = TypeCaster.run(value, #{type.inspect}); end
 
         def #{name};@#{name};end
       CODE

data/lib/attribeauty/configuration.rb

@@ -8,7 +8,7 @@ module Attribeauty
     attr_accessor :types
 
     def initialize
-      @types = Cast::BASE_TYPES.dup
+      @types = TypeCaster::BASE_TYPES.dup
     end
   end
 end

data/lib/attribeauty/params.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module Attribeauty
+  class Params
+    extend Forwardable
+
+    def_delegators :to_h, :each_pair, :each, :empty?, :keys
+
+    def self.with(request_params)
+      new(request_params)
+    end
+
+    attr_reader :allow_nil, :prefix, :request_params, :acceptables, :to_h, :errors
+
+    def initialize(request_params)
+      @request_params = request_params.transform_keys(&:to_sym)
+      @to_h = {}
+      @errors = []
+    end
+
+    def accept(&)
+      instance_eval(&)
+
+      self
+    end
+
+    def to_hash = to_h
+
+    def [](key)
+      to_h[key]
+    end
+
+    # rubocop:disable Naming::BlockForwarding
+    def attribute(name, type = nil, **args, &block)
+      value = request_params[name]
+      return if value.nil? && args[:required].nil?
+
+      if block_given?
+        @to_h[name] =
+          if value.is_a?(Array)
+            value.map do |val|
+              params = self.class.with(val).accept(&block)
+              @errors.push(*params.errors)
+              params
+            end.reject(&:empty?)
+          else
+            params = self.class.with(value).accept(&block)
+            @errors.push(*params.errors)
+            params
+          end
+      else
+        validator = Validator.run(name, type, value, **args)
+        @to_h[name.to_sym] = validator.value if validator.valid?
+        @errors.push(*validator.errors)
+      end
+    end
+    # rubocop:enable Naming::BlockForwarding
+
+    def inspect
+      to_h.inspect
+    end
+
+    def valid?
+      errors.empty?
+    end
+  end
+end

data/lib/attribeauty/{cast.rb → type_caster.rb}

@@ -1,14 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "types/string"
-require_relative "types/integer"
-require_relative "types/float"
-require_relative "types/boolean"
-require_relative "types/time"
-
 module Attribeauty
   # base cast for types
-  class Cast
+  class TypeCaster
     BASE_TYPES = {
       float: Types::Float,
       integer: Types::Integer,
@@ -17,7 +11,7 @@ module Attribeauty
       string: Types::String
     }.freeze
 
-    def self.cast(value, type)
+    def self.run(value, type)
       return nil if value.nil?
 
       all_types = Attribeauty.configuration.types

data/lib/attribeauty/types/boolean.rb

@@ -9,7 +9,7 @@ module Attribeauty
         "0", :"0",
         "f", :f,
         "F", :F,
-        "false", :false,
+        "false", false,
         "FALSE", :FALSE,
         "off", :off,
         "OFF", :OFF

data/lib/attribeauty/validator.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module Attribeauty
+  class Validator
+    ALLOWS_HASH = {
+      allow_nil: :nil?,
+      allow_empty: :empty?
+    }.freeze
+
+    def self.run(name, type, original_value, **args)
+      new(name, type, original_value, **args).run
+    end
+
+    attr_reader :original_value, :errors, :name, :type, :required, :default, :predicate, :value
+
+    def initialize(name, type, original_value, **args)
+      @name = name
+      @type = type
+      @original_value = original_value
+      @errors = []
+      @default = args[:default]
+      @required = args[:required] if [true, false].include?(args[:required])
+      allows = args.slice(*allows_array)
+      return if allows.empty?
+
+      predicate_array = allows.first
+      predicate_array[0] = :"#{ALLOWS_HASH[predicate_array[0]]}"
+      @predicate = predicate_array
+    end
+
+    def run
+      @original_value = default if original_value.nil? && !default.nil?
+      @value = TypeCaster.run(original_value, type)
+
+      self
+    end
+
+    def valid?
+      if required? && original_value.nil?
+        errors << "#{name} required"
+        return false
+      end
+      return true if predicate.nil?
+
+      method, bool = predicate
+      return true if bool
+
+      !value.public_send(method)
+    end
+
+    private
+
+    def set_args; end
+
+    def allows_array
+      ALLOWS_HASH.keys
+    end
+
+    def required?
+      required
+    end
+  end
+end

data/lib/attribeauty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Attribeauty
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/lib/attribeauty.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "attribeauty/version"
-require_relative "attribeauty/base"
-require_relative "attribeauty/cast"
-require_relative "attribeauty/configuration"
 require "date"
 require "time"
 
@@ -21,3 +17,10 @@ module Attribeauty
     end
   end
 end
+
+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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attribeauty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Toby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies: []
 description: There are so many of these, I just needed this one.
 email:
@@ -17,6 +17,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bin/bundle"
+- ".bin/racc"
+- ".bin/rake"
+- ".bin/rubocop"
+- ".bin/ruby-parse"
+- ".bin/ruby-rewrite"
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
@@ -26,15 +32,16 @@ files:
 - Rakefile
 - lib/attribeauty.rb
 - lib/attribeauty/base.rb
-- lib/attribeauty/cast.rb
 - lib/attribeauty/configuration.rb
+- lib/attribeauty/params.rb
+- lib/attribeauty/type_caster.rb
 - lib/attribeauty/types/boolean.rb
 - lib/attribeauty/types/float.rb
 - lib/attribeauty/types/integer.rb
 - lib/attribeauty/types/string.rb
 - lib/attribeauty/types/time.rb
+- lib/attribeauty/validator.rb
 - lib/attribeauty/version.rb
-- sig/attribeauty.rbs
 homepage: https://github.com/tobyond/attribeauty
 licenses:
 - MIT
@@ -49,14 +56,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Attributes simply done

data/sig/attribeauty.rbs

@@ -1,4 +0,0 @@
-module Attribeauty
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end