actionset 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15622f077374c1ce7a76dea96c6523f1418e0f6d
-  data.tar.gz: a4054979eea205a3ee260f3781372dd9682411b7
+  metadata.gz: a4c9246a4316813c78ee58c47708a977b5811c2c
+  data.tar.gz: d6f45a1104daad185b971f7e9a4ac47abc698432
 SHA512:
-  metadata.gz: ddc6b85bc1518198c5528dc983c8e820aafaf8051a609e3b5a8a0c8ee62d42108d821f87d46ac630ed815f0b481105c8bfbc4d2b8699e32fd599aa362fffc334
-  data.tar.gz: 282a1915bfc5868e9ffce1df55425210f530469e54a3f6ace1536b95c652c21376b38db41f98dca593bab6a514fd1157af84afdbf4a9ad928fe3818a9933486f
+  metadata.gz: df2cc22b86dfc5bc3579bd9f84964844920afe47a3906ed31ed150f297e1eea0c9feecfdd0767c9c8e3dcec03e82d721ab1a5cd4a3a98833ea94b7f956cce03f
+  data.tar.gz: 9851ffa5d0e416ed93af12ae5a939fbbbe60b49a4670386e085af9a9d9c38f8d7bd313125d04710c891b3c950e296de1940e2f7c6137976f069669ef58a9bf0c

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.hound.yml

@@ -0,0 +1,32 @@
+rubocop:
+  config_file: .rubocop.yml
+
+reek:
+  enabled: true
+
+coffeescript:
+  enabled: false
+credo:
+  enabled: false
+css:
+  enabled: false
+eslint:
+  enabled: false
+flake8:
+  enabled: false
+golint:
+  enabled: false
+haml:
+  enabled: false
+jshint:
+  enabled: false
+sass-lint:
+  enabled: false
+scss:
+  enabled: false
+shellcheck:
+  enabled: false
+swiftlint:
+  enabled: false
+tslint:
+  enabled: false

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 Metrics/LineLength:
   Max: 120
   # To make it possible to copy or click on URIs in the code, we allow lines

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/CHANGELOG

@@ -1,3 +1,20 @@
+v 0.8.0
+  - merge ActiveSet and ActionSet into a monorepo
+  - merge and overhaul the specs
+    + run a random subset of request specs to test ActionSet wiring to ActiveSet
+    + polish the ActiveSet specs
+    - update the scopes filtering specs to be more generalized and exhaustive
+  - get all new features/fixes from current ActiveSet
+    + fix a bug where ActiveRecord sorting didn't treat NULL values in the same way as Enumerable sorting
+      * where NULL values are sorted as if larger than any non-null value
+    + fix a bug with ActiveRecord scope filtering
+      * if we try to use a class method scope that returns something other than an ActiveRecord::Relation
+    + fix a bug in Enumerable class method filtering when method returns object, not array
+    + fix a bug transforming Date objects into sortable integers to ensure UTC
+    + fix a bug to allow sorting of computed attributes on sets that include nil values
+    + fix a bug that prevents enumerable sets from being filtered down to empty sets
+  - fix Rubocop offenses (safely)
+  - use Bundler version 2.x
 v 0.7.0
   - overhaul the specs
     + update the data model to be more extensive and expressive

data/Gemfile.lock

