rails_core_extensions 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f3d03a0f590162030b45af40b62bc06cf43070b39329e128ecc8019a4dd493
-  data.tar.gz: 7464ef1b358eabf26b9acbf981c0521839ac2ab0188b4b5e684faedeedfacf23
+  metadata.gz: c7a7bd9b6bb639dc50a122b94ee7b46128875ab70b493d2c0846f795308ae5ef
+  data.tar.gz: b5ed7c23cb5b1102a7332c31c7df5291a8b6f19fd3417283af991e122ce8cbd6
 SHA512:
-  metadata.gz: ecb48e82f04873abc00679c6527e0e00f629e8e654747969a3f69eb0939730eca1272de3710f4e5308cd65b563483f599cafa5c15543a7b470aa4ba065713b14
-  data.tar.gz: 03fc9650d0d19bb1bb46c871f16becb722afdc65e061405e60e54c38e858ac74f91e8df5e83a453970473ba1d15c18c80614984c439a41c9e56ff7ae6da4d71b
+  metadata.gz: 1f9327c73a62ed82c97dac61fa7eed4bb56ab1c54a1993e7299abdddb6c3c3d316889e422f7c6eaf889a7819628f84599b86c565740034053fd4e9674dbc06d5
+  data.tar.gz: 3afa1de1ffe2875da34aa4cacff8081101f979c9c92d5528956394ea32c35176904368c888cfb4c58c82d9cd169a5d33064ac9ce6e883020b9b90a19d1736ad3

data/.ruby-style.yml

@@ -35,7 +35,6 @@ Style/IfUnlessModifier:
   Description: Favor modifier if/unless usage when you have a single-line body.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
   Enabled: false
-  MaxLineLength: 100
 Style/OptionHash:
   Description: Don't use option hashes when you can use keyword arguments.
   Enabled: false
@@ -98,40 +97,16 @@ Style/SingleLineMethods:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-single-line-methods
   Enabled: false
   AllowIfMethodIsEmpty: true
-Style/StringLiterals:
-  Description: Checks if uses of quotes match the configured preference.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals
-  Enabled: true
-  EnforcedStyle: single_quotes
-  SupportedStyles:
-  - single_quotes
-  - double_quotes
-Style/StringLiteralsInInterpolation:
-  Description: Checks if uses of quotes inside expressions in interpolated strings
-    match the configured preference.
-  Enabled: true
-  EnforcedStyle: single_quotes
-  SupportedStyles:
-  - single_quotes
-  - double_quotes
 Style/TrailingCommaInArguments:
   Description: Checks for trailing comma in argument lists.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
   EnforcedStyleForMultiline: comma
-  SupportedStyles:
-    - comma
-    - consistent_comma
-    - no_comma
   Enabled: true
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
   Description: Checks for trailing comma in array and hash literals.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
   EnforcedStyleForMultiline: comma
-  SupportedStyles:
-    - comma
-    - consistent_comma
-    - no_comma
-Enabled: true
+  Enabled: true
 Metrics/AbcSize:
   Description: A calculated magnitude based on number of assignments, branches, and
     conditions.
@@ -235,9 +210,8 @@ Lint/HandleExceptions:
   Description: Don't suppress exception.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
   Enabled: false
-Lint/LiteralInCondition:
-  Description: Checks of literals used in conditions.
-  Enabled: false
 Lint/LiteralInInterpolation:
   Description: Checks for literals used in interpolation.
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/.travis.yml

@@ -1,16 +1,19 @@
 language: ruby
 rvm:
-  - 2.3
   - 2.4
   - 2.5
+matrix:
+  exclude:
+    - rvm: 2.4
+      gemfile: gemfiles/rails6.gemfile
+
 script: "bundle exec rake spec"
 gemfile:
-  - gemfiles/rails4.gemfile
   - gemfiles/rails5.gemfile
-notifications:
-  email:
-    - support@travellink.com.au
-  flowdock:
-    secure: A0XTB5fVkDI9PSeyA4kMIckB4EPdoBlCIae+zatkcqlUJcqTc9wMFSrlnjzA4x+ramqGlwprPXUtEGVVEJwBcoaUjSOnNqZjeRAE1HuZ3D91/UaXZArp+skTGkO/qqek6pSYsAwODN5Q/Fr0qpV6cRzUuQ9nvGA/8sg/Ano2Cno=
+  - 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/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.6.0
+
+* [TT-5542] Remove Rails 4 support
+* [TT-5642] Fixed sortable so it can sort on empty scopes
+
+## 0.5.0
+
+* Support include_blank properly (was broken)
+
 ## 0.4.0 (Removes Rails3 Support)
 
 * [TT-3778] Store the cacheable attributes in memory for the duration of the request

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

@@ -2,5 +2,5 @@ source :rubygems
 gemspec :path => '../'
 
 group :development, :test do
-  gem 'activerecord', '~> 4.0'
+  gem 'activerecord', '~> 6.0.0.rc1'
 end

data/lib/rails_core_extensions/action_view_extensions.rb

@@ -52,9 +52,9 @@ module RailsCoreExtensions
     def boolean_select_tag(name, *args)
       options = args.extract_options!
       options ||= {}
