much-rails 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee8fc1ccf3484f2b015d6dc6f1911bcca2bddb9832809391dc48ef2aeac023bb
-  data.tar.gz: a0a9b4ba294d780e3a4002545e967505f8f32e15bb231e3fbd1e9d594ed4f9b1
+  metadata.gz: 4e21c445f3eec6146fc636f67a3e98b4f40dde3c916c6f25f6bb02af8f6dfc38
+  data.tar.gz: ffcc8deab5152d91d1e433d5bfc174e359fa02a2d5e43b57c12f2b7dfed9fdab
 SHA512:
-  metadata.gz: f47fe549b83381ec39c226cf52760d8b5ca2d386c66e3e4db3b37f22ce07d855dd665e499fe5db15e54e7263a5903f5759cbb2d9d60a175dffead64917388f79
-  data.tar.gz: 3c50dc018ab3d5e0d6bf98cc8725b99314e9527d400890500c5ffbc8bf1e9ed2772da689b00bd7ef4b8fdf4d256927a71e338401da57ec53879019ad5a4ae5f2
+  metadata.gz: 3299e07aff0d7304b3cf84ca6df14e53e3dcdd0d63690ec9bed261217c04fdae8058e0314840b276a1e183a18b87e2ba47d930389c77eda82638f7637577437a
+  data.tar.gz: 5fe7641d69715ffe58daa889edf8635b3d0ae614d500e9205f44c4798aadd5d6c8c021d4a40f7c0afcc58db8c31ea10252a91e087fb7d8aa44f110fd883e1628

data/lib/much-rails/config.rb

@@ -1,55 +1,7 @@
 # frozen_string_literal: true
 
-require "much-rails/mixin"
+require "much-config"
 