@@ -0,0 +1,222 @@
+PATH
+  remote: .
+  specs:
+    actionset (0.8.0)
+      activesupport (>= 4.0.2)
+      railties
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.1.6.1)
+      actionpack (= 5.1.6.1)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.6.1)
+      actionpack (= 5.1.6.1)
+      actionview (= 5.1.6.1)
+      activejob (= 5.1.6.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.6.1)
+      actionview (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.6.1)
+      activesupport (= 5.1.6.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.6.1)
+      activesupport (= 5.1.6.1)
+      globalid (>= 0.3.6)
+    activemodel (5.1.6.1)
+      activesupport (= 5.1.6.1)
+    activerecord (5.1.6.1)
+      activemodel (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
+      arel (~> 8.0)
+    activesupport (5.1.6.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    ansi (1.5.0)
+    arel (8.0.0)
+    ast (2.4.0)
+    builder (3.2.3)
+    capybara (3.12.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    codecov (0.1.14)
+      json
+      simplecov
+      url
+    combustion (0.7.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
+    database_cleaner (1.6.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    erubi (1.7.1)
+    factory_bot (4.8.2)
+      activesupport (>= 3.0.0)
+    faker (1.8.7)
+      i18n (>= 0.7)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    hirb (0.7.3)
+    i18n (1.2.0)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.1)
+    json (2.1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.9.0)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.12.1)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.6.1)
+      actioncable (= 5.1.6.1)
+      actionmailer (= 5.1.6.1)
+      actionpack (= 5.1.6.1)
+      actionview (= 5.1.6.1)
+      activejob (= 5.1.6.1)
+      activemodel (= 5.1.6.1)
+      activerecord (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
+      bundler (>= 1.3.0)
+      railties (= 5.1.6.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.6.1)
+      actionpack (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rainbow (3.0.0)
+    rake (10.5.0)
+    ransack (2.1.1)
+      actionpack (>= 5.0)
+      activerecord (>= 5.0)
+      activesupport (>= 5.0)
+      i18n
+    regexp_parser (1.3.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.61.1)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-console (0.4.2)
+      ansi
+      hirb
+      simplecov
+    simplecov-html (0.10.2)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.4.0)
+    url (0.3.2)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack
+  actionset!
+  activerecord
+  bundler
+  capybara
+  codecov
+  combustion
+  database_cleaner
+  factory_bot
+  faker
+  rails (~> 5.1.0)
+  rake
+  ransack
+  rspec
+  rspec-rails
+  rubocop
+  simplecov
+  simplecov-console
+  sqlite3
+
+BUNDLED WITH
+   2.0.1

data/actionset.gemspec

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
+  spec.platform      = Gem::Platform::RUBY
   spec.name          = 'actionset'
-  spec.version       = '0.7.0'
+  spec.version       = '0.8.0'
   spec.authors       = ['Stephen Margheim']
   spec.email         = ['stephen.margheim@gmail.com']
 
-  spec.summary       = 'A toolkit to wire-up ActiveSet collections with a Rails controller.'
-  spec.description   = 'Easily filter, sort, and paginate enumerable sets via web requests.'
+  spec.summary       = 'A toolkit for working with collections.'
+  spec.description   = 'Easily filter, sort, and paginate collections.'
   spec.homepage      = 'https://github.com/fractaledmind/actionset'
   spec.license       = 'MIT'
 
@@ -21,20 +22,21 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activeset', '>= 0.8.0'
   spec.add_dependency 'activesupport', '>= 4.0.2'
   spec.add_dependency 'railties'
 
-  spec.add_development_dependency 'rails', '~> 5.1.0'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'codecov'
   spec.add_development_dependency 'combustion'
+  spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'faker'
+  spec.add_development_dependency 'rails', '~> 5.1.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'ransack'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-console'
-  spec.add_development_dependency 'ransack'
 end

data/bin/console

@@ -1,10 +1,24 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
+ENV['RAILS_ENV'] ||= 'test'
+
+require 'bundler'
+require 'simplecov'
+require 'combustion'
+
+Combustion.initialize! :active_record, :action_controller, :action_view
+Bundler.require :default, :development
 
 require 'bundler/setup'
-require 'action_set'
+require 'active_set'
+require 'ostruct'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
+begin
+  FactoryBot.find_definitions
+rescue FactoryBot::DuplicateDefinitionError
+  nil
+end
 
 # (If you use this, don't forget to add pry to your Gemfile!)
 # require "pry"

data/lib/action_set/attribute_value.rb

@@ -12,6 +12,7 @@ module ActionSet
       adapters.reduce(nil) do |_, adapter|
         mayble_value_or_nil = adapter.new(@raw, to).process
         next if mayble_value_or_nil.nil?
+
         return mayble_value_or_nil
       end
 
@@ -32,6 +33,7 @@ module ActionSet
 
       def process
         return @raw if @raw.is_a? @target
+
         possible_values.find { |v| v.is_a? @target }
       end
 
@@ -51,7 +53,7 @@ module ActionSet
 
       def typecast(method_name)
         @raw.send(method_name)
-      rescue
+      rescue StandardError
         nil
       end
     end
@@ -70,6 +72,7 @@ module ActionSet
 
       def process
         return @raw if @raw.is_a? @target
+
         possible_values.find { |v| v.is_a? @target }
       end
 
@@ -90,6 +93,7 @@ module ActionSet
 
       def typecast(to_type, value)
         return to_type.type_cast(value) if to_type.respond_to? :type_cast
+
         to_type.cast(value)
       end
 
@@ -101,7 +105,7 @@ module ActionSet
 
       def init_typecaster(const_name)
         type_class.const_get(const_name).new
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -121,6 +125,7 @@ module ActionSet
       def process
         return if @raw.is_a? @target
         return unless @target.eql?(TrueClass) || @target.eql?(FalseClass)
+
         # ActiveModel::Type::Boolean is too expansive in its casting; will get false positives
         to_bool
       end
@@ -131,6 +136,7 @@ module ActionSet
         return @raw if @raw.is_a?(TrueClass) || @raw.is_a?(FalseClass)
         return true if %w[true yes 1 t].include? @raw.to_s.downcase
         return false if %w[false no 0 f].include? @raw.to_s.downcase
+
         nil
       end
     end