act_with_flags 0.0.6 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8fcd67cda48d6e4cfd196f207c0e75e900ecfbfbf1e1272e4ea1d6f615c5887
-  data.tar.gz: 1832f914f676278b466214b52b06b6025df3769cb3d6c03841ca39a0e2eaa642
+  metadata.gz: 6c723baaa15bf9f4e86987bb20e3c85984cb465d7758ab05866a41baaa6ed5a1
+  data.tar.gz: 29ac2c9336dedd278f2e3ee2a71710a4cc34117c07bc28869b989e5cf454cccb
 SHA512:
-  metadata.gz: aa1a7850e27c943c06699bf2a57f214877813ab24fe2609f7c309884e7b4b0fe85b30f3072e244c6ecde5c7e1455c5993157904151733d325105ef1ca4db2276
-  data.tar.gz: 349513493947bde629f6e913af605394408ca18315822f4f0e05ab55b6b5a63854ac42c79477637b05599c3c22f21cccba83202ed5af0348732053a4a38719aa
+  metadata.gz: 4bd31e1bf3a0f0a6721fa8ed916ae799e20022b46bfc78521f13ccd40d359737812bb4ae35a02ef601d0e654551f758eea795cc2defe8e0079301bda5e2644bb
+  data.tar.gz: 51a34e9a84543e5d36a709f82332b5a188414ee0425723fb1a25a483574d2ab0bc1b33a60d629d4e055808acdfb982fdc8e0983806e6d4a2ad2c9669479b3106

data/.github/workflows/rake.yml

@@ -0,0 +1,24 @@
+name: Rake
+
+#on: [push, pull_request]
+on: [push]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+#        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+#        ruby: [2.5, 2.6, 2.7, '3.0', head, jruby, jruby-head, truffleruby, truffleruby-head]
+        ruby: [2.7]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

data/.rubocop.yml

@@ -1,79 +1,9 @@
-# inherit_from: .rubocop_todo.yml
-
-# rubocop --auto-gen-config
-# rubocop
-# rubocop:disable all
-
-#inherit_from: .rubocop_todo.yml
+inherit_from:
+  - ~/configs/.rubocop.yml
 
 AllCops:
+  NewCops: enable
   Include:
-    - 'app/**/*.rb'
-    - 'bin/**/*.rb'
-    - 'lib/**/*.rb'
-
-    - 'config/**/*.rb'
-    - 'db/**/*.rb'
     - 'lib/**/*.rb'
-    - 'test/**/*.rb'   # 581 offenses
-    - '**/*.gemfile'
-    - '**/*.gemspec'
-    - '**/*.rake'
-    - '**/*.ru'
-    - '**/Gemfile'
-#    - '**/Rakefile'
-
-#AllCops:
-#  Exclude:
-#    - 'db/**/*'
-#    - 'config/**/*'
-#    - 'script/**/*'
-#    - 'bin/{rails,rake}'
-#    - 'spec/**/*'
-#    - !ruby/regexp /old_and_unused\.rb$/
-
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-
-Layout/AccessModifierIndentation:
-  Enabled: false
-Layout/AlignArray:
-  Enabled: false
-Layout/CommentIndentation:
-  Enabled: false
-Layout/EmptyLinesAroundAccessModifier:
-  Enabled: false
-Layout/EmptyLinesAroundBlockBody:
-  Enabled: false
-Layout/EmptyLinesAroundClassBody:
-  Enabled: false
-Layout/ExtraSpacing:
-  Enabled: false
-Layout/IndentArray:
-  Enabled: false
-Layout/IndentationWidth:
-  Enabled: false
-Layout/LeadingCommentSpace:
-  Enabled: false
-Layout/Tab:
-  Enabled: false
-
-Lint/UnusedBlockArgument:
-  Enabled: false
-
-Style/BlockDelimiters:
-  Enabled: false
-Style/Documentation:
-  Enabled: false
-Style/FormatString:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false
-Style/WhenThen:
   Exclude:
-    - '.watchr'
-
-
-
-
+    - 'test/**/*'

data/.ruby-gemset

@@ -1 +1 @@
-rails-5.2
+rails-6.1

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.1
+ruby-2.7.2

data/.watchr

@@ -16,38 +16,30 @@ end
 
 def run_it(type, file)
   case type
-#  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
-  when 'test';  run %Q{ruby -I test #{file}}
-#  when 'test';  run %Q{rails test #{file}}
-#  when 'spec';  run %Q{spring rspec -X #{file}}
+  when 'test';  run %(bundle exec ruby -I test #{file})
+#  when 'spec';  run %(rspec -X #{file})
   else;         puts "#{H} unknown type: #{type}, file: #{file}"
   end
 end
 
 def run_all_tests
   puts "\n#{HH} Running all tests #{HH}\n"
-#  %w{test spec}.each { |dir| run "spring rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
-#  %w{test}.each { |dir| run "spring rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
-  %w{test}.each { |dir| run "rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
+  %w[test spec].each { |dir| run "bundle exec rake #{dir}" if  File.exist?(dir) }
 end
 
 def run_matching_files(base)
   base = base.split('_').first
-  %w{test spec}.each { |type|
+  %w[test spec].each { |type|
     files = Dir["#{type}/**/*.rb"].select { |file| file =~ /#{base}_.*\.rb/ }
     run_it type, files.join(' ')  unless files.empty?
   }
 end
 
-%w{test spec}.each { |type|
+%w[test spec].each { |type|
   watch("#{type}/#{type}_helper\.rb") { run_all_tests }
+  watch('lib/.*\.rb')                 { run_all_tests }
   watch("#{type}/.*/*_#{type}\.rb")   { |match| run_it type, match[0] }
 }
-%w{rb erb haml slim}.each { |type|
-  watch("app/.*/.*\.#{type}") { |m|
-    run_matching_files("#{m[0].split('/').at(2).split('.').first}")
-  }
-}
 
 # Ctrl-\ or ctrl-4
     Signal.trap('QUIT') { run_all_tests }

data/Appraisals

@@ -0,0 +1,11 @@
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.0'
+end
+
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
+end
+
+#appraise 'rails-5.2' do
+#  gem 'rails', '~> 5.2.0'
+#end

data/Gemfile

@@ -1,14 +1,11 @@
 source 'https://rubygems.org'
-#ruby '2.6.0'
 gemspec
 
 gem 'rails'
 
 group :test do
   gem 'observr'
+  gem 'rubocop', require: false
   gem 'simplecov', require: false
-  gem 'minitest'
-  gem 'sqlite3', '!= 1.4.0'
   gem 'benchmark-ips'
-#  gem 'sqlite3'
 end

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2019-2020 Dittmar Krall - www.matique.com
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,6 +1,5 @@
 # ActWithFlags
 [![Gem Version](https://badge.fury.io/rb/act_with_flags.png)](http://badge.fury.io/rb/act_with_flags)
-[![Build Status](https://travis-ci.org/matique/act_with_flags.png?branch=master)](https://travis-ci.org/matique/act_with_flags)
 
 Required by key.matique.
 

data/Rakefile

@@ -1,23 +1,11 @@
-require "bundler/setup"
-
 require 'rake/testtask'
 
-desc 'Test the act_with_flags plugin.'
-Rake::TestTask.new(:test) do |t|
+desc 'Run the tests.'
+Rake::TestTask.new do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
 
-task :default => :test
-
-
-=begin
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require_relative 'config/application'
-
-Rails.application.load_tasks
-=end
+task default: :test

data/act_with_flags.gemspec

@@ -18,6 +18,11 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'bundler', '~> 1'
-  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'combustion'
+
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'sqlite3'
 end

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+group :test do
+  gem "observr"
+  gem "rubocop", require: false
+  gem "simplecov", require: false
+  gem "benchmark-ips"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0"
+
+group :test do
+  gem "observr"
+  gem "rubocop", require: false
+  gem "simplecov", require: false
+  gem "benchmark-ips"
+end
+
+gemspec path: "../"

data/lib/act_with_flags/admin.rb

@@ -39,14 +39,16 @@ class ActWithFlags::Admin
   end
 
   def position(name)
-    @map[name]
-  end
+    pos = @map[name]
+    return pos  if pos
 
-  def mask(*names)
-    names.inject(0) { |msk, name| msk | ( 1 << position(name) ) }
+    parent = self.model.superclass.act_with_flags
+    return parent.position(name)  if parent
+
+    raise "unknown flag '#{model}##{name}'"
   end
 
-  def all?(*names)
+  def mask(*names)
     names.inject(0) { |msk, name| msk | ( 1 << position(name) ) }
   end
 

data/lib/act_with_flags/define.rb

@@ -4,12 +4,22 @@
 class ActWithFlags::Admin
 
   def add_accessors(origin, accessor, mask)
+#p ["act_with_flags#add_accessors:", model, origin, accessor, mask]
+    unless model.method_defined?(:act_with_flags)
+      model.class_eval %(
+        def act_with_flags
+          #{model}.act_with_flags
+        end
+      )
+    end
+
     model.class_eval %(
       def #{accessor}
         #{accessor}?
       end
 
       def #{accessor}?
+        raise "Uninitialized '#{model}.#{origin}'"  if #{origin}.nil?
         if #{origin}.is_a?(String)
           flags = self.#{origin}.to_i
           !( flags & #{mask} ).zero?
@@ -19,11 +29,12 @@ class ActWithFlags::Admin
       end
 
       def #{accessor}=(value)
+        raise "Uninitialized '#{model}.#{origin}'"  if #{origin}.nil?
         is_a_string = #{origin}.is_a?(String)
         flags = is_a_string ? self.#{origin}.to_i : self.#{origin}
         flags ||= 0
 
-        result = self.class.act_with_flags.to_boolean(value)
+        result = self.act_with_flags.to_boolean(value)
         if result
           flags |= #{mask}
         else

data/lib/act_with_flags/utils.rb

@@ -1,5 +1,4 @@
-# xrubocop:disable all
-# xfrozen_string_literal: true
+# rubocop: disable all
 
 class ActWithFlags::Admin
 
@@ -46,7 +45,7 @@ class ActWithFlags::Admin
     names.each { |name|
       remove_accessor name
     }
-    self.reset_model model
+    reset_model model
   end
 
 end

data/lib/act_with_flags/version.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+# rubocop: disable all
 
 module ActWithFlags
-  VERSION = '0.0.6'     # 2019-03-08
-#  VERSION = '0.0.5'     # 2019-03-05
-#  VERSION = '0.0.4'     # 2019-03-03
-#  VERSION = '0.0.3'     # 2019-03-01
-#  VERSION = '0.0.2'     # 2019-02-28
-#  VERSION = '0.0.1'     # 2019-02-24
+  VERSION = '0.2.4'     # 2021-06-21
+# VERSION = '0.2.3'     # 2020-07-14
+# VERSION = '0.2.2'     # 2020-04-27
+# VERSION = '0.2.1'     # 2020-03-01
+# VERSION = '0.2.0'     # 2019-10-04
+# VERSION = '0.1.0'     # 2019-04-07
 end

data/test/any_all_none_test.rb

@@ -1,7 +1,9 @@
+# rubocop: disable all
+
 require 'test_helper'
 
 describe 'any? all? and none?' do
-  let(:order) { Order.new }
+  let(:order) { Order.create }
 
   def setup
     reset_order
@@ -30,7 +32,7 @@ describe 'any? all? and none?' do
   end
 
   it 'checks none? #2' do
-    order.a = order.b =  true
+    order.a = order.b = true
     refute order.flags_none?(:a, :b)
     order.a = false
     refute order.flags_none?(:a, :b)

data/test/clear_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 describe 'Clear Flags at Save' do
   let(:admin) { Order.act_with_flags }
-  let(:order) { Order.new }
+  let(:order) { Order.create }
 
   def setup
     reset_order

data/test/inheritance_any_test.rb

@@ -0,0 +1,56 @@
+# rubocop: disable all
+
+require 'test_helper'
+
+class A < Order
+  add_to_flags y: 2
+end
+
+describe 'inheritance' do
+  let(:a) { A.create }
+
+  def setup
+    reset_order
+    Order.add_to_flags x: 1
+  end
+
+  it 'consistency' do
+    assert a.respond_to?(:x)
+    assert a.respond_to?(:y)
+    assert_equal false, a.x
+    assert_equal false, a.y
+    a.y = true
+    assert_equal true, a.y
+  end
+
+  it 'checks any?' do
+    a.x = true
+    assert a.flags_any?(:x, :y)
+    a.x = false
+    refute a.flags_any?(:x, :y)
+  end
+
+  it 'checks any? #2' do
+    a.y = true
+    assert a.flags_any?(:x, :y)
+    a.y = false
+    refute a.flags_any?(:x, :y)
+  end
+
+  it 'checks all?' do
+    a.x = a.y = true
+    assert a.flags_all?(:x, :y)
+    a.x = false
+    refute a.flags_all?(:x, :y)
+  end
+
+  it 'checks none? #2' do
+    a.x = a.y = true
+    refute a.flags_none?(:x, :y)
+    a.x = false
+    refute a.flags_none?(:x, :y)
+    a.y = false
+    assert a.flags_none?(:x, :y)
+  end
+
+end

data/test/inheritance_test.rb

@@ -0,0 +1,73 @@
+# rubocop: disable all
+
+require 'test_helper'
+
+class A < Order
+end
+
+class B < Order
+  add_to_flags y: 2
+end
+
+class C < Order
+  before_create { |row|  row.flags2 = 0 }
+
+  attr_accessor :flags2
+  add_to_flags z: 3, origin: :flags2
+end
+
+describe 'inheritance' do
+  let(:admina) { A.act_with_flags }
+  let(:adminb) { B.act_with_flags }
+
+  let(:a) { A.create }
+  let(:b) { B.create }
+  let(:c) { C.create }
+
+  def setup
+    reset_order
+    Order.add_to_flags x: 1
+  end
+
+  it 'inheritance #1' do
+    assert a.respond_to?(:flags)
+    assert a.respond_to?(:x)
+    assert_equal 0, a.flags
+    assert_equal false, a.x
+  end
+
+  it 'inheritance #2' do
+    a.x = false
+    assert_equal false, a.x
+    a.x = true
+    assert_equal true, a.x
+    assert_equal 0x02, a.flags
+  end
+
+  it 'inheritance #3' do
+    assert b.respond_to?(:flags)
+    assert b.respond_to?(:x)
+    assert b.respond_to?(:y)
+    assert_equal 0, b.flags
+    assert_equal false, b.x
+    assert_equal false, b.y
+    b.x = true
+    assert_equal true, b.x
+    b.y = true
+    assert_equal true, b.y
+    assert_equal 0x06, b.flags
+  end
+
+  it 'inheritance #4' do
+    assert c.respond_to?(:x)
+    assert c.respond_to?(:z)
+    assert_equal false, c.z
+    c.x = true
+    assert_equal true, c.x
+    c.z = true
+    assert_equal true, c.z
+    assert_equal 0x02, c.flags
+    assert_equal 0x08, c.flags2
+  end
+
+end

data/test/internal/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link_tree ../images

data/test/internal/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery with: :exception
+end

data/test/internal/app/controllers/orders_controller.rb

@@ -0,0 +1,16 @@
+class OrdersController < ApplicationController
+
+  def index
+    @orders = Order.all
+  end
+
+  def new
+    @order = Order.new
+  end
+
+  def show
+    Order.create :name => 'hugo'
+    @order = Order.find(params[:id])
+  end
+
+end

data/test/internal/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/test/internal/app/models/order.rb

@@ -0,0 +1,9 @@
+class Order < ApplicationRecord
+
+  before_save do |row|
+    row.flags ||= 0
+    row.bigflags ||= ''
+    row.errors.add :base, 'panic'  if row.name == 'error'
+  end
+
+end

data/test/internal/app/views/layouts/application.html.erb

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%#= stylesheet_link_tag    "application" %>
+  <%#= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+  <%= yield %>
+</body>
+</html>

data/test/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/test.sqlite3

data/test/internal/config/routes.rb

@@ -0,0 +1,4 @@
+Rails.application.routes.draw do
+  resources :orders
+  root :to => 'orders#index'
+end

data/test/internal/config/secrets.yml

@@ -0,0 +1,8 @@
+development:
+  secret_key_base: e0759094af00bb172148ef71ce3bfd3cb8ad688628bee51dd596b3c2e84aaf37b94136e5fe9d35e8685e4fcc1b145a3568d0675fdf88fa77751e405d454a80d5
+
+test:
+  secret_key_base: ad8df0f94e834515e076f0259050f9dc722286a1d305cf4e650242c63cfe6f1a451c4c135e833c90b854720ebd38d741cdb50b9541ab6c505d45559cb5af62b0
+
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/test/internal/db/schema.rb

@@ -0,0 +1,13 @@
+ActiveRecord::Schema.define(version: 201910) do
+
+  create_table "orders", force: true do |t|
+    t.string   "name"
+    t.string   "qty"
+    t.integer  "flags"
+    t.text     "bigflags"
+    t.integer  "category"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+end

data/test/internal_benchmark_test.rb

@@ -8,7 +8,7 @@ require 'benchmark/ips'
 # ENV['MORE'] = 'true'
 
 describe 'Internal timings' do
-  let(:order) { Order.new }
+  let(:order) { Order.create }
 
   def setup
     reset_order
@@ -18,9 +18,6 @@ describe 'Internal timings' do
   it 'times ips' do
     return  unless ENV['MORE']
 
-    Order.add_to_flags :blocked, reset: :hard
-    order = Order.new
-
     Benchmark.ips do |x|
       x.report('assign true : ')        { order.blocked = true }
       x.report('assign false: ')        { order.blocked = false }
@@ -42,12 +39,12 @@ class BenchFoo < Minitest::Benchmark
     n = 1_000_000
     n = 100_000
     n = 10_000
-    Order.add_to_flags :blocked, reset: :hard
-    order = Order.new
+    Order.add_to_flags :blocked2
+    order = Order.create
     assert_performance_constant do |input|
       n.times do
-        order.blocked = true
-        order.blocked = !order.blocked
+        order.blocked2 = true
+        order.blocked2 = !order.blocked2
       end
     end
   end

data/test/internal_check_add_test.rb

@@ -29,4 +29,8 @@ describe 'Internal check add flag' do
     puts res  if ENV['MORE']
   end
 
+  it 'coverage position raise' do
+    assert_raises { admin.position(:aaaa) }
+  end
+
 end

data/test/internal_null_test.rb

@@ -16,9 +16,9 @@ describe 'Internal Null' do
   it 'tests to_boolean' do
     assert admin.to_boolean(true)
     refute admin.to_boolean(false)
-    assert_raises { flags.to_boolean(nil) }
-    assert_raises { flags.to_boolean(2) }
-    assert_raises { flags.to_boolean('unknown') }
+    assert_raises { admin.to_boolean(nil) }
+    assert_raises { admin.to_boolean(2) }
+    assert_raises { admin.to_boolean('unknown') }
   end
 
   it 'tests a simple administration: names' do

data/test/internal_one_test.rb

@@ -1,3 +1,5 @@
+# rubocop: disable all
+
 require 'test_helper'
 
 describe 'Internal One Flag' do

data/test/legacy_test.rb

@@ -2,7 +2,7 @@
 require 'test_helper'
 
 describe 'Legacy Flag' do
-  let(:order) { Order.new }
+  let(:order) { Order.create }
 
   def setup
     reset_order

data/test/one_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 describe 'One Flag' do
   let(:flag)  { :blocked }
-  let(:order) { Order.new }
+  let(:order) { Order.create }
 
   def setup
     reset_order

data/test/origin_test.rb

@@ -1,3 +1,5 @@
+# rubocop: disable all
+
 require 'test_helper'
 
 describe 'Testing origin' do

data/test/remove_from_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 describe 'Delete from Flags' do
-  let(:order) { Order.new }
+  let(:order) { Order.create }
 
   def setup
     reset_order

data/test/reset_test.rb

@@ -10,7 +10,7 @@ describe 'Testing reset' do
 
   it 'reset hard' do
     refute_equal [], Order.add_to_flags.names
-    Order.act_with_flags.reset  if Order.act_with_flags
+    Order.act_with_flags&.reset
     assert_equal [], Order.add_to_flags.names
   end
 

data/test/test_helper.rb

@@ -1,35 +1,18 @@
-# rubocop:disable all
-
-if ENV['MORE']
+if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start do
-    add_filter 'test'
+    add_filter '/test/'
   end
 end
 
-require 'rubygems'
+require "combustion"
+Combustion.path = "test/internal"
+Combustion.initialize! :active_record
+
+require 'rails/test_help'
 require 'minitest/autorun'
 require 'minitest/benchmark'
-require 'active_record'
-require_relative '../lib/act_with_flags.rb'
-
-ENV['RAILS_ENV'] ||= 'test'
-
-ActiveRecord::Base.establish_connection(
-  adapter:  'sqlite3',
-  database: 'db/flags.sqlite3'
-)
-
-ActiveRecord::Schema.define do
-  create_table 'orders', force: true do |t|
-    t.integer :flags
-    t.string  :bigflags
-    t.integer :category
-  end
-end
-
-class Order < ActiveRecord::Base
-end
+#require 'capybara/rails'
 
 def reset_order
   Order.act_with_flags.reset  if Order.act_with_flags

metadata

@@ -1,43 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: act_with_flags
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.2.4
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2021-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: combustion
+  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: minitest
+  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
+    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: Handles flags in a Rails model instance
 email:
 - dittmar.krall@matique.de
@@ -45,18 +101,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - ".watchr"
+- Appraisals
 - Gemfile
 - Gemfile.lock
-- LICENSE
+- MIT-LICENSE
 - README.md
 - Rakefile
 - act_with_flags.gemspec
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/act_with_flags.rb
 - lib/act_with_flags/admin.rb
 - lib/act_with_flags/define.rb
@@ -65,6 +124,18 @@ files:
 - lib/act_with_flags/version.rb
 - test/any_all_none_test.rb
 - test/clear_test.rb
+- test/inheritance_any_test.rb
+- test/inheritance_test.rb
+- test/internal/app/assets/config/manifest.js
+- test/internal/app/controllers/application_controller.rb
+- test/internal/app/controllers/orders_controller.rb
+- test/internal/app/models/application_record.rb
+- test/internal/app/models/order.rb
+- test/internal/app/views/layouts/application.html.erb
+- test/internal/config/database.yml
+- test/internal/config/routes.rb
+- test/internal/config/secrets.yml
+- test/internal/db/schema.rb
 - test/internal_benchmark_test.rb
 - test/internal_check_add_test.rb
 - test/internal_null_test.rb
@@ -97,13 +168,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: act_with_flags gem
 test_files:
 - test/any_all_none_test.rb
 - test/clear_test.rb
+- test/inheritance_any_test.rb
+- test/inheritance_test.rb
+- test/internal/app/assets/config/manifest.js
+- test/internal/app/controllers/application_controller.rb
+- test/internal/app/controllers/orders_controller.rb
+- test/internal/app/models/application_record.rb
+- test/internal/app/models/order.rb
+- test/internal/app/views/layouts/application.html.erb
+- test/internal/config/database.yml
+- test/internal/config/routes.rb
+- test/internal/config/secrets.yml
+- test/internal/db/schema.rb
 - test/internal_benchmark_test.rb
 - test/internal_check_add_test.rb
 - test/internal_null_test.rb

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-sudo: false
-
-bundler_args: --without production
-#before_install:
-#- gem update bundler --no-document
-#- gem update bundler --no-rdoc --no-ri
-script: "bundle exec rake test"
-
-rvm:
-  - 2.6.1
-
-gemfile:
-#  - gemfiles/rails_5.2.gemfile
-
-matrix:
-
-notifications:
-  email: false

data/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Dittmar Krall (matique UG)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.