-module MuchRails; end
-
-# MuchRails::Config is a mix-in to implement object DSL configuration.
-module MuchRails::Config
-  include MuchRails::Mixin
-
-  mixin_class_methods do
-    def add_config(name = nil, method_name: nil)
-      config_method_name, config_class_name, configure_method_name =
-        much_rails_config_names(name, method_name)
-
-      instance_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-        def #{config_method_name}
-          @#{config_method_name} ||= self::#{config_class_name}.new
-        end
-
-        def #{configure_method_name}
-          yield(#{config_method_name}) if block_given?
-        end
-      RUBY
-    end
-
-    def add_instance_config(name = nil, method_name: nil)
-      config_method_name, config_class_name, configure_method_name =
-        much_rails_config_names(name, method_name)
-
-      instance_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-        define_method(:#{config_method_name}) do
-          @#{config_method_name} ||= self.class::#{config_class_name}.new
-        end
-
-        define_method(:#{configure_method_name}) do |&block|
-          block.call(#{config_method_name}) if block
-        end
-      RUBY
-    end
-
-    private
-
-    def much_rails_config_names(name, method_name)
-      name_prefix = name.nil? ? "" : "#{name.to_s.underscore}_"
-      config_method_name = (method_name || "#{name_prefix}config").to_s
-      config_class_name = "#{name_prefix.classify}Config"
-
-      name_suffix = name.nil? ? "" : "_#{name.to_s.underscore}"
-      configure_method_name = "configure#{name_suffix}"
-
-      [config_method_name, config_class_name, configure_method_name]
-    end
-  end
+module MuchRails
+  Config = MuchConfig
 end

data/lib/much-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MuchRails
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/much-rails.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = "~> 2.5"
 
-  gem.add_development_dependency("much-style-guide", ["~> 0.6.0"])
-  gem.add_development_dependency("assert",           ["~> 2.19.5"])
+  gem.add_development_dependency("much-style-guide", ["~> 0.6.6"])
+  gem.add_development_dependency("assert",           ["~> 2.19.6"])
   gem.add_development_dependency("rails",            ["> 5.0", "< 7.0"])
 
   gem.add_dependency("activerecord",   ["> 5.0", "< 7.0"])
@@ -33,10 +33,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency("dassets-erubi",  ["~> 0.1.1"])
   gem.add_dependency("dassets-sass",   ["~> 0.5.1"])
   gem.add_dependency("much-boolean",   ["~> 0.2.1"])
+  gem.add_dependency("much-config",    ["~> 0.1.0"])
   gem.add_dependency("much-decimal",   ["~> 0.1.3"])
   gem.add_dependency("much-mixin",     ["~> 0.2.4"])
   gem.add_dependency("much-not-given", ["~> 0.1.2"])
   gem.add_dependency("much-result",    ["~> 0.1.3"])
   gem.add_dependency("much-slug",      ["~> 0.1.2"])
-  gem.add_dependency("oj",             ["~> 3.10"])
+  gem.add_dependency("oj",             ["~> 3.11"])
 end

data/test/unit/assets_tests.rb

@@ -48,7 +48,7 @@ module MuchRails::Assets
 
     should "configure the app's app/assets/css folder as a source" do
       source =
-        subject.config.sources.detect do |source|
+        subject.config.sources.find do |source|
           source.path == FakeRails.root.join("app", "assets", "css").to_s
         end
 
@@ -63,7 +63,7 @@ module MuchRails::Assets
 
     should "configure the app's app/assets/img folder as a source" do
       source =
-        subject.config.sources.detect do |source|
+        subject.config.sources.find do |source|
           source.path == FakeRails.root.join("app", "assets", "img").to_s
         end
 
@@ -74,7 +74,7 @@ module MuchRails::Assets
 
     should "configure the app's app/assets/js folder as a source" do
       source =
-        subject.config.sources.detect do |source|
+        subject.config.sources.find do |source|
           source.path == FakeRails.root.join("app", "assets", "js").to_s
         end
 
@@ -87,7 +87,7 @@ module MuchRails::Assets
 
     should "configure the app's app/assets/vendor folder as a source" do
       source =
-        subject.config.sources.detect do |source|
+        subject.config.sources.find do |source|
           source.path == FakeRails.root.join("app", "assets", "vendor").to_s
         end
 

data/test/unit/config_tests.rb

@@ -10,59 +10,8 @@ module MuchRails::Config
 
     let(:unit_class){ MuchRails::Config }
 
-    should "include MuchRails::Mixin" do
-      assert_that(subject).includes(MuchRails::Mixin)
-    end
-  end
-
-  class ReceiverTests < UnitTests
-    desc "receiver"
-    subject{ receiver_class }
-
-    setup do
-      class receiver_class::Config
-        attr_accessor :value
-      end
-
-      class receiver_class::AnotherConfig
-        include MuchRails::Config
-
-        add_instance_config :sub, method_name: :sub
-
-        attr_accessor :another_value
-
-        class SubConfig
-          attr_accessor :sub_value
-        end
-      end
-    end
-
-    let(:receiver_class) do
-      Class.new do
-        include MuchRails::Config
-
-        add_config
-        add_config :another
-      end
-    end
-
-    should have_imeths :config, :another_config
-
-    should "know its attributes" do
-      assert_that(subject.config).is_instance_of(subject::Config)
-      subject.configure{ |config| config.value = "VALUE 1" }
-      assert_that(subject.config.value).equals("VALUE 1")
-
-      assert_that(subject.another_config).is_instance_of(subject::AnotherConfig)
-      subject.configure_another{ |config| config.another_value = "VALUE 2" }
-      assert_that(subject.another_config.another_value).equals("VALUE 2")
-
-      assert_that(subject.another_config.sub)
-        .is_instance_of(subject::AnotherConfig::SubConfig)
-      subject.another_config.configure_sub do |sub|
-        sub.sub_value = "VALUE 3"
-      end
-      assert_that(subject.another_config.sub.sub_value).equals("VALUE 3")
+    should "be MuchConfig" do
+      assert_that(unit_class).is(MuchConfig)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: much-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: much-style-guide
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: assert
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.19.5
+        version: 2.19.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.19.5
+        version: 2.19.6
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: much-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: much-decimal
   requirement: !ruby/object:Gem::Requirement
@@ -231,14 +245,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
 description: Rails utilities.
 email:
 - kelly@kellyredding.com
@@ -374,7 +388,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Rails utilities.