imyou 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 895224d01d27525ee70e4258e8cb72fe464d7c67e4f8dd89963338390531068c
-  data.tar.gz: 489c95849694b08a8a8debf28ea3a82e84ab396394e5d6e1321844b61657832f
+  metadata.gz: '048993f98ad779b76fdad79e1351535bc3b4cdbd8e58e0d6738ddd9ed9e37515'
+  data.tar.gz: e4adc9af4260f8beab5cdbd96ce2431ba95ead58ec3598a43b5257055dabec01
 SHA512:
-  metadata.gz: 4cc1d616d1b96b4421c11ae15855fac651153448dd53a6287ff26a35f5cdddd7aa33da57480c6d68642deb1219ef504b02bd732afc97e05cceafdca88e2f4b29
-  data.tar.gz: 55090d4bfa282ff8a1c79a470b8f06c9bc74740a7b8bc6b72b3d15961c9ca41a9e635205bd8022cb7ae266690519519d1a6baa397b3d61ec68961cd370c88def
+  metadata.gz: 5faaecf9a109d262654d04aa8fe2ce40a3fcbd33efbc2e80eb33accd1a0f8a22ea5cf49b5c8d1e60be7f32a79ddfac60a5ef0edb5b6bd079b43c88c986385915
+  data.tar.gz: 56ec59c6399031166898b14be1c1442f06afaff159c0bbd0d5d28db9e512b24dc5e63867c914495a58389e35f1567825b09e09357f288e3098e10af674089d52

data/.github/workflows/gem-push.yml

@@ -0,0 +1,30 @@
+name: Ruby Gem
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby 2.6
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - 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 *.gemspec
+          gem push *.gem
+        env:
+          GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.github/workflows/test.yml

@@ -0,0 +1,42 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0', '3.1']
+        gemfile: ['rails_5.0', 'rails_5.1', 'rails_5.2', 'rails_6.0', 'rails_6.1', 'rails_7.0']
+        exclude:
+          - ruby: '2.6'
+            gemfile: 'rails_7.0'
+          - ruby: '3.0'
+            gemfile: 'rails_5.0'
+          - ruby: '3.0'
+            gemfile: 'rails_5.1'
+          - ruby: '3.0'
+            gemfile: 'rails_5.2'
+          - ruby: '3.1'
+            gemfile: 'rails_5.0'
+          - ruby: '3.1'
+            gemfile: 'rails_5.1'
+          - ruby: '3.1'
+            gemfile: 'rails_5.2'
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake

data/Gemfile

@@ -4,6 +4,3 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in imyou.gemspec
 gemspec
-
-gem 'rails'
-gem 'sqlite3'

data/README.md

@@ -1,14 +1,14 @@
 # Imyou
 
