much-rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a9113cb9c28d12b0bcffbf5df47f43c2efe956dcb3eae246643461029af788
-  data.tar.gz: 95d5050085a06b6b747217b61d04197972948de584f48125bad8c858896913dc
+  metadata.gz: 65f11e22f8ed34e4bd1e940584390a1487e1c69d2c35d6641fb6352fc6179d4f
+  data.tar.gz: 1824ade309dee8f599074986d52b120d3fcecc79ba302f725500177d353274bd
 SHA512:
-  metadata.gz: 9699a1c4fede48c47b4e7e47148a3dc256b0d3ee29d8b681041614719b9d734946fc001599704f26237637bacaf204013ed01b5c8ff72d3cbceeb049bb5ea407
-  data.tar.gz: c550915e3af0b1142e73ad28b60e2e6944f5d789e769bbc31dcd35f07ace0ed16ba1bb18f253b8392b53b363167da70b33539589448d73bc1e21992341748768
+  metadata.gz: c0c4c70fbaeec9574a8b66465fbf11668242a521d9693a52f8f7f737558e28ed04a77047c6d634ebed576266fc5f5b4c065dd729a02108cadb07bce05f87bb86
+  data.tar.gz: 630142f5702e5ad4694a758ded2c8eff9487a19acc0c8611075fd606f0ada5e0d8e486ef7ff0003e28b128d8ce0e8ce80bbe26d4e0cf89dd630b6b780a6114cc

data/lib/much-rails/assets.rb

@@ -12,20 +12,16 @@ end
 module MuchRails::Assets
   def self.configure_for_rails(rails)
     MuchRails::Assets.configure do |config|
-      # Cache fingerprints in memory for performance gains.
-      config.fingerprint_cache MuchRails::Assets::MemCache.new
-
-      # Cache compiled content in memory in development/test for performance
-      # gains since we aren't caching to the file system. Otherwise, don't
-      # cache in memory as we are caching to the file system and won't benefit
-      # from the in memory cache.
-      much_rails_content_cache =
-        if rails.env.development? || rails.env.test?
-          MuchRails::Assets::MemCache.new
-        else
-          MuchRails::Assets::NoCache.new
-        end
-      config.content_cache much_rails_content_cache
+      # Cache fingerprints/content in memory in non-development for performance
+      # gains. Don't cache in memory in developlemnt so changes are reflected
+      # without restarting the server.
+      if !rails.env.development?
+        config.fingerprint_cache MuchRails::Assets::MemCache.new
+        config.content_cache MuchRails::Assets::MemCache.new
+      else
+        config.fingerprint_cache MuchRails::Assets::NoCache.new
+        config.content_cache MuchRails::Assets::NoCache.new
+      end
 
       # Cache out compiled file content to the public folder in non
       # development/test environments.
@@ -33,21 +29,40 @@ module MuchRails::Assets
         config.file_store rails.root.join("public")
       end
 
-      # Look for asset files in the app/assets folder. Support ERB processing
-      # on all .js and .scss files. Support compilation of .scss files.
-      config.source rails.root.join("app", "assets") do |s|
+      # Look for asset files in the app/assets/css folder. Support ERB
+      # on all .scss files. Support compilation of .scss files.
+      config.source rails.root.join("app", "assets", "css") do |s|
+        s.base_path "css"
+
         # Reject SCSS partials
         s.filter do |paths|
           paths.reject{ |p| File.basename(p) =~ /^_.*\.scss$/ }
         end
 
-        s.engine "js",   MuchRails::Assets::Erubi::Engine
         s.engine "scss", MuchRails::Assets::Erubi::Engine
         s.engine "scss", MuchRails::Assets::Sass::Engine, {
           syntax: "scss",
           output_style: "compressed",
         }
       end
+
+      # Look for asset files in the app/assets/img folder.
+      config.source rails.root.join("app", "assets", "img") do |s|
+        s.base_path "img"
+      end
+
+      # Look for asset files in the app/assets/js folder. Support ERB
+      # on all .js files.
+      config.source rails.root.join("app", "assets", "js") do |s|
+        s.base_path "js"
+
+        s.engine "js", MuchRails::Assets::Erubi::Engine
+      end
+
+      # Look for asset files in the app/assets/vendor folder
+      config.source rails.root.join("app", "assets", "vendor") do |s|
+        s.base_path "vendor"
+      end
     end
     MuchRails::Assets.init
   end

data/lib/much-rails/service_validation_errors.rb

@@ -10,7 +10,7 @@ class MuchRails::ServiceValidationErrors
   end
 
   def add(exception_class, &block)
-    unless exception_class < Exception
+    unless exception_class && exception_class < Exception
       raise(ArgumentError, "#{exception_class} is not an Exception")
     end
 

