rekkyo 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a46a9d9c7bfe76738ef8f353e5e2a1920a9a4d4b3f98040b8a86279b4d2f354c
-  data.tar.gz: 8f0fae02b3d788ed476a408abf097125d929ef327126128a7898fad354a97309
+  metadata.gz: 4a1f01bb3198a8a59e049bdc6cc02e163d40e1a1a52782aaa5065b3e13be54c5
+  data.tar.gz: ae9d4b9c66efc4ed80e814b32221881d6f4ee99203cf4dd381717a50c5faa4a3
 SHA512:
-  metadata.gz: f7d9e88f1dc6852a09c9afecee8b45970f55b9d8d5e270b0dcd8ee0de9acb1513b37f031e6e930edb6e467fbc01e65997e76a0d131a93dea3aeb5d549bceb65b
-  data.tar.gz: 2734fc74a40dc5cefb50fe9a2451ac8643bda470c1db8d0e78e6b5afa4211ea21cbfe3ff5fd0c8f79f112081192d871b447ff434a18c1fb3aa2c1a40c7f2317e
+  metadata.gz: d739847d3d7d8c2cc0c6eeb9e40f737ab969473477e0bc4b768efb8b3ce33212fb8de5eed7bc3532f282544cd3c1fecc926bb651bb52a729fa210649a8094fa2
+  data.tar.gz: 17968d571a80422c2f06476c959813628b546d04863d8503d5e19b1e357d34bf2bb68c08f298082fe3ae905ae7661944899683618061f0ce9aeccca5745efe31

data/.github/workflows/ruby.yml