-[![CircleCI](https://circleci.com/gh/patorash/imyou.svg?style=svg)](https://circleci.com/gh/patorash/imyou)
+[![Test](https://github.com/patorash/imyou/actions/workflows/test.yml/badge.svg)](https://github.com/patorash/imyou/actions/workflows/test.yml)
 
 Imyou has feature of attaching popular name to ActiveRecord model.
 
-Imyou mean nickname in japanease.
+Imyou mean nickname in japanese.
 
 ## Installation
 
-### Rails 4.x, 5.x and 6.x
+### Rails 5.x, 6.x and 7.0.x
 
 Add this line to your application's Gemfile:
 

data/Rakefile

@@ -1,6 +1,12 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec)
+task :default => [:test]
 
-task :default => :spec
+Rake::TestTask.new do |test|
+  test.libs << 'lib'
+  test.libs << 'test'
+  test.test_files = Dir['test/**/*_test.rb']
+  test.warning = false
+  # test.verbose = true
+end

data/gemfiles/rails_5.0.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 5.0.0'
+gem 'activerecord', '~> 5.0.0'
 gem 'sqlite3', '~> 1.3.0'
 
 gemspec path: '../'

data/gemfiles/rails_5.1.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 5.1.0'
+gem 'activerecord', '~> 5.1.0'
 gem 'sqlite3', '~> 1.3.0'
 
 gemspec path: '../'

data/gemfiles/rails_5.2.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 5.2.0'
+gem 'activerecord', '~> 5.2.0'
 gem 'sqlite3', '~> 1.4'
 
 gemspec path: '../'

data/gemfiles/rails_6.0.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.0.0'
+gem 'activerecord', '~> 6.0.0'
 gem 'sqlite3', '~> 1.4'
 
 gemspec path: '../'

data/gemfiles/rails_6.1.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.1.0'
+gem 'activerecord', '~> 6.1.0'
 gem 'sqlite3', '~> 1.4'
 
 gemspec path: '../'

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.0.1'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '../'

data/imyou.gemspec

@@ -23,13 +23,10 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new("< 3".freeze)
+  spec.required_ruby_version = '>= 2.5'
 
-  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_dependency 'activerecord', '< 7.1.0', '>= 5.0.0'
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency 'pry', '~> 0'
-  spec.add_development_dependency 'database_cleaner', '~> 1.7'
-  spec.add_development_dependency 'combustion', '~> 1.0'
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
+  spec.add_development_dependency "sqlite3", '~> 1.3'
+  spec.add_development_dependency 'database_cleaner', '~> 2.0'
 end

data/lib/imyou/models.rb

@@ -114,10 +114,10 @@ module Imyou
               imyou_nickname.name == nickname
             end
             self.imyou_nicknames.replace(array)
-            true
           else
             self.imyou_nicknames.find_by(name: nickname)&.destroy!
           end
+          true
         end
 
         def nicknames=(new_nicknames)

data/lib/imyou/version.rb

@@ -1,3 +1,3 @@
 module Imyou
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: imyou
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - patorash
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,75 +45,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '2.0'
 description: Imyou has feature of attaching popular name to ActiveRecord model.
 email:
 - chariderpato@gmail.com
@@ -115,9 +79,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -130,6 +94,7 @@ files:
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - imyou.gemspec
 - lib/generators/imyou/migration/migration_generator.rb
 - lib/generators/imyou/migration/templates/active_record/migration.rb
@@ -147,16 +112,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "<"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Imyou has feature of attaching popular name to ActiveRecord model.

data/.circleci/config.yml

@@ -1,199 +0,0 @@
-version: 2.1
-
-executors:
-  ruby:
-    parameters:
-      ruby_version:
-        default: '2.7.2'
-        type: enum
-        enum: ['2.5.8', '2.6.6', '2.7.2']
-    working_directory: ~/repo
-    docker:
-      - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
-
-commands:
-  rspec:
-    steps:
-      - run:
-          name: run tests
-          command: |
-            mkdir /tmp/test-results
-            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | \
-              circleci tests split --split-by=timings)"
-
-            bundle exec rspec \
-              --format progress \
-              --format RspecJunitFormatter \
-              --out /tmp/test-results/rspec.xml \
-              --format progress \
-              $TEST_FILES
-  run_test:
-    parameters:
-      rails_version:
-        default: '6.1'
-        type: enum
-        enum: ['5.0', '5.1', '5.2', '6.0', '6.1']
-    steps:
-      - checkout
-      - run: gem install bundler --version=2.1.4 -N
-      - run:
-          name: bundle install
-          command: |
-            export BUNDLE_GEMFILE=$PWD/gemfiles/rails_<< parameters.rails_version >>.gemfile
-            bundle check || bundle install --jobs=4 --retry=3
-      - rspec
-      # collect reports
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results
-
-jobs:
-  test:
-    parameters:
-      ruby_version:
-        type: enum
-        enum: ['2.5.8', '2.6.6', '2.7.2']
-      rails_version:
-        type: enum
-        enum: ['5.0', '5.1', '5.2', '6.0', '6.1']
-    executor:
-      name: ruby
-      ruby_version: << parameters.ruby_version >>
-    parallelism: 1
-    steps:
-      - run_test:
-          rails_version: << parameters.rails_version >>
-
-  release:
-    executor:
-      name: ruby
-    parallelism: 1
-    steps:
-      - checkout
-      - add_ssh_keys:
-          fingerprints:
-            - "e7:e8:17:c5:03:05:fd:0c:0e:9b:3b:d3:90:53:c6:5c"
-      - run: gem install bundler --version=2.1.4 -N
-      - run:
-          name: bundle install
-          command: bundle check || bundle install --jobs=4 --retry=3
-      - run:
-          name: RubyGems.org | Set credential
-          command: |
-            mkdir -p ~/.gem
-            echo ":rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
-            chmod 0600 ~/.gem/credentials
-      - run:
-          name: Setup git
-          command: |
-            git config push.default current
-            git config user.email "chariderpato@gmail.com"
-            git config user.name "patorash"
-      - run:
-          name: rake release
-          command: |
-            set +e
-            filename=$(for n in *; do printf '%s\n' "$n"; done | grep gemspec)
-            gem_name=`ruby -e "require 'rubygems'; spec = Gem::Specification::load('${filename}'); puts spec.name"`
-            gem_version=`ruby -e "require 'rubygems'; spec = Gem::Specification::load('${filename}'); puts spec.version"`
-            gem list --prerelease --all --remote $gem_name \
-              | grep -E "^${gem_name}" \
-              | sed -e "s/^.*(\(.*\)).*\$/\1/" \
-              | grep -q -v $gem_version
-            result=$?
-            if [ $result = 0 ]; then
-              bundle exec rake build
-              bundle exec rake release
-            fi
-      - run:
-          name: Delete credentials
-          command: |
-            shred -u ~/.gem/credentials
-
-workflows:
-  build:
-    jobs:
-      - test:
-          name: 'Ruby 2.5.8-Rails 5.0'
-          ruby_version:  '2.5.8'
-          rails_version: '5.0'
-      - test:
-          name: 'Ruby 2.6.6-Rails 5.0'
-          ruby_version:  '2.6.6'
-          rails_version: '5.0'
-      - test:
-          name: 'Ruby 2.7.2-Rails 5.0'
-          ruby_version:  '2.7.2'
-          rails_version: '5.0'
-      - test:
-          name: 'Ruby 2.5.8-Rails 5.1'
-          ruby_version:  '2.5.8'
-          rails_version: '5.1'
-      - test:
-          name: 'Ruby 2.6.6-Rails 5.1'
-          ruby_version:  '2.6.6'
-          rails_version: '5.1'
-      - test:
-          name: 'Ruby 2.7.2-Rails 5.1'
-          ruby_version:  '2.7.2'
-          rails_version: '5.1'
-      - test:
-          name: 'Ruby 2.5.8-Rails 5.2'
-          ruby_version:  '2.5.8'
-          rails_version: '5.2'
-      - test:
-          name: 'Ruby 2.6.6-Rails 5.2'
-          ruby_version:  '2.6.6'
-          rails_version: '5.2'
-      - test:
-          name: 'Ruby 2.7.2-Rails 5.2'
-          ruby_version:  '2.7.2'
-          rails_version: '5.2'
-      - test:
-          name: 'Ruby 2.5.8-Rails 6.0'
-          ruby_version:  '2.5.8'
-          rails_version: '6.0'
-      - test:
-          name: 'Ruby 2.6.6-Rails 6.0'
-          ruby_version:  '2.6.6'
-          rails_version: '6.0'
-      - test:
-          name: 'Ruby 2.7.2-Rails 6.0'
-          ruby_version:  '2.7.2'
-          rails_version: '6.0'
-      - test:
-          name: 'Ruby 2.5.8-Rails 6.1'
-          ruby_version:  '2.5.8'
-          rails_version: '6.1'
-      - test:
-          name: 'Ruby 2.6.6-Rails 6.1'
-          ruby_version:  '2.6.6'
-          rails_version: '6.1'
-      - test:
-          name: 'Ruby 2.7.2-Rails 6.1'
-          ruby_version:  '2.7.2'
-          rails_version: '6.1'
-      - release:
-          context:
-            - rubygems.org
-          requires:
-            - 'Ruby 2.5.8-Rails 5.0'
-            - 'Ruby 2.6.6-Rails 5.0'
-            - 'Ruby 2.7.2-Rails 5.0'
-            - 'Ruby 2.5.8-Rails 5.1'
-            - 'Ruby 2.6.6-Rails 5.1'
-            - 'Ruby 2.7.2-Rails 5.1'
-            - 'Ruby 2.5.8-Rails 5.2'
-            - 'Ruby 2.6.6-Rails 5.2'
-            - 'Ruby 2.7.2-Rails 5.2'
-            - 'Ruby 2.5.8-Rails 6.0'
-            - 'Ruby 2.6.6-Rails 6.0'
-            - 'Ruby 2.7.2-Rails 6.0'
-            - 'Ruby 2.5.8-Rails 6.1'
-            - 'Ruby 2.6.6-Rails 6.1'
-            - 'Ruby 2.7.2-Rails 6.1'
-          filters:
-            branches:
-              only: master

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper