code-box 1.1.3 → 2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d38d11fd72eecfe95c9addc855d4ddaf964663342e4e8f46822fda84518f67
-  data.tar.gz: 0131057470abd1e47400b93b812e712c5adc3e1a291a84003624e7ab5519b647
+  metadata.gz: b5afe4ddbba5d1d56cbc3138bf18f2f90362bbe847c1012f70f4e20246d6605b
+  data.tar.gz: d193e966b4d7aad65ac25e03ebe8b7c4ccebcf17b5581b292840b12118c93540
 SHA512:
-  metadata.gz: db8c592630921f36d79000ae7c2062644fe112d33b3afec5c7b4d5d8b17881d038becf40fcfcadc9cf59eda1fc58206dcb88e2c4432294fa72dbc751f13e9563
-  data.tar.gz: 83379416834c3d6b237b1ea0399454d54cb828bde2b7afd020c34d21d9570f0b2f7d525977e18b4094ca011bf94fba376ccf7326435829ab8c455d96539c586f
+  metadata.gz: 53f339272afdd05eb062555f81a9a145308d060eaef3252cca5bd5e66c9526191b616332d07d1eeb6871c2a7972b714d6474ade829e2f075a582110117a9ab4a
+  data.tar.gz: 5d80e4739ef4722b273e34ae6321e40d9c3e3e684587b797437ad3bd10931ec64237e36809f2757c97a9cd608ccc933b2d79d1e94ee22d9ec322e7115ad0cab7

data/Gemfile.lock

