act_with_bag 0.5.6 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9d944ab63f66ac27dbe26f203d382255df7c6acde3559338cb1f05cb3dd420d
-  data.tar.gz: e1eabac9f4a018bf19c82d9efcff941d540a50a49099504cf70b88dedceb8dd6
+  metadata.gz: 3db0e2b3144028775d4671056b9aff91b6f48d4843a056fdc0e42bc115a18a86
+  data.tar.gz: 83a536b2e3a296c5d1bb50de2e4dee584327c8d6b0ba9e2d608d0018259e811d
 SHA512:
-  metadata.gz: f3d27f9b7ca2f6ceed944e6150faf92ed2414b537d50ebdbef7b87e5558a3315f1e32c7c2910b6201857e871850f8af25dae5932342946f630f41abe108cbd0d
-  data.tar.gz: 61492eb20e6b1ddb96086c5e03db7e30734cb3067619cb0d9a58144ac30c9905586f1e55caee67eaf06a4a778b6e8320fd084758fc5174bf297b25bd07b3f7d5
+  metadata.gz: 8178f176d4cefe6bfdf990ef3d1d40310b866d5a18e36757a291c8ae490c312d5a41fe5be1380f7e66af1ff780015d1c6ea0fd57562bc413f75ce5ad048b85e5
+  data.tar.gz: 6b56cdf9bce4b173112d50cc8e167bb022994c0877edfbc665bdeab8b3ba7618f0813a929d4e29480bef8f581283d1c4a55b556a3f7b7c05bafe2515cae2ad40

data/.github/workflows/rake.yml

@@ -0,0 +1,26 @@
+# under construction
+
+name: Rake
+
+on: push
+
+jobs:
+  test:
+    name: Rake
+#    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Setup Ruby
+#      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+
+    - name: Install dependencies
+      run: gem install bundler && bundle install --jobs 4 --retry 3
+
+    - name: Run Rake
+      run: rake

data/.gitignore

@@ -1,11 +1,10 @@
-*.sqlite3
-
 .bundle/
 coverage/
-pkg/
-test/internal/db/*.sqlite3
 
 *.gem
 *.log
 *.lock
-test/internal/tmp/
+*.sqlite3
+**/*.gem
+**/*.log
+**/*.lock

data/.rubocop.yml

@@ -0,0 +1,30 @@
+inherit_from:
+  - ~/configs/.rubocop.yml
+
+AllCops:
+  Include:
+    - 'lib/**/*.rb'
+  Exclude:
+    - 'test/**/*'
+
+Layout/AccessModifierIndentation:
+  Enabled: false
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: false
+Layout/ExtraSpacing:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/EvalWithLocation:
+  Enabled: false
+Style/RescueModifier:
+  Exclude:
+    - 'lib/act_with_bag.rb'

data/.ruby-gemset

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

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.1
+ruby-2.7.2

data/.watchr

@@ -16,37 +16,30 @@ end
 
 def run_it(type, file)
   case type
