rails_core_extensions 0.8.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44cf808ba11ebf812b532bdaa5dbb304bc9ec2caaf803809a29e95215bbeb7d
-  data.tar.gz: 14842819792762d71b771831c3822c2a71fed63c1a7f3e7225a9aaa34630d1b9
+  metadata.gz: e58d4846243aed9d34acbc12219f9968d0794dac0c7663809293660306e7b76f
+  data.tar.gz: a455c966efdfaa720de412cadb772fff9efc6dd9c5b1951cd012686bce40be52
 SHA512:
-  metadata.gz: 940dce7b6dd812b79e80d697758fdeb8f22fc0fe08434260aacf9b94b3be69de95f5fa029f743d247fec7e77081633807a4c25ffcc5ac6dfecc9a0640cb0e441
-  data.tar.gz: 072f4fc03850e7f8aa2268fbe85d49812f0d98a5964ab3fadf4fc7bcbf6d780ae61d17abb1c3ef1778173e5efece1d8d785bb5c7deb498754d57fd4ea0409b0c
+  metadata.gz: 2e742d0b0c274dce91c59cbc500cfa47a98abe66dc295b4ecec30fde12c01e9c503abeed9714c8c9a23f0de09d9dbc069a47fb3a19671a36a525a23242448a72
+  data.tar.gz: 64624d95978eac776e0b68c416c496c375c1d35cee267f578cb888c9b0818e610dfdc980815745a96c6023566c762e3bf5eeebcdc39812f88b6d719e94f71244

data/.github/dependabot.yml

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

data/.github/workflows/release.yml

@@ -0,0 +1,59 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - run: bundle exec rake
+
+  release:
+    needs: build
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Generate Changelog
+        run: |
+          # Get version from github ref (remove 'refs/tags/' and prefix 'v')
+          version="${GITHUB_REF#refs/tags/v}"
+          npx changelog-parser CHANGELOG.md | jq -cr ".versions | .[] | select(.version == \"$version\") | .body" > ${{ github.workflow }}-CHANGELOG.txt
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          body_path: ${{ github.workflow }}-CHANGELOG.txt
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish:
+    needs: [build, release]
+    name: Publish
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+
+      - 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/ruby.yml

@@ -0,0 +1,19 @@
+name: Build and Test
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [rails60, rails61]
+        ruby: ["2.6", "2.7", "3.0"]
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+3.0.0

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 0.11.2
+
+* [TT-8640] Add dependabot config
+
+## 0.11.1
+
+* [TT-8608] Fix broken rake command in the gem publish stage
+
+## 0.11.0
+
+* [TT-8608] Switch from travis to gihthub actions
+* [TT-8608] Add support for Rails 6.1 / Ruby 3
+
+## 0.10.0
+
+* [TT-8507] Sortable will now fire callbacks to ensure we audit these changes
+
+## 0.9.0
+
+* [TT-6727] Fix usage of symbolize_keys in sortable
+
 ## 0.8.0
 
 * [TT-6539] Remove cache_all_attributes and other unused methods

data/README.md

@@ -1,9 +1,7 @@
-Rails Core Extensions
-====================
+# Rails Core Extensions
 
