rails_stuff 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a6bd04d2e9f8e71c29e7b70748e3f1529715e0c
-  data.tar.gz: fa5c7003161e787b1886de2b3c6e10955c812728
+  metadata.gz: 16d70694f5a696a150e54aad75558c05441d0c1c
+  data.tar.gz: b12c95387e4bd5593842d8ad4ba3db9d5dc9ad9f
 SHA512:
-  metadata.gz: fa5e2a577b9de17bab80c9caf6e6e323d9637969f135e701042745271c9b60422d627a27c07311355feae66c2d29d4918ae498f5db542db1c0a50713a7c09c90
-  data.tar.gz: a70871bf1a0814cd0551a6ad8a7f596b0912751925c04a5353920fdafcd55234344d7e8bb8a0e90c467455fcd3223cf0e3060b0d3c45bd0e21fc57be72d2632d
+  metadata.gz: e179c0f340c95ff4186022d6ab09053d023ae01cee10a0a276e697e02d387d3624626cf0c93b0bd43ee3e305330d747259e4d4a558af5c912cd9a8d336f207bc
+  data.tar.gz: e7e396a2265bb05e1312eaff05d5230788a77a2fc92780b4f8c099f9a40979f502975c2c6b2967fd91b41d2635527cd6ee943fbde73c8541ebb7c4a9537540b4

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 cache: bundler
 rvm:
   - 2.2.3
+gemfile:
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile
 services:
   - redis
 notifications:

data/Appraisals

@@ -0,0 +1,12 @@
+appraise 'rails-4' do
+  group :development do
+    gem 'rails', '~> 4.0'
+  end
+end
+
+appraise 'rails-5' do
+  group :development do
+    gem 'rails', '~> 5.0'
+    gem 'rails-controller-testing', '~> 0.1.1'
+  end
+end

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 0.5.1
+
+Rails 5 support.
+
+## 0.5.0
+
 ### Controllers
 
 - `belongs_to`.

data/Gemfile

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
+  gem 'rails'
+  gem 'appraisal', '~> 2.1.0'
+
   gem 'sdoc', '~> 0.4.1'
   gem 'pry', '~> 0.10.1'
   gem 'pry-byebug', '~> 3.2.0'
@@ -10,13 +13,12 @@ group :development do
   gem 'database_cleaner', '~> 1.5.0'
   gem 'pooled_redis', '~> 0.2.1'
   gem 'activemodel_translation', '~> 0.1.0'
-  gem 'has_scope', '~> 0.6.0'
+  gem 'has_scope', '~> 0.7.0'
   gem 'responders', '~> 2.1.0'
   gem 'kaminari', '~> 0.16.3'
 
-  gem 'rspec', '~> 3.3.0'
-  gem 'rspec-its', '~> 1.1.0'
-  gem 'rspec-rails', '~> 3.3.3'
+  gem 'rspec-rails', '~> 3.5.2'
+  gem 'rspec-its', '~> 1.2.0'
 
   gem 'rubocop', '~> 0.37.2'
 

data/README.md

@@ -472,6 +472,9 @@ $('.selector').myPlugin().myPlugin('customAction')
 After checking out the repo, run `bin/setup` to install dependencies.
 Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
