bp3-string 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a2a72aa199dac5c0afd601a19d696e3080d47481e667e177c9313ce946811b2
-  data.tar.gz: 8bf1ae10f2a4ca108419e2e3b77c0b8a330fbf0549cac06dd3825d0b42eca90e
+  metadata.gz: f5aa34697599efbe2157aac9bd6d0d370b808ade7c341c926537a991e6e43b52
+  data.tar.gz: 869be1330e5be8f772c01710137d67c105e2433331122e334df17d707529acd1
 SHA512:
-  metadata.gz: 15d156f4895fa9340ffdefc5c0b8ba6bda70eb26b9ccec9fd701f26859a075855b3498325930027666a733860cb685a14f949e96b9feb1a6a8b614cb2e11798d
-  data.tar.gz: 82d1a3e8952cf9469b153ef92b5c6e75c9133c50625d82bc4767a7efb4d7974e0f71d9ccadbbb0650123000ea277f79893aaaa9c84acc2d2dd02fad88895845e
+  metadata.gz: c3368540180a9dd6ced17398086a39cf3d9d6fbf7b508ee999d03defb34609b7f4448a4b8e4edf7ac38d898f18a1158e6d167d75f54265817e9cef800e43da86
+  data.tar.gz: fbd9fa9d774405f4671a9fe42216fedcefe22838390442123ded91de608975a3be869ae71171f17cce419aeaf56b71acea96ceec776e0b2532fa4a3d9d1c64a0

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## [Unreleased]
 
-## [0.1.0] - 2024-06-03
+## [0.1.2] - 2024-08-19
+
+- Use all ActionController descendents to populate the `TableControllerMap` hash.
+- Pluralize default controller class
+- Refactoring
+
+## [0.1.1] - 2024-06-03
 
 - Tweaks and documentation
 

data/Gemfile.lock

@@ -1,80 +1,82 @@
 PATH
   remote: .
   specs:
-    bp3-string (0.1.1)
-      activerecord (~> 7.1)
+    bp3-string (0.1.2)
+      activerecord (>= 7.1.2, < 8)
       activesupport (>= 7.1.2, < 8)
-      railties (~> 7.1)
+      railties (>= 7.1.2, < 8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.2)
-      actionview (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionpack (7.2.0)
+      actionview (= 7.2.0)
+      activesupport (= 7.2.0)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
+      useragent (~> 0.16)
+    actionview (7.2.0)
+      activesupport (= 7.2.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activerecord (7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activemodel (7.2.0)
+      activesupport (= 7.2.0)
+    activerecord (7.2.0)
+      activemodel (= 7.2.0)
+      activesupport (= 7.2.0)
       timeout (>= 0.4.0)
-    activesupport (7.1.3.2)
+    activesupport (7.2.0)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
-    builder (3.2.4)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
     byebug (11.1.3)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
     diff-lcs (1.5.1)
     drb (2.2.1)
-    erubi (1.12.0)
-    i18n (1.14.4)
+    erubi (1.13.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
+    logger (1.6.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.22.3)
-    mutex_m (0.2.0)
-    nokogiri (1.16.3-x86_64-darwin)
+    minitest (5.25.1)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.3)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
-    racc (1.7.3)
-    rack (3.0.10)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -89,70 +91,74 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
-      irb
+    railties (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.5.0)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.2.6)
+    rexml (3.3.5)
+      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.62.1)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
+    rubocop-ast (1.32.1)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.29.1)
+    rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.2)
-      rubocop (~> 1.40)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    stringio (3.1.0)
+    securerandom (0.3.1)
+    stringio (3.1.1)
+    strscan (3.1.0)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    useragent (0.16.10)
     webrick (1.8.1)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   x86_64-darwin-22

data/bp3-string.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '~> 7.1'
+  spec.add_dependency 'activerecord', ['>= 7.1.2', '< 8']
   spec.add_dependency 'activesupport', ['>= 7.1.2', '< 8']
-  spec.add_dependency 'railties', '~> 7.1'
+  spec.add_dependency 'railties', ['>= 7.1.2', '< 8']
 
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/bp3/string/controllerize.rb

@@ -6,7 +6,7 @@ module Bp3
   module String
     module Controllerize
       def controllerize
-        TableControllerMap.hash[self] || "#{classify}Controller"
+        TableControllerMap.hash[self] || "#{classify.pluralize}Controller"
       end
     end
   end

data/lib/bp3/string/mapper_base.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Bp3
+  module String
+    # MapperBase provides the base class for controller and model mappings
+    class MapperBase
+      include Subclassable
+
+      # override in testing if needed
+      def self.testing?
+        false
+      end
+
+      def self.reset_cached_hash
+        @cached_hash = nil
+      end
+
+      def self.build_hash
+        new.build_hash
+      end
+
+      def self.hash
+        cached_hash
+      end
+
+      def hash
+        self.class.hash
+      end
+
+      private
+
+      def sti_subclass?(model)
+        self.class.sti_subclass?(model)
+      end
+
+      def subclassed?(model)
+        self.class.subclassed?(model)
+      end
+    end
+  end
+end

