simple_enumeration 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f607cb4dec057ddd252e3cbe5a59c1d8cb785dc45ce18edeaf00bf5d6506dd9
-  data.tar.gz: 872b7be3fc3ca5d2a2aaede66330c619e342338e59f37bb930c8cfd5d28d8df5
+  metadata.gz: ec872ff72f5493bf9a559f6389c2fe334afacd8e0ede01a70f3d3d5bb021d7de
+  data.tar.gz: aac86cd8fa4d5421d4a0a95ef15ae8e69ea8e65107b0f3f3a2f5764e483077c3
 SHA512:
-  metadata.gz: 88b6b07d6ebb1f9124d117033df3ad0e47c9da9c019281e3baa213f95f41de8fc866b5bebe105a52c6ba24e7b19730fd93281b6501426310c78ef7c939f243cf
-  data.tar.gz: 585579183a525ab76a0f0d64bda899b0812c92edcfcf6d6acc4eca17b700fac99193c00407c1610b662021e286e364c4b0553e0bc1e0fc0eb8ffa5a76afdb9c2
+  metadata.gz: 5768db3946b101fb91677ba1b66ed8ee7be592e0009e72d2606a172f2e0e5ecdddd12488cac4507b25282b8d48be89cfbcea7b7d5ca41afa4ee9edfd3df8b502
+  data.tar.gz: da4892021ce865eac7f5ea81277df579774ac656cd1f68f1b44b2507828c402995a5bb49cd5c8ed9aca62aa5cf9390263bf4e2cd372fb79fa6f4539a318933b3

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/lint.yml