-#  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
-  when 'test';  run %Q{rails test #{file}}
-#  when 'spec';  run %Q{spring rspec -X #{file}}
+  when 'test';  run %(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 "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

@@ -1,14 +1,24 @@
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1'
+  gem 'dryer-config', '~> 6.0'
+end
+
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0'
+  gem 'dryer-config', '~> 6.0'
+end
+
+#appraise 'rails-5.2' do
+#  gem 'rails', '~> 5.2.0'
+#  gem 'dryer-config', '~> 5.2.0'
+#end
+
 #appraise 'rails-5.0' do
 #  gem 'rails', '~> 5.0.0'
 #  gem 'dryer-config', '~> 5.0.0'
 #end
 
-appraise 'rails-5.1' do
-  gem 'rails', '~> 5.1.0'
-  gem 'dryer-config', '~> 5.1.0'
-end
-
-appraise 'rails-5.2' do
-  gem 'rails', '~> 5.2.0'
-  gem 'dryer-config', '~> 5.2.0'
-end
+#appraise 'rails-4.1' do
+#  gem 'rails', '= 4.1.1'
+##  gem 'dryer-config', '~> 5.1.0'
+#end

data/Gemfile

@@ -1,14 +1,11 @@
-source "https://rubygems.org"
-#ruby '2.6.0'
+source 'https://rubygems.org'
 gemspec
 
 gem 'rails'
 
 group :test do
   gem 'observr'
+  gem 'rubocop', require: false
   gem 'simplecov', require: false
-  gem 'minitest'
   gem 'capybara'
-  gem 'sqlite3', '~> 1.3.6'
-#  gem 'slim'
 end

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2010-2021 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,13 +1,12 @@
 ActWithBag
 ==========
 [![Gem Version](https://badge.fury.io/rb/act_with_bag.png)](http://badge.fury.io/rb/act_with_bag)
-[![Build Status](https://travis-ci.org/matique/act_with_bag.png?branch=master)](https://travis-ci.org/matique/act_with_bag)
 
 In Gemfile:
 
     gem 'act_with_bag'
 
-Bag helps when fields in a table are not yet settled down
+Bag helps when fields in a Rails database table are not yet settled down
 or when many fields without business logic are required.
 
 Install (migrate) one bag as a text field in a table to collect many fields.
@@ -92,4 +91,4 @@ Test
 
     rake
 
-Copyright (c) 2009-2019 [Dittmar Krall], released under the MIT license
+Copyright (c) 2009-2020 [Dittmar Krall], released under the MIT license

data/Rakefile

@@ -1,13 +1,11 @@
-require "bundler/setup"
-
 require 'rake/testtask'
 
-desc 'Test the act_with_bag 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
+task default: :test

data/act_with_bag.gemspec

@@ -18,7 +18,10 @@ 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', '~> 2'
+
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'sqlite3'
 end

data/gemfiles/{rails_5.1.gemfile → rails_6.0.gemfile}

@@ -2,15 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
-gem "dryer-config", "~> 5.1.0"
+gem "rails", "~> 6.0"
+gem "dryer-config", "~> 6.0"
 
 group :test do
   gem "observr"
+  gem "rubocop", require: false
   gem "simplecov", require: false
-  gem "minitest"
   gem "capybara"
-  gem "sqlite3", "~> 1.3.6"
 end
 
 gemspec path: "../"

data/gemfiles/{rails_5.2.gemfile → rails_6.1.gemfile}

@@ -2,15 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.0"
-gem "dryer-config", "~> 5.2.0"
+gem "rails", "~> 6.1"
+gem "dryer-config", "~> 6.0"
 
 group :test do
   gem "observr"
+  gem "rubocop", require: false
   gem "simplecov", require: false
-  gem "minitest"
   gem "capybara"
-  gem "sqlite3", "~> 1.3.6"
 end
 
 gemspec path: "../"

data/lib/act_with_bag.rb

@@ -1,90 +1,94 @@
-class << ActiveRecord::Base
+# frozen_string_literal: true
 
+class << ActiveRecord::Base
   def add_to_bag(*baglets)
-#p "baglets #{baglets.inspect}"
+    # p "baglets #{baglets.inspect}"
     serialize :bag, Hash
 
-    self.class_eval %{
+    class_eval %{
       def bag=(x)
-	#bag changes disabled as it must be handled by Bag himself
+        #bag changes disabled as it must be handled by Bag himself
       end
     }
 
     @baggies_date ||= {}
-    baglets.each {|b|
+    baglets.each { |b|
       if b.is_a?(Hash)
-	b.each {|baggie, type|
-	  add_accessor(baggie, type)
-	}
+        b.each { |baggie, type|
+          add_accessor(baggie, type)
+        }
       else
-	add_accessor(b, :field)
+        add_accessor(b, :field)
       end
     }
   end
 
   def delete_from_bag(*baglets)
-#p "delete_from_bag baglets #{baglets.inspect}"
+    # p "delete_from_bag baglets #{baglets.inspect}"
 
-    self.class_eval %{
+    class_eval %{
       before_save do
-	#{baglets}.each {|b|
-	  if b.is_a?(Hash)
-	    b.each {|baggie, type|
-	      self.bag.delete(baggie.to_sym)
-	    }
-	  else
-	    self.bag.delete(b.to_sym)
-	  end
-	}
+        #{baglets}.each { |b|
+          if b.is_a?(Hash)
+            b.each { |baggie, type|
+              self.bag.delete(baggie.to_sym)
+            }
+          else
+            self.bag.delete(b.to_sym)
+          end
+        }
       end
     }
-
   end
 
-  def merge(bag, params)
-    model = self.to_s.underscore.to_sym
+  def merge(_bag, params)
+    model = to_s.underscore.to_sym
     return params unless params[model]
 
-    (@baggies_date || {}).each {|baggie, type|
-      res, found, stopped = [], false, false
-      (1..3).each {|i|
-	p = params[model].delete("#{baggie}(#{i}i)")
-	break if p.nil?
-	found = true
-	stopped = true if p.empty?
-	res << p.to_i unless stopped
+    (@baggies_date || {}).each { |baggie, _type|
+      res = []
+      found = false
+      stopped = false
+      (1..3).each { |i|
+        p = params[model].delete("#{baggie}(#{i}i)")
+        break if p.nil?
+
+        found = true
+        stopped = true if p.empty?
+        res << p.to_i unless stopped
       }
       next unless found
-  ## weird Timestamp, Hash and YAML problem
+
+      ## weird Timestamp, Hash and YAML problem
       res = [0]  if res == []
       res[0] = 0  unless res[0] >= 0
 
-      value = Date.new(*res) rescue value = nil
+      value = Date.new(*res) rescue nil
       params[model][baggie] = value
     }
     params
   end
 
-
  protected
   def accessor_present?(accessor)
     accessor_sym = accessor.to_sym
     res = false
 
-    res = true  if self.method_defined?(accessor_sym)
-    res = true  if self.respond_to?(:attribute_names) &&
-		   self.attribute_names.include?(accessor)
+    res = true  if method_defined?(accessor_sym)
+    res = true  if respond_to?(:attribute_names) &&
+                   attribute_names.include?(accessor)
     if res
-#      logger.info "** Already defined #{self.to_s}.#{accessor}"
-#p "** act_to_bag: untouched accessor '#{self.to_s}.#{accessor}'"
+      #      logger.info "** Already defined #{self.to_s}.#{accessor}"
+      # p "** act_to_bag: untouched accessor '#{self.to_s}.#{accessor}'"
     end
-    return res
+    res
   end
 
   def add_accessor(baggie, type)
     accessor = baggie.to_s
     return  if accessor_present?(accessor)
-#MARS patch, new:
+
+    # MARS patch, new:
     #
     # The @baggies field is indispensable. Otherwise mistakes in renaming
     # or deleting baggies (without renaming/deleting) the value entry from the
@@ -94,69 +98,66 @@ class << ActiveRecord::Base
     # doing completely other things (e. g. accessing a database column).
     #
     @baggies ||= {}
-    baggies = ( @baggies[self.to_s.underscore.to_sym] ||= {} )
-    baggies[ baggie ] = type
-#END
+    baggies = (@baggies[to_s.underscore.to_sym] ||= {})
+    baggies[baggie] = type
+    # END
 
     type_sym = type.to_sym
     typing = {integer: '.to_i', float: '.to_f',
-	      string: '.to_s'}[type_sym] || ''
-#p "add_accessor #{self.to_s} #{baggie.inspect} #{type_sym.inspect}"
+              string: '.to_s'}[type_sym] || ''
+    # p "add_accessor #{self.to_s} #{baggie.inspect} #{type_sym.inspect}"
 
     @baggies_date[baggie] = type  if type_sym == :date
 
-    unless type_sym == :boolean
-      self.class_eval %{
-	def #{accessor}
-	  self.bag && self.bag[:#{baggie}]
-	end
-      }
-
-      self.class_eval %{
-	def #{accessor}=(value)
-	  @attributes['bag'] = {}  unless bag.is_a?(Hash)
-	  unless value.nil?
-	    self.bag[:#{baggie}] = value#{typing}
-	  else
-	    self.bag.delete(:#{baggie})
-	    nil
-	  end
-	end
-      }
-
-    else   ################ now boolean handling ###################
-
-      self.class_eval %{
-	def #{accessor}
-	  res = bag && bag[:#{baggie}]
-	  return res if res.class == FalseClass
-	  return res if res.class == TrueClass
-	  return res.to_i != 0
-	  res
-	end
-      }
-
-      self.class_eval %{
-	def #{accessor}=(value)
-	  @attributes['bag'] = {}  unless bag.is_a?(Hash)
-	  falsys = [false, "false", 0, "0", nil]
-	  unless falsys.include?(value)
-	    self.bag[:#{baggie}] = (value == 'true') || value
-	  else
-	    self.bag.delete(:#{baggie})
-	    nil
-	  end
-	end
-      }
-
-      self.class_eval %{
-	def #{accessor}?
-	  #{accessor}
-	end
-      }
-
+    if type_sym == :boolean
+      class_eval %(
+        def #{accessor}
+          res = bag && bag[:#{baggie}]
+          return res if res.class == FalseClass
+          return res if res.class == TrueClass
+          return res.to_i != 0
+          res
+        end
+      )
+
+      class_eval %(
+        def #{accessor}=(value)
+          @attributes['bag'] = {}  unless bag.is_a?(Hash)
+          falsys = [false, "false", 0, "0", nil]
+          unless falsys.include?(value)
+            self.bag[:#{baggie}] = (value == 'true') || value
+          else
+            self.bag.delete(:#{baggie})
+            nil
+          end
+        end
+      )
+
+      class_eval %(
+        def #{accessor}?
+          #{accessor}
+        end
+      )
+
+    else
+
+      class_eval %(
+        def #{accessor}
+          self.bag && self.bag[:#{baggie}]
+        end
+      )
+
+      class_eval %(
+        def #{accessor}=(value)
+          @attributes['bag'] = {}  unless bag.is_a?(Hash)
+          unless value.nil?
+            self.bag[:#{baggie}] = value#{typing}
+          else
+            self.bag.delete(:#{baggie})
+            nil
+          end
+        end
+      )
     end
-
   end
-
 end

data/lib/act_with_bag/version.rb

@@ -1,4 +1,12 @@
+# rubocop: disable all
+
 module ActWithBag
-  VERSION = '0.5.6'     # 2019-02-15
-#  VERSION = '0.5.5'
+  VERSION = '1.0.4'     # 2021-06-17
+# VERSION = '1.0.3'     # 2021-05-18
+# VERSION = '1.0.2'     # 2020-07-16
+# VERSION = '1.0.1'     # 2020-04-27
+# VERSION = '1.0.0'     # 2019-09-27
+# VERSION = '0.5.7'     # 2019-03-05
+# VERSION = '0.5.6'     # 2019-02-15
+# VERSION = '0.5.5'
 end

data/test/test_helper.rb

@@ -1,13 +1,16 @@
-require 'simplecov'
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/test/'
+  end
+end
 
-require 'rubygems'
+#require 'rails/test_help'
 require 'minitest/autorun'
-require 'active_record'
+require 'minitest/benchmark'
+#require 'capybara/rails'
 
-SimpleCov.start do
-  add_filter 'test'
-  command_name 'Minitest'
-end
+require 'active_record'
 
 ActiveRecord::Base.establish_connection({
   adapter:  'sqlite3',

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: act_with_bag
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 1.0.4
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2021-06-17 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
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !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: Add a bag to a Rails model
 email:
 - dittmar.krall@matique.de
@@ -59,18 +87,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rake.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - ".watchr"
 - Appraisals
 - Gemfile
+- MIT-LICENSE
 - README.md
 - Rakefile
 - act_with_bag.gemspec
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/act_with_bag.rb
 - lib/act_with_bag/version.rb
 - test/accessor_test.rb
@@ -102,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: act_with_bag (baggies) gem

data/.travis.yml

@@ -1,28 +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.0
-  - 2.5.1
-#  - 1.9.3
-##  - 2.2.3
-#  - 2.3.1
-##  - 2.4.1
-
-gemfile:
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_5.1.gemfile
-
-matrix:
-#  exclude:
-#    - rvm: 2.2.3
-#      env: "RAILS_VERSION=3.2.16"
-
-notifications:
-  email: false