data/lib/bp3/string/table_controller_map.rb

@@ -2,17 +2,11 @@
 
 module Bp3
   module String
-    # TableControllerMap provides for mappings between tables and controllers
-    class TableControllerMap
-      include Subclassable
-
+    # TableControllerMap provides for mappings between table-like strings and controller class names
+    class TableControllerMap < MapperBase
       @cached_hash = nil
       CACHED_HASH_MUTEX = Mutex.new
 
-      def self.testing?
-        Rails.env.test?
-      end
-
       def self.cached_hash
         return build_hash if testing?
         return @cached_hash if @cached_hash.present?
@@ -24,11 +18,18 @@ module Bp3
         end
       end
 
-      def self.reset_cached_hash
-        @cached_hash = nil
+      def build_hash
+        @encoding = 'string'.encoding # TODO: not sure why encoding sometimes doesn't match
+        @ar_hash = build_hash_from_active_record
+        @ac_hash = build_hash_from_action_controller
+        @ar_hash.merge(@ac_hash)
       end
 
-      def self.build_hash
+      private
+
+      attr_reader :ar_hash, :ac_hash, :encoding
+
+      def build_hash_from_active_record
         hash = {}
         ActiveRecord::Base.descendants.each do |model|
           table_name = model.table_name
@@ -42,12 +43,29 @@ module Bp3
         hash
       end
 
-      def self.hash
-        cached_hash
+      def build_hash_from_action_controller
+        hash = {}
+        ActionController::Base.descendants.each do |controller|
+          hash.merge!(build_hash_from_controller(controller))
+        end
+        hash
       end
 
-      def hash
-        self.class.hash
+      def build_hash_from_controller(controller)
+        hash = {}
+        if controller.descendants.empty?
+          if controller.name.present?
+            controller_name = controller.name.encode(encoding)
+            tableish_name = controller_name.gsub(/Controller\z/, '').underscore.tr('/', '_').pluralize
+            hash[tableish_name] = controller_name unless @ar_hash.key?(tableish_name)
+            hash[tableish_name.singularize] = controller_name unless @ar_hash.key?(tableish_name.singularize)
+          end
+        else
+          controller.descendants.each do |ctrlr|
+            hash.merge!(build_hash_from_controller(ctrlr))
+          end
+        end
+        hash
       end
     end
   end

data/lib/bp3/string/table_model_map.rb

@@ -4,17 +4,11 @@ require 'active_record'
 
 module Bp3
   module String
-    # TableModelMap provides for mappings between tables and models
-    class TableModelMap
-      include Subclassable
-
+    # TableModelMap provides for mappings between tables and model class names
+    class TableModelMap < MapperBase
       @cached_hash = nil
       CACHED_HASH_MUTEX = Mutex.new
 
-      def self.testing?
-        Rails.env.test?
-      end
-
       def self.cached_hash
         return build_hash if testing?
         return @cached_hash if @cached_hash.present?
@@ -26,39 +20,27 @@ module Bp3
         end
       end
 
-      def self.reset_cached_hash
-        @cached_hash = nil
-      end
-
-      def self.build_hash
-        enc = 'string'.encoding # TODO: not sure why encoding sometimes doesn't match
+      def build_hash
+        encoding = 'string'.encoding # TODO: not sure why encoding sometimes doesn't match
         hash = {}
         ActiveRecord::Base.descendants.each do |model|
           table_name = model.table_name
           next if table_name.blank?
 
           table_name = table_name.split('.').last # remove the schema
-          model_name = determine_model_name(model).encode(enc)
+          model_name = determine_model_name(model).encode(encoding)
           hash[table_name] = model_name
           hash[table_name.singularize] = model_name
         end
         hash
       end
 
-      def self.determine_model_name(model)
+      def determine_model_name(model)
         return determine_model_name(model.superclass) if sti_subclass?(model)
         return determine_model_name(model.descendants.first) if subclassed?(model)
 
         model.name
       end
-
-      def self.hash
-        cached_hash
-      end
-
-      def hash
-        self.class.hash
-      end
     end
   end
 end

data/lib/bp3/string/version.rb

@@ -2,6 +2,6 @@
 
 module Bp3
   module String
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/bp3/string.rb

@@ -2,6 +2,7 @@
 
 require 'active_support/concern'
 require_relative 'string/subclassable'
+require_relative 'string/mapper_base'
 require_relative 'string/table_model_map'
 require_relative 'string/table_controller_map'
 require_relative 'string/modelize'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: bp3-string
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Wim den Braven
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -48,16 +54,22 @@ dependencies:
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +174,7 @@ files:
 - lib/bp3-string.rb
 - lib/bp3/string.rb
 - lib/bp3/string/controllerize.rb
+- lib/bp3/string/mapper_base.rb
 - lib/bp3/string/modelize.rb
 - lib/bp3/string/railtie.rb
 - lib/bp3/string/subclassable.rb