@@ -6,41 +6,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.11.3)
-      activesupport (= 4.2.11.3)
-      builder (~> 3.1)
-    activerecord (4.2.11.3)
-      activemodel (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
-      arel (~> 6.0)
-    activesupport (4.2.11.3)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.4)
-    bigdecimal (1.4.4)
-    builder (3.2.4)
-    concurrent-ruby (1.1.9)
-    i18n (0.9.5)
+    activemodel (7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activerecord (7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activesupport (7.0.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    bigdecimal (3.1.3)
+    concurrent-ruby (1.1.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.15.0)
+    minitest (5.17.0)
     rake (13.0.6)
-    sqlite3 (1.3.13)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    sqlite3 (1.6.0-x86_64-darwin)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   x86_64-darwin-21
 
 DEPENDENCIES
-  activerecord (~> 4.0)
-  bigdecimal (~> 1.4.4)
+  activerecord (~> 7.0)
+  bigdecimal
   code-box!
   minitest
   rake
-  sqlite3 (~> 1.3.6)
+  sqlite3
 
 BUNDLED WITH
-   2.3.8
+   2.4.1

data/code-box.gemspec

@@ -3,9 +3,9 @@ $:.push File.expand_path("../lib", __FILE__)
 require File.expand_path('../lib/code-box/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name          = 'code-box'
+  gem.name          = "code-box"
   gem.version       = CodeBox::VERSION
-  gem.license       = 'BSD-2-Clause'
+  gem.license       = "BSD-2-Clause"
 
   gem.authors       = ["Martin Schweizer"]
   gem.email         = ["contact@verticonaut.me"]
@@ -13,16 +13,15 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Specify attributes as code and provide lookup by I18n-, cache- or associated and support for building code classes.}
   gem.homepage      = %q{http://github.com/verticonaut/code-box}
 
-  gem.add_development_dependency  "activerecord", "~> 4.0"
-  gem.add_development_dependency  "sqlite3", "~> 1.3.6"
+  gem.add_development_dependency  "activerecord", "~> 7.0"
+  gem.add_development_dependency  "sqlite3"
   gem.add_development_dependency  "rake"
   gem.add_development_dependency  "minitest"
-  gem.add_development_dependency  "bigdecimal", "~> 1.4.4"
+  gem.add_development_dependency  "bigdecimal"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.rdoc_options  << '--charset' << 'UTF-8' << '--line-numbers'
+  gem.rdoc_options  << "--charset" << "UTF-8" << "--line-numbers"
 end
-

data/lib/code-box/acts_as_code.rb

@@ -1,5 +1,4 @@
-
-# encoding: utf-8
+# frozen_string_literal: true
 
 module CodeBox
 
@@ -34,8 +33,8 @@ module CodeBox
       instance_eval <<-RUBY_
         class << base
           def _code_box_i18n_model_segment
-            return CodeBox.i18n_model_segment if "#{self._code_box_i18n_model_segment}".empty?
-            "#{self._code_box_i18n_model_segment}"
+            return CodeBox.i18n_model_segment if "#{_code_box_i18n_model_segment}".empty?
+            "#{_code_box_i18n_model_segment}"
           end
         end
       RUBY_
@@ -47,11 +46,11 @@ module CodeBox
 
     module ClassMethods
       DefaultOptions = {
-          code_attribute:            'code',
-          sti:                       false,
-          uniqueness_case_sensitive: true,
-          position_attr:             :position,
-          define_test_methods:       true,
+        code_attribute:            "code",
+        sti:                       false,
+        uniqueness_case_sensitive: true,
+        position_attr:             :position,
+        define_test_methods:       true,
       }
 
       def acts_as_code(*codes_and_or_options)
@@ -63,7 +62,7 @@ module CodeBox
         case_sensitive        = opts[:uniqueness_case_sensitive]
         define_test_methods   = opts[:define_test_methods]
 
-        model_type = self.ancestors.include?('ActiveRecord::Base'.constantize) ? :active_record : :poro
+        model_type = ancestors.include?("ActiveRecord::Base".constantize) ? :active_record : :poro
 
         class_eval <<-RUBY_
           def translated_#{code_attr}(locale = I18n.locale, *options)
@@ -123,7 +122,7 @@ module CodeBox
             # If starts with 'i18n.' it is considered an I18n key, else the label itself
             options = translate_#{code_attr}(codes, build: :zip)
             if include_empty
-              label = I18n.t(label[5..-1], locale: locale) if label.starts_with?('i18n.')
+              label = I18n.t(label[5..-1], locale: locale) if label.start_with?('i18n.')
               options.unshift [label, value]
             end
 
@@ -138,7 +137,7 @@ module CodeBox
         instance_eval <<-CODE
           class << self
             def _code_box_code_attr_name
-              '#{code_attr.to_s}'
+              code_attr.to_s
             end
 
             def code_cache
@@ -155,7 +154,7 @@ module CodeBox
           when :active_record
 
             order_expression = if self.attribute_names.include?(position_attr) then
-              "coalesce(#{position_attr.to_s}, #{code_attr.to_s})"
+              "coalesce(#{position_attr}, #{code_attr})"
             else
               code_attr.to_s
             end
@@ -168,7 +167,7 @@ module CodeBox
             CODE
 
           when :poro
-            order_attr = position_attr ? position_attr.to_s : code_attr.to_s
+            _order_attr = position_attr ? position_attr.to_s : code_attr.to_s
 
             class_eval <<-CODE
               attr_accessor :#{code_attr}
@@ -202,11 +201,11 @@ module CodeBox
 
       def define_codes(*codes, define_test_methods)
         # --- Define the code constants...
-        code_attr   = self._code_box_code_attr_name
-        model_type  = self.ancestors.include?('ActiveRecord::Base'.constantize) ? :active_record : :poro
+        code_attr   = _code_box_code_attr_name
+        model_type  = ancestors.include?("ActiveRecord::Base".constantize) ? :active_record : :poro
 
         module_name  = code_attr.pluralize.camelize
-        codes_module = const_set(module_name, Module.new) 
+        codes_module = const_set(module_name, Module.new)
 
         # Create a constant for each code
         constants = {}
@@ -216,7 +215,7 @@ module CodeBox
           constants[constant_name] = constant
         end
 
-        codes_module.const_set('All', constants.values.compact)
+        codes_module.const_set("All", constants.values.compact)
 
 
         # Define test methods for each code like e.g.
@@ -243,12 +242,12 @@ module CodeBox
 
         constants = {}
         codes.each do |code|
-          constant_name            = "#{code.to_s.camelize}"
-          constant                 = const_set(constant_name, self.new(code.to_s))
+          constant_name            = code.to_s.camelize
+          constant                 = const_set(constant_name, new(code.to_s))
           constants[constant_name] = constant
         end
 
-        const_set('All', constants.values.compact)
+        const_set("All", constants.values.compact)
 
         class_eval <<-CODE
           def self.all

data/lib/code-box/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module CodeBox
-  VERSION = "1.1.3"
+  VERSION = "2.0.pre1"
 end

data/test/helper.rb

@@ -8,14 +8,12 @@ require 'logger'
 # Setup AR environment
 # ------------------------------------------------------
 
-# Define connection info
-ActiveRecord::Base.configurations = {
-  "test" => {
-    :adapter  => 'sqlite3',
-    :database => ':memory:'
+ActiveRecord::Base.establish_connection(
+  {
+    adapter:   "sqlite3",
+    database: ":memory:",
   }
-}
-ActiveRecord::Base.establish_connection("test")
+)
 
 # Setup logger
 tmp = File.expand_path('../../tmp', __FILE__)

data/test/resources/models.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 # ------------------------------------------------------
 # Defined the respective AR Models
 # ------------------------------------------------------
 module Codes
-
   class SampleClass < ActiveRecord::Base
     self.table_name = :codes_sample_class
 
@@ -10,23 +11,23 @@ module Codes
 
     # i18n codes
     code_attribute :gender
-    code_attribute :country,      :lookup_type => :i18n, :code_attribute_suffix => 'iso'
+    code_attribute :country,      lookup_type: :i18n, code_attribute_suffix: "iso"
 
     # lookup codes
-    code_attribute :civil_status, :lookup_type => :lookup, :class_name => 'Codes::CivilStatus'
-    code_attribute :ager_type,    :lookup_type => :lookup, :foreign_code_attribute => 'code_id'
+    code_attribute :civil_status, lookup_type: :lookup, class_name: "Codes::CivilStatus"
+    code_attribute :ager_type,    lookup_type: :lookup, foreign_code_attribute: "code_id"
 
-    code_attribute :country_2,    :lookup_type => :associated, :class_name => 'Codes::Country'
+    code_attribute :country_2,    lookup_type: :associated, class_name: "Codes::Country"
 
-    code_attribute :countries,    :lookup_type => :lookup, :class_name => 'Codes::Country', :enum => :set
+    code_attribute :countries,    lookup_type: :lookup, class_name: "Codes::Country", enum: :set
   end
 
   class CivilStatus
-    include CodeBox::ActsAsCode['single', 'married', :type => :poro]
+    include CodeBox::ActsAsCode["single", "married", type: :poro]
   end
 
   class CivilStatusUseDefine
-    include CodeBox::ActsAsCode[:type => :poro]
+    include CodeBox::ActsAsCode[type: :poro]
 
     define_codes(:single, :married)
   end
@@ -53,23 +54,22 @@ module Codes
     self.table_name = :codes_country
 
     def self.for_code(code)
-      where('code= ?', code).first
+      where("code= ?", code).first
     end
   end
 
 
   class ArCode < ActiveRecord::Base
     self.table_name = :codes_ar_code
-    include CodeBox::ActsAsCode[:type => :active_record]
+    include CodeBox::ActsAsCode[type: :active_record]
   end
 
   class SegmentModel
-    include CodeBox::CodeAttribute[:i18n_model_segment => :model]
+    include CodeBox::CodeAttribute[i18n_model_segment: :model]
 
     attr_accessor :gender_code
 
     # i18n codes
     code_attribute :gender
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-box
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.pre1
 platform: ruby
 authors:
 - Martin Schweizer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '0'
 description: Specify attributes as code and provide lookup by I18n-, cache- or associated
   and support for building code classes.
 email:
@@ -129,9 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.8
 signing_key: