act_with_flags 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 221715b794f43b86fcb22bf60ed2210fdbbe2f1b9ea3a2c1c8a3098491c60be9
-  data.tar.gz: ad7bfb08b82488721f8f315ff26fd87d186f519e82286752c63a0442a4d3673e
+  metadata.gz: 201441930c834655273f61a9d668719ec8c593860e809046fd0a87e2e0176ad6
+  data.tar.gz: 6ceedc612ac77520f452fdff9fa677cefca05823d20df69a8c041429cbb1c086
 SHA512:
-  metadata.gz: 453786e6810c3c9e4c2f60088c09d8fc131cea925273ccb7ab71aafb7023fb7c77befde949858a595885727ec0c1cecd39291fbde8b3ae40bca4e46a4a9a6eff
-  data.tar.gz: 372d91ba5bc93731aac241a0d8a1c483488e5c63182ff47f0c0b1b2a4afe0cc6eaa8c62398fdbc7bd68ee1a362d008deb9af3b9b1bc85a2f8b1f095662424226
+  metadata.gz: 549172ca342128d6b23d880beb1aadd662db77d7f8df6f98c10ac4b6c97a7b57d38ca72b27cde97c5952fecbb63a6cce0f3a3743c1e1e67456c466ffcf621ba6
+  data.tar.gz: 9f0a8a843e4c76f308205d4b3d9c38a96e21ba5f5d7af6b6a48fead025237440beace8f951108f930d09def6ddd1b554f2a82a5b2d2ed66efd22244d983c6132

data/Gemfile

@@ -5,10 +5,9 @@ gemspec
 gem 'rails'
 
 group :test do
+  gem 'minitest'
   gem 'observr'
   gem 'simplecov', require: false
-  gem 'minitest'
-  gem 'sqlite3', '!= 1.4.0'
+  gem 'sqlite3'
   gem 'benchmark-ips'
-#  gem 'sqlite3'
 end

data/act_with_flags.gemspec

@@ -18,6 +18,6 @@ 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'
 end

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,6 +1,3 @@
-# xrubocop:disable all
-# xfrozen_string_literal: true
-
 class ActWithFlags::Admin
 
   def add_accessor(name, pos)

data/lib/act_with_flags/version.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module ActWithFlags
-  VERSION = '0.0.7'     # 2019-03-23
+  VERSION = '0.1.0'     # 2019-04-07
+#  VERSION = '0.0.7'     # 2019-03-23
 #  VERSION = '0.0.6'     # 2019-03-08
 #  VERSION = '0.0.5'     # 2019-03-05
 #  VERSION = '0.0.4'     # 2019-03-03

data/test/any_all_none_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 describe 'any? all? and none?' do
-  let(:order) { Order.new }
+  let(:order) { Order.create }
 
   def setup
     reset_order

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,54 @@
+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,71 @@
+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_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/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/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/test_helper.rb

@@ -1,10 +1,8 @@
 # rubocop:disable all
 
-if ENV['MORE']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter 'test'
-  end
+require 'simplecov'
+SimpleCov.start do
+  add_filter 'test'
 end
 
 require 'rubygems'
@@ -29,6 +27,10 @@ ActiveRecord::Schema.define do
 end
 
 class Order < ActiveRecord::Base
+  before_create { |row|
+    row.flags ||= 0
+    row.bigflags ||= ''
+  }
 end
 
 def reset_order

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: act_with_flags
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-04-07 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'
 description: Handles flags in a Rails model instance
 email:
 - dittmar.krall@matique.de
@@ -65,6 +65,8 @@ 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_benchmark_test.rb
 - test/internal_check_add_test.rb
 - test/internal_null_test.rb
@@ -97,13 +99,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 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_benchmark_test.rb
 - test/internal_check_add_test.rb
 - test/internal_null_test.rb