@@ -0,0 +1,38 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        activesupport: ['5.2', '6.0', '6.1', '7.0']
+        experimental: [false]
+        exclude:
+          - ruby: '2.5'
+            activesupport: '7.0'
+          - ruby: '2.6'
+            activesupport: '7.0'
+          - ruby: '2.7'
+            activesupport: '5.2'
+          - ruby: '3.0'
+            activesupport: '5.2'
+          - ruby: '3.1'
+            activesupport: '5.2'
+    continue-on-error: ${{ matrix.experimental }}
+    env:
+      APPRAISAL: activesupport_${{ matrix.activesupport }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        bundle install
+        bundle exec appraisal $APPRAISAL bundle install
+    - name: Run tests
+      run: bundle exec appraisal $APPRAISAL rake

data/.gitignore

@@ -2,6 +2,8 @@
 /.yardoc
 /_yardoc/
 /Gemfile.lock
+/gemfiles/*.lock
+/gemfiles/.bundle/
 /coverage/
 /doc/
 /gemfiles/*.gemfile.lock

data/.rubocop.yml

@@ -1,5 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+  Exclude:
+    - gemfiles/*
+  NewCops: enable
 
 Style/AsciiComments:
   Enabled: false
@@ -18,13 +21,14 @@ Layout/EndOfLine:
   Enabled: true
   EnforcedStyle: lf
 
+Layout/LineLength:
+  Max: 128
+
 Metrics/BlockLength:
   Exclude:
+    - rekkyo.gemspec
     - spec/**/*
 
 Metrics/MethodLength:
   Exclude:
     - spec/**/*
-
-Metrics/LineLength:
-  Max: 128

data/Appraisals

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+appraise "activesupport_5.2" do
+  gem "activesupport", "~> 5.2.0"
+end
+
+appraise "activesupport_6.0" do
+  gem "activesupport", "~> 6.0.0"
+end
+
+appraise "activesupport_6.1" do
+  gem "activesupport", "~> 6.1.0"
+end
+
+appraise "activesupport_7.0" do
+  gem "activesupport", "~> 7.0.1"
+end

data/CHANGELOG.md

@@ -1,6 +1,37 @@
 ## Unreleased
 
 
+## 1.1.0 (2022-11-25)
+
+### Changes
+
+* Add ActiveSupport 6.0 support
+  * [PR#8](https://github.com/yujideveloper/rekkyo/pull/8)
+* Add Ruby 2.7 support
+  * [PR#9](https://github.com/yujideveloper/rekkyo/pull/9)
+* Add Ruby 3.0 and ActiveSupport 6.1 support
+  * [PR#12](https://github.com/yujideveloper/rekkyo/pull/12)
+* Drop Ruby 2.4 support
+  * [PR#14](https://github.com/yujideveloper/rekkyo/pull/14)
+* Call `super` when `Rekkyo::Type` is included
+  * [PR#16](https://github.com/yujideveloper/rekkyo/pull/16)
+* Add Ruby 3.1 and ActiveSupport 7.0 support
+  * [PR#17](https://github.com/yujideveloper/rekkyo/pull/17)
+* Override `freeze` method to freeze enum members
+  * [PR#18](https://github.com/yujideveloper/rekkyo/pull/18)
+* Drop ActiveSupport 5.1 support
+  * [PR#19](https://github.com/yujideveloper/rekkyo/pull/19)
+* Split `Rekkyo::Type::ClassMethods` module into role-specific modules
+  * [PR#19](https://github.com/yujideveloper/rekkyo/pull/20)
+
+### Misc
+
+* Migrate CI from Travis CI from GitHub Actions
+  * [PR#11](https://github.com/yujideveloper/rekkyo/pull/11)
+* Require MFA to release gem
+  * [PR#19](https://github.com/yujideveloper/rekkyo/pull/21)
+
+
 ## 1.0.0 (2019-04-08)
 
 ### Changes

data/README.md

@@ -1,12 +1,12 @@
 # Rekkyo
 
 [![Gem Version](https://badge.fury.io/rb/rekkyo.svg)](https://badge.fury.io/rb/rekkyo)
-[![Build Status](https://travis-ci.org/yujideveloper/rekkyo.svg?branch=master)](https://travis-ci.org/yujideveloper/rekkyo)
+[![Build](https://github.com/yujideveloper/rekkyo/actions/workflows/ruby.yml/badge.svg)](https://github.com/yujideveloper/rekkyo/actions/workflows/ruby.yml)
 [![Maintainability](https://api.codeclimate.com/v1/badges/37d6334cedf5b04af831/maintainability)](https://codeclimate.com/github/yujideveloper/rekkyo/maintainability)
 
 Rekkyo (列挙) is a gem for defining an enumerated type in Ruby.
 
-This gem is inspired by [`Ruby::Enum`](https://github.com/dblock/ruby-enum) and [`Enum`](https://github.com/LIQIDTechnology/enum_class).
+This gem is inspired by [`ruby-enum`](https://rubygems.org/gems/ruby-enum) and [`enum_class`](https://rubygems.org/gems/enum_class).
 
 ## Installation
 

data/gemfiles/activesupport_5.2.gemfile

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
+# This file was generated by Appraisal
 
-source "https://rubygems.org/"
+source "https://rubygems.org"
 
 gem "activesupport", "~> 5.2.0"
 

data/gemfiles/activesupport_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.0.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_7.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.0.1"
+
+gemspec path: "../"

data/lib/rekkyo/type/dsl_methods.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Rekkyo
+  module Type
+    module DSLMethods
+      UNSPECIFIED = Object.new.freeze
+      private_constant :UNSPECIFIED
+
+      def member(key, value = UNSPECIFIED)
+        value = key if value == UNSPECIFIED
+        key = key.upcase.to_sym
+
+        validate_member(key, value)
+
+        self::Member.new(key, value).freeze.tap do |m|
+          @members << m
+
+          self.const_set(key, m)
+
+          self::Member.class_exec do
+            define_method(:"#{key.downcase}?") { self.match?(m) }
+          end
+        end
+      end
+
+      private
+
+      def validate_member(key, value)
+        raise DuplicateMemberError if self.const_defined?(key, false) ||
+                                      @members.any? { |m| m.match? value }
+      end
+    end
+  end
+end

data/lib/rekkyo/type/enum_methods.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Rekkyo
+  module Type
+    module EnumMethods
+      def all
+        @members.dup
+      end
+
+      alias members all
+
+      def freeze
+        @members.freeze
+        super
+      end
+    end
+  end
+end

data/lib/rekkyo/type.rb

@@ -6,47 +6,16 @@ module Rekkyo
   module Type
     class << self
       def included(klass)
+        super
         klass.const_set(:Member, Class.new(Member))
         klass.instance_variable_set(:@members, Set.new)
-        klass.extend(ClassMethods)
-      end
-    end
-
-    module ClassMethods
-      UNSPECIFIED = Object.new.freeze
-      private_constant :UNSPECIFIED
-
-      def member(key, value = UNSPECIFIED)
-        value = key if value == UNSPECIFIED
-        key = key.upcase.to_sym
-
-        validate_member(key, value)
-
-        self::Member.new(key, value).freeze.tap do |m|
-          @members << m
-
-          self.const_set(key, m)
-
-          self::Member.class_exec do
-            define_method(:"#{key.downcase}?") { self.match?(m) }
-          end
-        end
-      end
-
-      def all
-        @members.dup
-      end
-
-      alias members all
-
-      private
-
-      def validate_member(key, value)
-        raise DuplicateMemberError if self.const_defined?(key, false) ||
-                                      @members.any? { |m| m.match? value }
+        klass.extend(DSLMethods)
+        klass.extend(EnumMethods)
       end
     end
   end
 end
 
 require "rekkyo/type/member"
+require "rekkyo/type/dsl_methods"
+require "rekkyo/type/enum_methods"

data/lib/rekkyo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rekkyo
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/rekkyo.rb

@@ -4,8 +4,8 @@ require "rekkyo/version"
 
 module Rekkyo
   class Error < StandardError; end
-  class DuplicateMemberError < Error
-  end
+
+  class DuplicateMemberError < Error; end
 end
 
 require "rekkyo/type"

data/rekkyo.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "https://github.com/yujideveloper/rekkyo/tree/master/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.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
@@ -28,10 +30,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.5"
+
+  spec.add_development_dependency "appraisal", ">= 2.4.1"
   spec.add_development_dependency "bundler", ">= 1.16"
   spec.add_development_dependency "pry", ">= 0.12.2"
   spec.add_development_dependency "pry-doc", ">= 0.13.5"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.8"
-  spec.add_development_dependency "rubocop", ">= 0.61.1"
+  spec.add_development_dependency "rubocop", ">= 1.25.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rekkyo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yuji Hanamura
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 1.25.0
 description: Rekkyo is a gem for defining an enumerated type in Ruby.
 email:
 - yuji.developer@gmail.com
@@ -101,10 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -112,10 +127,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/activesupport_5.1.gemfile
 - gemfiles/activesupport_5.2.gemfile
+- gemfiles/activesupport_6.0.gemfile
+- gemfiles/activesupport_6.1.gemfile
+- gemfiles/activesupport_7.0.gemfile
 - lib/rekkyo.rb
 - lib/rekkyo/type.rb
+- lib/rekkyo/type/dsl_methods.rb
+- lib/rekkyo/type/enum_methods.rb
 - lib/rekkyo/type/member.rb
 - lib/rekkyo/version.rb
 - rekkyo.gemspec
@@ -126,7 +145,8 @@ metadata:
   homepage_uri: https://github.com/yujideveloper/rekkyo
   source_code_uri: https://github.com/yujideveloper/rekkyo
   changelog_uri: https://github.com/yujideveloper/rekkyo/tree/master/CHANGELOG.md
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,15 +154,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: An enumerated type in Ruby.
 test_files: []

data/.travis.yml

@@ -1,12 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.4.5
-  - 2.5.5
-  - 2.6.2
-gemfile:
-  - Gemfile
-  - gemfiles/activesupport_5.1.gemfile
-  - gemfiles/activesupport_5.2.gemfile

data/gemfiles/activesupport_5.1.gemfile

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org/"
-
-gem "activesupport", "~> 5.1.0"
-
-gemspec path: "../"