-      opts = [['Yes', '1'], ['No', '0']]
-      opts = [blank_option] + opts if options[:include_blank]
-      select_tag name, options_for_select(opts, options[:selected])
+      yes_no_opts = [%w[Yes 1], %w[No 0]]
+      option_tags = options_for_select(yes_no_opts, options[:selected])
+      select_tag name, option_tags, options.except(:selected)
     end
   end
 end

data/lib/rails_core_extensions/sortable.rb

@@ -15,21 +15,18 @@ module RailsCoreExtensions
 
     def sort
       scope = @params[:scope].try(:to_sym)
+      @params[scope] = nil if @params[scope].blank?
 
-      param_key = @controller_name.singularize
-      param_key += "_#{@params[scope]}" if scope
-
-      params_collection = @params["#{param_key}_body".to_sym]
-
-      if params_collection.blank?
-        name = "#{scope.to_s.gsub('_id', '')}_#{@params[scope]}_body".to_sym
-        params_collection = @params[name]
+      body_key = @controller_name.singularize + (@params[scope] ? "_#{@params[scope]}" : '')
+      sorted_id_list = @params["#{body_key}_body".to_sym]
+      if sorted_id_list.blank?
+        sorted_id_list = @params["#{scope.to_s.gsub('_id', '')}_#{@params[scope]}_body".to_sym]
       end
 
       collection = @klass.reorder(:position)
-      collection = collection.where(@params.slice(scope.to_sym)) if scope
+      collection = collection.where(@params.slice(scope)) unless scope.blank?
 
-      sort_collection(collection, params_collection.map(&:to_i))
+      sort_collection(collection, sorted_id_list.map(&:to_i))
     end
 
     private

data/lib/rails_core_extensions/version.rb

@@ -1,3 +1,3 @@
 module RailsCoreExtensions
-  VERSION = '0.4.0'
+  VERSION = '0.6.0'
 end

data/rails_core_extensions.gemspec

@@ -19,16 +19,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', ['>= 4.0.0']
-  spec.add_dependency 'actionpack', ['>= 4.0.0']
+  spec.add_dependency 'activerecord', ['>= 5.0.0']
+  spec.add_dependency 'actionpack', ['>= 5.0.0']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'activerecord-nulldb-adapter'
   spec.add_development_dependency 'coverage-kit'
   spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'travis'
 

data/spec/action_controller_sortable_spec.rb

@@ -26,10 +26,9 @@ describe RailsCoreExtensions::Sortable do
     models.each(&:destroy)
   end
 
-  let(:params) { { model_body: [one.id, thr.id, two.id] } }
   subject { RailsCoreExtensions::Sortable.new(params, 'models') }
 
-  describe 'when unscoped' do
+  RSpec.shared_examples 'unscoped' do
     let(:scope) { Model.reorder(:position) }
     specify { expect(scope.pluck(:name)).to eq %w(One Two Thr) }
     it 'should correctly sort' do
@@ -38,6 +37,16 @@ describe RailsCoreExtensions::Sortable do
     end
   end
 
+  describe 'when unscoped due to blank scope' do
+    let(:params) { { model_body: [one.id, thr.id, two.id], scope: "" } }
+    it_behaves_like 'unscoped'
+  end
+
+  describe 'when unscoped due to lack of scope' do
+    let(:params) { { model_body: [one.id, thr.id, two.id] } }
+    it_behaves_like 'unscoped'
+  end
+
   describe 'when scoped' do
     let(:scope) { Model.where(category_id: 1).reorder(:position) }
     specify { expect(scope.pluck(:name)).to eq %w(One Two) }

data/spec/action_view_extensions_spec.rb

@@ -1,6 +1,6 @@
-require 'rails_core_extensions/action_view_extensions'
+require "rails_core_extensions/action_view_extensions"
 
-require 'action_view'
+require "action_view"
 
 describe RailsCoreExtensions::ActionViewExtensions do
   before do
@@ -11,15 +11,30 @@ describe RailsCoreExtensions::ActionViewExtensions do
     end
   end
 
-  after { Object.send(:remove_const, 'TestModel1') }
+  after { Object.send(:remove_const, "TestModel1") }
 
-  subject { TestModel1.new }
+  let(:helper) { TestModel1.new }
 
-  context '#boolean_select_tag' do
-    it 'should generate and have selected element selected' do
-      expect(subject.boolean_select_tag('name', selected: '0')).to eq(
-        subject.select_tag('name', subject.options_for_select([['Yes', '1'], ['No', '0']], selected: '0'))
-      )
+  context "#boolean_select_tag" do
+    let(:yes_no) { [%w[Yes 1], %w[No 0]] }
+    subject { helper.boolean_select_tag("name", args) }
+
+    context "when elements selected" do
+      let(:args) { { selected: 0 } }
+      let(:options) { helper.options_for_select(yes_no, selected: "0") }
+
+      it { is_expected.to eq helper.select_tag("name", options) }
+
+      context "and other options passed" do
+        let(:args) { { selected: "0", include_blank: "All" } }
+        it {
+          is_expected.to eq helper.select_tag(
+            "name",
+            options,
+            include_blank: "All",
+          )
+        }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_core_extensions
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Noack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-18 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -211,8 +225,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails4.gemfile
 - gemfiles/rails5.gemfile
+- gemfiles/rails6.gemfile
 - lib/rails_core_extensions.rb
 - lib/rails_core_extensions/action_controller_sortable.rb
 - lib/rails_core_extensions/action_view_currency_extensions.rb