act_with_bag 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 330c7550cfb054044f0b55af218d2583ec0355d4b90b2ef89524a6fc381e0f6c
-  data.tar.gz: 27af83366874a66054ff502b1d47f64affa30ce796a8e04b1a89a464806f3b27
+  metadata.gz: 4f63fb96d66263716e8ba07368225c04c756521812bddeae7660e59b359d39b4
+  data.tar.gz: 17e357dd8bb99e77e71c5b5a5589344a83debc7c6489fdf8ff7b74c6442ae9ad
 SHA512:
-  metadata.gz: 501bcab6bb29bc4b62d86c3a1f64a039f50cf3b5f6fab2eaabb8ff1b31027b9196e72149ea0233c6754da8062ab106974288dc86d1321f9ac7095fa3ebed4929
-  data.tar.gz: b8d72ad5b40959d229a61ec155d611d24da84d4aa33ced4dc1b87700055c6fceb2d56f9c627c46e49cabd0a81415a9d07689fa24ea3bb0f7c4fbf162a33f31d4
+  metadata.gz: fb0ca13797f98d2475d06ddd4299b0f1b91abad2556853ac3b7a93326f8bbe238fa1055f6bdd218b460571674e6abae1a09d2a6c4eeee2d94c8ca75841f22c7b
+  data.tar.gz: 9ce019e70d1bb2a5523721656cc44b51100c552b0af7d903e03193746c5ef0b19602efa0fb9221134e6e446f39bf3402bbd74d7135ccc8f0e418bda7d3bbb8e9

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-version

@@ -1 +1 @@
-ruby-2.6.4
+ruby-2.6.6

data/.travis.yml

@@ -8,7 +8,9 @@ bundler_args: --without production
 script: "bundle exec rake test"
 
 rvm:
-  - 2.6.4
+  - 2.6.6
+#  - 2.6.5
+#  - 2.6.4
 #  - 2.6.3
 #  - 2.6.1
 #  - 2.6.0

data/.watchr

@@ -16,37 +16,30 @@ end
 
 def run_it(type, file)
   case type
-  when 'test';  run %Q{ruby -I"lib:test" -r 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/Gemfile

@@ -1,11 +1,11 @@
-source "https://rubygems.org"
+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'
-#  gem 'slim'
 end

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2010-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

@@ -7,7 +7,7 @@ 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 +92,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,8 +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 'rails'
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'bundler', '~>1'
+  s.add_development_dependency 'rake', '~>13'
   s.add_development_dependency 'appraisal', '~> 2'
+
+  s.add_development_dependency 'minitest', '~> 5.0'
+  s.add_development_dependency 'sqlite3', '~> 1'
 end

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,6 +1,10 @@
+# rubocop: disable all
+
 module ActWithBag
-  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'
+  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,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: act_with_bag
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Add a bag to a Rails model
 email:
 - dittmar.krall@matique.de
@@ -74,12 +88,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - ".watchr"
 - Appraisals
 - Gemfile
+- MIT-LICENSE
 - README.md
 - Rakefile
 - act_with_bag.gemspec
@@ -118,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: act_with_bag (baggies) gem