data/lib/much-rails/version.rb

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

data/much-rails.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("activerecord",   ["> 5.0", "< 7.0"])
   gem.add_dependency("activesupport",  ["> 5.0", "< 7.0"])
-  gem.add_dependency("dassets",        ["~> 0.15.1"])
+  gem.add_dependency("dassets",        ["~> 0.15.2"])
   gem.add_dependency("dassets-erubi",  ["~> 0.1.1"])
   gem.add_dependency("dassets-sass",   ["~> 0.5.1"])
   gem.add_dependency("much-boolean",   ["~> 0.2.1"])

data/test/unit/assets_tests.rb

@@ -23,7 +23,7 @@ module MuchRails::Assets
     setup do
       subject.reset
 
-      in_development_env = Factory.boolean
+      in_development_env = true
       Assert.stub(FakeRails.env, :development?){ in_development_env }
       Assert.stub(FakeRails.env, :test?){ !in_development_env }
 
@@ -34,14 +34,11 @@ module MuchRails::Assets
       subject.configure_for_rails(FakeRails)
     end
 
-    should "configure the fingerprint cache to use a memory cache" do
+    should "configure the fingerprint/content cache to use no cache" do
       assert_that(subject.config.fingerprint_cache)
-        .is_instance_of(subject::MemCache)
-    end
-
-    should "configure the content cache to use a memory cache" do
+        .is_instance_of(subject::NoCache)
       assert_that(subject.config.content_cache)
-        .is_instance_of(subject::MemCache)
+        .is_instance_of(subject::NoCache)
     end
 
     should "not configure a file store" do
@@ -49,16 +46,14 @@ module MuchRails::Assets
         .is_not_equal_to(FakeRails.root.join("public"))
     end
 
-    should "configure the app's app/assets folder as a source" do
+    should "configure the app's app/assets/css folder as a source" do
       source =
         subject.config.sources.detect do |source|
-          source.path == FakeRails.root.join("app", "assets").to_s
+          source.path == FakeRails.root.join("app", "assets", "css").to_s
         end
 
       assert_that(source).is_not_nil
-      assert_that(source.engines["js"].size).equals(1)
-      assert_that(source.engines["js"].first)
-        .is_instance_of(subject::Erubi::Engine)
+      assert_that(source.base_path).equals("css")
       assert_that(source.engines["scss"].size).equals(2)
       assert_that(source.engines["scss"].first)
         .is_instance_of(subject::Erubi::Engine)
@@ -66,6 +61,41 @@ module MuchRails::Assets
         .is_instance_of(subject::Sass::Engine)
     end
 
+    should "configure the app's app/assets/img folder as a source" do
+      source =
+        subject.config.sources.detect do |source|
+          source.path == FakeRails.root.join("app", "assets", "img").to_s
+        end
+
+      assert_that(source).is_not_nil
+      assert_that(source.base_path).equals("img")
+      assert_that(source.engines.empty?).is_true
+    end
+
+    should "configure the app's app/assets/js folder as a source" do
+      source =
+        subject.config.sources.detect do |source|
+          source.path == FakeRails.root.join("app", "assets", "js").to_s
+        end
+
+      assert_that(source).is_not_nil
+      assert_that(source.base_path).equals("js")
+      assert_that(source.engines["js"].size).equals(1)
+      assert_that(source.engines["js"].first)
+        .is_instance_of(subject::Erubi::Engine)
+    end
+
+    should "configure the app's app/assets/vendor folder as a source" do
+      source =
+        subject.config.sources.detect do |source|
+          source.path == FakeRails.root.join("app", "assets", "vendor").to_s
+        end
+
+      assert_that(source).is_not_nil
+      assert_that(source.base_path).equals("vendor")
+      assert_that(source.engines.empty?).is_true
+    end
+
     should "initialize itself" do
       assert_that(@init_call).is_not_nil
     end
@@ -84,9 +114,11 @@ module MuchRails::Assets
       subject.configure_for_rails(FakeRails)
     end
 
-    should "configure the content cache to use no cache" do
+    should "configure the fingerprint/content cache to use a memory cache" do
+      assert_that(subject.config.fingerprint_cache)
+        .is_instance_of(subject::MemCache)
       assert_that(subject.config.content_cache)
-        .is_instance_of(subject::NoCache)
+        .is_instance_of(subject::MemCache)
     end
 
     should "configure a file store for the app's public folder" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: much-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: much-style-guide
@@ -105,14 +105,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: dassets-erubi
   requirement: !ruby/object:Gem::Requirement
@@ -369,8 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.4
 signing_key: 
 specification_version: 4
 summary: Rails utilities.