-[![Build Status](https://travis-ci.org/sealink/rails_core_extensions.png?branch=master)](https://travis-ci.org/sealink/rails_core_extensions)
+[![Build Status](https://github.com/sealink/rails_core_extensions/workflows/Build/badge.svg?branch=master)](https://github.com/sealink/rails_core_extensions/actions)
 [![Coverage Status](https://coveralls.io/repos/sealink/rails_core_extensions/badge.png)](https://coveralls.io/r/sealink/rails_core_extensions)
-[![Dependency Status](https://gemnasium.com/sealink/rails_core_extensions.png?travis)](https://gemnasium.com/sealink/rails_core_extensions)
 [![Code Climate](https://codeclimate.com/github/sealink/rails_core_extensions.png)](https://codeclimate.com/github/sealink/rails_core_extensions)
 
 # DESCRIPTION
@@ -30,7 +28,7 @@ end
 
 config/routes.rb
 
-In Rails 4/5:
+In Rails 6:
 resources :types do
   collection
     post :sort
@@ -42,18 +40,32 @@ You need to submit a collection of objects named the same as the controller.
 
 e.g. for the above the params should be:
 
+```ruby
 types_body[]=1
 types_body[]=3
-etc.
+```
 
 Where the value is the id, and the position of submission is the new order, e.g.
 In the above, the item of id 3 will be updated to position 2
 
 If you have scoped sorts, e.g. sorts within categories you also need to pass in 2 params:
-* scope (e.g. category_id)
-* a variable by that name, e.g. category_id
+
+- scope (e.g. category_id)
+- a variable by that name, e.g. category_id
 
 So in the above if you want to upgrade category_id 6, you could submit
 scope=category_id&category_id=6
 
 along with type_body[]=7.. for all the types in category 6
+
+# RELEASE
+
+To publish a new version of this gem the following steps must be taken.
+
+* Update the version in the following files
+  ```
+    CHANGELOG.md
+    lib/rails_core_extensions/version.rb
+  ````
+* Create a tag using the format v0.1.0
+* Follow build progress in GitHub actions

data/gemfiles/{rails6.gemfile → rails60.gemfile}

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec :path => '../'
 
 group :development, :test do

data/gemfiles/rails61.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activerecord', '~> 6.1'
+end

data/lib/rails_core_extensions/active_record_extensions.rb

@@ -70,7 +70,7 @@ module ActiveRecordExtensions
             reload
             #{collection}.sort_by(&:position).each_with_index do |o, index|
               if o.position != (index + 1)
-                o.update_attribute(:position, index + 1)
+                o.update(:position, index + 1)
               end
             end
           end

data/lib/rails_core_extensions/sortable.rb

@@ -8,7 +8,7 @@ module RailsCoreExtensions
     #   category_id (or whatever the name of scope is)
     #   model_1_body (or whatever id of scope id)
     def initialize(params, controller_name)
-      @params = params.symbolize_keys
+      @params = params.permit!.to_h.symbolize_keys
       @controller_name = controller_name
       @klass = controller_name.classify.constantize
     end
@@ -43,7 +43,7 @@ module RailsCoreExtensions
     end
 
     def update(object, new_position)
-      @klass.where(id: object.id).limit(1).update_all(position: new_position)
+      @klass.find(object.id).update(position: new_position)
     end
   end
 end

data/lib/rails_core_extensions/translations.rb

@@ -6,7 +6,7 @@ module RailsCoreExtensions
 
     module ClassMethods
       def translate(key, options = {})
-        I18n.translate key, options.merge(scope: translation_key)
+        I18n.translate key, **options.merge(scope: translation_key)
       end
 
       def translation_key

data/lib/rails_core_extensions/version.rb

@@ -1,3 +1,3 @@
 module RailsCoreExtensions
-  VERSION = '0.8.0'
+  VERSION = '0.11.2'
 end

data/rails_core_extensions.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'activerecord', ['>= 5.0.0']
-  spec.add_dependency 'actionpack', ['>= 5.0.0']
+  spec.add_dependency 'activerecord', ['>= 6.0.0']
+  spec.add_dependency 'actionpack', ['>= 6.0.0']
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake'
@@ -31,5 +32,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'travis'
 end

data/spec/action_controller_sortable_spec.rb

@@ -26,7 +26,7 @@ describe RailsCoreExtensions::Sortable do
     models.each(&:destroy)
   end
 
-  subject { RailsCoreExtensions::Sortable.new(params, 'models') }
+  subject { RailsCoreExtensions::Sortable.new(ActionController::Parameters.new(params), 'models') }
 
   RSpec.shared_examples 'unscoped' do
     let(:scope) { Model.reorder(:position) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_core_extensions
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Michael Noack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -165,20 +165,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: travis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Set of extensions to core rails libraries.
 email:
 - support@travellink.com.au
@@ -186,19 +172,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".ruby-style.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails5.gemfile
-- gemfiles/rails6.gemfile
+- gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/rails_core_extensions.rb
 - lib/rails_core_extensions/action_controller_sortable.rb
 - lib/rails_core_extensions/action_view_extensions.rb
@@ -245,14 +233,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Set of extensions to core rails libraries.

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-rvm:
-  - 2.6
-
-script: "bundle exec rake spec"
-gemfile:
-  - gemfiles/rails5.gemfile
-  - gemfiles/rails6.gemfile
-sudo: false
-cache: bundler
-# Due to this issue, stil not resolved: travis-ci/travis-ci#8969
-before_install:
-  - gem update --system
-  - gem install bundler

data/gemfiles/rails5.gemfile

@@ -1,6 +0,0 @@
-source :rubygems
-gemspec :path => '../'
-
-group :development, :test do
-  gem 'activerecord', '~> 5.0'
-end