diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1a38e00..c55286f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,16 +8,17 @@ jobs: publish: runs-on: ubuntu-latest + permissions: + contents: write + id-token: write + steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 + + - name: Configure trusted publishing credentials + uses: rubygems/configure-rubygems-credentials@v1.0.0 - name: Publish to RubyGems run: | - mkdir -p $HOME/.gem - touch $HOME/.gem/credentials - chmod 0600 $HOME/.gem/credentials - printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials gem build class_kit.gemspec gem push class_kit-*.gem - env: - GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}" diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index 67612ae..fb81738 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -6,10 +6,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.5 + ruby-version: 4.0 bundler-cache: true - name: Run tests diff --git a/class_kit.gemspec b/class_kit.gemspec index 8643ea3..9538d9f 100644 --- a/class_kit.gemspec +++ b/class_kit.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_development_dependency 'rake', '~> 10.0' + spec.add_development_dependency 'rake' spec.add_development_dependency 'rspec' spec.add_development_dependency 'rubocop' spec.add_development_dependency 'simplecov', ' ~> 0.22.0' diff --git a/lib/class_kit/attribute_helper.rb b/lib/class_kit/attribute_helper.rb index b2d76d4..df4fab4 100644 --- a/lib/class_kit/attribute_helper.rb +++ b/lib/class_kit/attribute_helper.rb @@ -1,6 +1,5 @@ module ClassKit class AttributeHelper - def self.instance @instance ||= ClassKit::AttributeHelper.new end @@ -18,12 +17,12 @@ def get_attributes(klass) return @attribute_store[klass] if @attribute_store.key?(klass) attributes = [] - klass.ancestors.map do |k| + klass.ancestors.each do |k| hash = k.instance_variable_get(:@class_kit_attributes) - if hash != nil - hash.values.each do |a| - attributes.push(a) - end + next if hash.nil? + + hash.each_value do |value| + attributes.push(value) end end attributes.compact! diff --git a/lib/class_kit/version.rb b/lib/class_kit/version.rb index 995af63..273892f 100644 --- a/lib/class_kit/version.rb +++ b/lib/class_kit/version.rb @@ -1,5 +1,5 @@ # Namespace module ClassKit # :nodoc: - VERSION = '0.9.1' + VERSION = '0.10.0' end