@@ -5,12 +5,17 @@ on: [push,pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.7"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.2
+          ruby-version: ${{matrix.ruby}}
           bundler-cache: true
       - name: Run rubocop
         run: bundle exec rake rubocop

data/.github/workflows/specs.yml

@@ -5,12 +5,19 @@ on: [push,pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.1"
+          - "3.0"
+          - "2.7"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.2
+          ruby-version: ${{matrix.ruby}}
           bundler-cache: true
       - name: Run specs
         run: bundle exec rake spec

data/.rubocop.yml

@@ -4,6 +4,7 @@ require:
 
 AllCops:
   NewCops: enable
+  TargetRubyVersion: 2.7
 
 Layout/LineLength:
   Max: 150

data/CHANGELOG.md

@@ -4,12 +4,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.0] - 2022-01-08
+
+### Removed
+- Removed dry and active-support dependencies
+
+### Added
+- Added Ruby 3.1.0 to specs matrix
+
 ## [0.2.1] - 2021-10-28
 
 ### Added
-- Fill gem summary and description
-- Fill "Usage" section in readme
-- Add new model definiton using `define_simple_enumeration` method
+- Filled gem summary and description
+- Filled "Usage" section in readme
+- Added new model definiton using `define_simple_enumeration` method
 
 ## [0.2.0] - 2021-10-27
 

data/Gemfile.lock

@@ -2,40 +2,27 @@ PATH
   remote: .
   specs:
     simple_enumeration (0.2.1)
-      activesupport
-      callee
-      dry-initializer
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
-    callee (0.3.5)
-      dry-initializer (>= 2.5, < 4.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    dry-initializer (3.0.4)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.4)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -50,32 +37,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.22.2)
+    rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.11.5)
+    rubocop-performance (1.13.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.5.0)
+    rubocop-rspec (2.7.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    zeitwerk (2.5.1)
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES

data/README.md

@@ -224,7 +224,7 @@ The I18n strings are located on `simple_enumeration.<enumeration_name>.<value>.t
 ```yaml
 pl:
   simple_enumeration:
-    payments_status:
+    payment_status:
       unpaid:
         text: "Nieopłacone"
         color: yellow

data/lib/simple_enumeration/collection.rb

@@ -2,12 +2,14 @@
 
 module SimpleEnumeration
   class Collection
-    extend Dry::Initializer
-
     MissingTypeError = Class.new(StandardError)
 
-    option :name
-    option :types, default: proc { {} }
+    attr_reader :name, :types
+
+    def initialize(name:, types: {})
+      @name = name
+      @types = types
+    end
 
     METHOD_NAME_SUFFIX = '_collection'
     VALUE_METHOD_NAME_SUFFIX = '_collection_values'
@@ -16,23 +18,23 @@ module SimpleEnumeration
     HUMANIZED_METHOD_NAME_SUFFIX = '_collection_humanized'
 
     def self.collection_name_from_method_name(method_name)
-      method_name.to_s.remove(METHOD_NAME_SUFFIX)
+      method_name.to_s.gsub(METHOD_NAME_SUFFIX, '')
     end
 
     def self.collection_name_from_value_method_name(method_name)
-      method_name.to_s.remove(VALUE_METHOD_NAME_SUFFIX)
+      method_name.to_s.gsub(VALUE_METHOD_NAME_SUFFIX, '')
     end
 
     def self.collection_name_from_value_predicate_method_name(method_name)
-      method_name.to_s.remove(VALUE_PREDICATE_METHOD_NAME_SUFFIX)
+      method_name.to_s.gsub(VALUE_PREDICATE_METHOD_NAME_SUFFIX, '')
     end
 
     def self.collection_name_from_for_select_method_name(method_name)
-      method_name.to_s.remove(FOR_SELECT_METHOD_NAME_SUFFIX)
+      method_name.to_s.gsub(FOR_SELECT_METHOD_NAME_SUFFIX, '')
     end
 
     def self.collection_name_from_humanized_method_name(method_name)
-      method_name.to_s.remove(HUMANIZED_METHOD_NAME_SUFFIX)
+      method_name.to_s.gsub(HUMANIZED_METHOD_NAME_SUFFIX, '')
     end
 
     def method_name

data/lib/simple_enumeration/collection_methods_definer.rb

@@ -2,10 +2,16 @@
 
 module SimpleEnumeration
   class CollectionMethodsDefiner
-    include Callee
+    attr_reader :enum_class, :collection
 
-    option :enum_class
-    option :collection
+    def initialize(enum_class:, collection:)
+      @enum_class = enum_class
+      @collection = collection
+    end
+
+    def self.call(*params, **options, &block)
+      new(*params, **options).call(&block)
+    end
 
     def call
       set_collection

data/lib/simple_enumeration/collections/basic_factory.rb

@@ -3,14 +3,19 @@
 module SimpleEnumeration
   module Collections
     class BasicFactory
-      include Callee
+      attr_reader :enum_class, :definitions
 
-      option :enum_class
-      option :collection_name, default: proc { :basic }
-      option :definitions
+      def initialize(enum_class:, definitions:)
+        @enum_class = enum_class
+        @definitions = definitions
+      end
+
+      def self.call(*params, **options, &block)
+        new(*params, **options).call(&block)
+      end
 
       def call
-        collection = Collection.new(name: collection_name)
+        collection = Collection.new(name: :basic)
 
         CollectionMethodsDefiner.call(enum_class: enum_class, collection: collection)
 

data/lib/simple_enumeration/collections/custom_factory.rb

@@ -3,11 +3,17 @@
 module SimpleEnumeration
   module Collections
     class CustomFactory
-      include Callee
+      attr_reader :enum_class, :collection_name, :types
 
-      option :enum_class
-      option :collection_name
-      option :types
+      def initialize(enum_class:, collection_name:, types:)
+        @enum_class = enum_class
+        @collection_name = collection_name
+        @types = types
+      end
+
+      def self.call(*params, **options, &block)
+        new(*params, **options).call(&block)
+      end
 
       def call
         collection = Collection.new(name: collection_name)

data/lib/simple_enumeration/define_simple_enumeration.rb

@@ -3,11 +3,19 @@
 module SimpleEnumeration
   module DefineSimpleEnumeration
     def define_simple_enumeration(attribute, options = {})
-      enum_class = options[:with] || const_get([attribute.to_s.camelcase, 'Enumeration'].join)
+      enum_class_name = options[:with] || enum_class_name_for(attribute)
+      enum_class = const_get(enum_class_name)
 
       define_method "#{attribute}_enumeration" do
         enum_class.new(converted_value: send(attribute))
       end
     end
+
+    def enum_class_name_for(attribute)
+      [
+        SimpleEnumeration.camelcase(attribute.to_s),
+        'Enumeration'
+      ].join
+    end
   end
 end

data/lib/simple_enumeration/entity.rb

@@ -2,9 +2,18 @@
 
 module SimpleEnumeration
   class Entity
-    extend Dry::Initializer
+    attr_reader :converted_value
 
-    option :converted_value
+    def initialize(converted_value:)
+      @converted_value = converted_value
+    end
+
+    def self.i18n_scope
+      [
+        'simple_enumeration',
+        SimpleEnumeration.underscore(name.gsub('Enumeration', ''))
+      ].join('.')
+    end
 
     def self.define_basic_collection(*definitions)
       Collections::BasicFactory.call(

data/lib/simple_enumeration/type.rb

@@ -2,12 +2,14 @@
 
 module SimpleEnumeration
   class Type
-    extend Dry::Initializer
+    attr_reader :definition, :value, :converted_value, :enum_class
 
-    option :definition
-    option :value
-    option :converted_value
-    option :enum_class
+    def initialize(definition:, value:, converted_value:, enum_class:)
+      @definition = definition
+      @value = value
+      @converted_value = converted_value
+      @enum_class = enum_class
+    end
 
     VALUE_METHOD_NAME_SUFFIX = '_value'
     VALUE_PREDICATE_METHOD_NAME_SUFFIX = '_value?'
@@ -17,11 +19,11 @@ module SimpleEnumeration
     end
 
     def self.type_value_for_value_method_name(method_name)
-      method_name.to_s.remove(VALUE_METHOD_NAME_SUFFIX)
+      method_name.to_s.gsub(VALUE_METHOD_NAME_SUFFIX, '')
     end
 
     def self.type_value_for_value_predicate_method_name(method_name)
-      method_name.to_s.remove(VALUE_PREDICATE_METHOD_NAME_SUFFIX)
+      method_name.to_s.gsub(VALUE_PREDICATE_METHOD_NAME_SUFFIX, '')
     end
 
     def method_name
@@ -52,10 +54,7 @@ module SimpleEnumeration
       I18n.t(
         value,
         raise: true,
-        scope: [
-          'simple_enumeration',
-          enum_class.name.remove('Enumeration').underscore
-        ].join('.')
+        scope: enum_class.i18n_scope
       )
     end
   end

data/lib/simple_enumeration/type_builder.rb

@@ -2,10 +2,16 @@
 
 module SimpleEnumeration
   class TypeBuilder
-    include Callee
+    attr_reader :enum_class, :definition
 
-    option :enum_class
-    option :definition
+    def initialize(enum_class:, definition:)
+      @enum_class = enum_class
+      @definition = definition
+    end
+
+    def self.call(*params, **options, &block)
+      new(*params, **options).call(&block)
+    end
 
     def call
       factory_klass.call(

data/lib/simple_enumeration/type_methods_definer.rb

@@ -2,11 +2,17 @@
 
 module SimpleEnumeration
   class TypeMethodsDefiner
-    include Callee
+    attr_reader :enum_class, :collection, :type
 
-    option :enum_class
-    option :collection
-    option :type
+    def initialize(enum_class:, collection:, type:)
+      @enum_class = enum_class
+      @collection = collection
+      @type = type
+    end
+
+    def self.call(*params, **options, &block)
+      new(*params, **options).call(&block)
+    end
 
     def call
       define_singleton_type_method

data/lib/simple_enumeration/types/base_factory.rb

@@ -3,10 +3,16 @@
 module SimpleEnumeration
   module Types
     class BaseFactory
-      include Callee
+      attr_reader :enum_class, :definition
 
-      option :definition
-      option :enum_class
+      def initialize(enum_class:, definition:)
+        @enum_class = enum_class
+        @definition = definition
+      end
+
+      def self.call(*params, **options, &block)
+        new(*params, **options).call(&block)
+      end
 
       def call
         Type.new(

data/lib/simple_enumeration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleEnumeration
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/simple_enumeration.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/filters'
-require 'active_support/core_ext/string/inflections'
-require 'callee'
-require 'dry/initializer'
 require 'i18n'
 
 require_relative 'simple_enumeration/version'
@@ -24,4 +20,19 @@ module SimpleEnumeration
   def self.extended(receiver)
     receiver.extend DefineSimpleEnumeration
   end
+
+  def self.camelcase(string)
+    string.split('_').map do |w|
+      w[0] = w[0].upcase
+      w
+    end.join
+  end
+
+  def self.underscore(string)
+    string
+      .gsub('::', '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .downcase
+  end
 end

data/simple_enumeration.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |spec|
 
   spec.homepage      = 'https://github.com/norbertmaleckii/simple-enumeration-rb'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = "#{spec.homepage}/CHANGELOG.md"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   # 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.
@@ -32,9 +33,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport'
-  spec.add_dependency 'callee'
-  spec.add_dependency 'dry-initializer'
   spec.add_dependency 'i18n'
 
   spec.add_development_dependency 'pry'

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simple_enumeration
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Norbert Małecki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  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: callee
-  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: dry-initializer
-  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: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +47,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/lint.yml"
 - ".github/workflows/specs.yml"
 - ".gitignore"
@@ -126,6 +85,7 @@ metadata:
   homepage_uri: https://github.com/norbertmaleckii/simple-enumeration-rb
   source_code_uri: https://github.com/norbertmaleckii/simple-enumeration-rb
   changelog_uri: https://github.com/norbertmaleckii/simple-enumeration-rb/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -134,14 +94,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Enumerations system for Ruby with awesome features!