+Use [appraisal](https://github.com/thoughtbot/appraisal) to run specs:
+`appraisal rspec`.
+
 To install this gem onto your local machine, run `bundle exec rake install`.
 To release a new version, update the version number in `version.rb`,
 and then run `bundle exec rake release` to create a git tag for the version,

data/bin/setup

@@ -3,6 +3,7 @@ set -euo pipefail
 IFS=$'\n\t'
 
 bundle install
+appraisal install
 bin/install_git_hooks
 
 # Do any other automated setup that you need to do here

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+group :development do
+  gem "rails", "~> 4.0"
+  gem "appraisal", "~> 2.1.0"
+  gem "sdoc", "~> 0.4.1"
+  gem "pry", "~> 0.10.1"
+  gem "pry-byebug", "~> 3.2.0"
+  gem "sqlite3", "~> 1.3.10"
+  gem "database_cleaner", "~> 1.5.0"
+  gem "pooled_redis", "~> 0.2.1"
+  gem "activemodel_translation", "~> 0.1.0"
+  gem "has_scope", "~> 0.7.0"
+  gem "responders", "~> 2.1.0"
+  gem "kaminari", "~> 0.16.3"
+  gem "rspec-rails", "~> 3.5.2"
+  gem "rspec-its", "~> 1.2.0"
+  gem "rubocop", "~> 0.37.2"
+  gem "coveralls", "~> 0.8.2", :require => false
+end
+
+gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,25 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+group :development do
+  gem "rails", "~> 5.0"
+  gem "appraisal", "~> 2.1.0"
+  gem "sdoc", "~> 0.4.1"
+  gem "pry", "~> 0.10.1"
+  gem "pry-byebug", "~> 3.2.0"
+  gem "sqlite3", "~> 1.3.10"
+  gem "database_cleaner", "~> 1.5.0"
+  gem "pooled_redis", "~> 0.2.1"
+  gem "activemodel_translation", "~> 0.1.0"
+  gem "has_scope", "~> 0.7.0"
+  gem "responders", "~> 2.1.0"
+  gem "kaminari", "~> 0.16.3"
+  gem "rspec-rails", "~> 3.5.2"
+  gem "rspec-its", "~> 1.2.0"
+  gem "rubocop", "~> 0.37.2"
+  gem "coveralls", "~> 0.8.2", :require => false
+  gem "rails-controller-testing", "~> 0.1.1"
+end
+
+gemspec :path => "../"

data/lib/rails_stuff/params_parser.rb

@@ -103,8 +103,18 @@ module RailsStuff
     # Parse boolean using ActiveResord's parser.
     def parse_boolean(val)
       parse(val) do
-        @boolean_parser ||= ActiveRecord::Type::Boolean.new
-        @boolean_parser.type_cast_from_user(val)
+        @boolean_parser ||= boolean_parser
+        @boolean_parser[val]
+      end
+    end
+
+    def boolean_parser
+      require 'active_record'
+      ar_parser = ActiveRecord::Type::Boolean.new
+      if RailsStuff.rails4?
+        ->(val) { ar_parser.type_cast_from_user(val) }
+      else
+        ->(val) { ar_parser.cast(val) }
       end
     end
 

data/lib/rails_stuff/sort_scope.rb

@@ -8,7 +8,7 @@ module RailsStuff
   # to allowed subset.
   module SortScope
     # Register type for has_scop that accepts stings, hashes & arrays.
-    HasScope::ALLOWED_TYPES[:any] = [[String, Hash, Array, Symbol]]
+    HasScope::ALLOWED_TYPES[:any] = [[String, Hash, Array, Symbol, ActionController::Parameters]]
 
     # Setups has_scope to order collection by allowed columns.
     # Sort column is filtered by SortScope.filter_param method.
@@ -54,6 +54,7 @@ module RailsStuff
       def filter_param(val, params, allowed, default = nil)
         val ||= default
         unless val == default
+          val = val.to_unsafe_h if val.is_a?(ActionController::Parameters)
           val =
             if val.is_a?(Hash)
               val.each_with_object({}) do |(key, dir), h|

data/lib/rails_stuff/statusable.rb

@@ -162,9 +162,14 @@ module RailsStuff
       end
 
       # Rails 4 doesn't use `instance_exec` for scopes, so we do it manually.
+      # For Rails 5 it's just use `.scope`.
       def define_scope(name, body)
-        model.singleton_class.send(:define_method, name) do |*args|
-          all.scoping { instance_exec(*args, &body) } || all
+        if RailsStuff.rails4?
+          model.singleton_class.send(:define_method, name) do |*args|
+            all.scoping { instance_exec(*args, &body) } || all
+          end
+        else
+          model.scope(name, body)
         end
       end
 

data/lib/rails_stuff/version.rb

@@ -6,7 +6,7 @@ module RailsStuff
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/rails_stuff.rb

@@ -1,4 +1,5 @@
 require 'rails_stuff/version'
+require 'active_support/version'
 require 'active_support/dependencies/autoload'
 
 # Useful stuff for Rails.
@@ -16,6 +17,16 @@ module RailsStuff
   autoload :SortScope
   autoload :Statusable
   autoload :TypesTracker
+
+  module_function
+
+  def rails_version
+    @rails_version = ActiveSupport::VERSION
+  end
+
+  def rails4?
+    rails_version::MAJOR == 4
+  end
 end
 
 require 'rails_stuff/engine' if defined?(Rails::Engine)

data/rails_stuff.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_dependency 'rails', '~> 4.0'
+  spec.add_dependency 'activesupport', '> 4.0', '< 6.0'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rails_stuff
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Max Melentiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +69,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -72,6 +79,8 @@ files:
 - bin/git-hooks/pre-commit
 - bin/install_git_hooks
 - bin/setup
+- gemfiles/rails_4.gemfile
+- gemfiles/rails_5.gemfile
 - lib/assets/javascripts/rails_stuff/plugin_manager.coffee
 - lib/assets/stylesheets/rails_stuff/_media_queries.scss
 - lib/net/http/debug.rb