classy-yaml 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8217df31105dafb708cece0e3d7799cd2bc9515af19b1c1377fc2e25d633001
-  data.tar.gz: 37ad98554aa926df73668bc9f1bbdbf5507c322bf27140baeb9bb12083423e48
+  metadata.gz: ecb27c17050e3f5ca77111089257465fa14c8f92c31f88758690c3aa0c62c672
+  data.tar.gz: cbad509cfd4a1f1dd4fb2fa99aca28c7ca9e0566eeb9596e839696d4b73b409b
 SHA512:
-  metadata.gz: ec20f6a773530cc1d4a62288d4909f9e09d217bae6d3e0a0edd3813ad6eade8eaf41e73f5c25937507124d21bde8b1a6d23fc80a7626bd1add3e2e6161cdb586
-  data.tar.gz: 72b913d23ca606d4b2ac79caeb5a14afd8cdbf00362d99e2281262d4c48d626dc51acbda4ef333ff83f597fc5d74c48383cbe5730dabe007b1f3060ff5a7a9da
+  metadata.gz: 01e0b9908f5ac755de537c709e4ba5ab4b214e207f93e90adffda0d7f7a770fbe8aa83160ec756ebba85e8a107bd89cdee53f2b79af86f128458067342fa792d
+  data.tar.gz: c5022b41e6db9d44e89d05131adffb5a81c69b4a8885ae1131267cb7715e1f4af719e62a4589e7f0d4db646fb726d51461bed75fbc0e4751f5824bbf0ed08b3e

data/README.md

@@ -2,7 +2,7 @@
 This was created to provide convenient utility class grouping for environments without a bundler (or any situation where you might not want to add custom css classes). YAML files are a perfect structure for these situations.
 
 ## Usage
-After installing the gem, the helper method `yass` will be available from anywhere. It look for the definitions in the yaml file `config/utility_classes.yml` (note: you must add this yourself).
+After installing the gem, the helper method `yass` will be available from anywhere. It looks for the definitions in the YAML file `config/utility_classes.yml` (note: you must add this yourself).
 
 The YAML structure should follow this format:
 
@@ -51,7 +51,8 @@ btn:
 # will add the classes "px-3 py-2 text-purple-200 bg-blue-500"
 ```
 
-As you can see, this will merge definitions found in the ExampleComponent's sidecar asset with the main application's definitions. Not only will it merge, but it will overwrite them as well, allowing for true customization on a per-component basis:
+As you can see, this will merge definitions found in the `ExampleComponent`'s sidecar asset with the main application's definitions. Not only will it merge, but it will overwrite them as well, allowing for true customization on a per-component basis:
+
 ```
 # config/utility_classes.yml
 btn:
@@ -72,7 +73,6 @@ btn:
 # will add the classes "px-3 py-2 text-blue-50"
 ```
 
-
 ## Installation
 Add this line to your application's Gemfile:
 
@@ -91,7 +91,7 @@ $ gem install classy-yaml
 ```
 
 ## Contributing
-This is my first attempt at an actual gem usable for all. Any and all suggestions are absolutely welcome. I'm not the cleanest programmer, so code quality suggestions are welcome too 👍 I extracted this logic from my private work and I felt it was useful enought to be worth publishing
+This is my first attempt at an actual gem usable for all. Any and all suggestions are absolutely welcome. I'm not the cleanest programmer, so code quality suggestions are welcome too 👍 I extracted this logic from my private work and I felt it was useful enought to be worth publishing.
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/classy/yaml/component_helpers.rb

@@ -4,8 +4,11 @@ module Classy
       def yass(*args)
         component_name = caller.first.split("/").last.split(".").first
         calling_path = caller.first.split("/")[0...-1].join("/")
-        classy_file = calling_path + "/" + component_name + ".yml"
-
+        classy_file = if Dir.exists?("#{calling_path}/#{component_name}")
+                        "#{calling_path}/#{component_name}/#{component_name}.yml"
+                      else
+                        "#{calling_path}/#{component_name}.yml"
+                      end
         helpers.yass(args, classy_files: [classy_file] )
       end
     end

data/lib/classy/yaml/engine.rb

@@ -5,6 +5,10 @@ module Classy
       config.to_prepare do
         ApplicationController.helper(Classy::Yaml::Helpers)
       end
+
+      Gem.loaded_specs['classy-yaml'].dependencies.each do |d|
+        require d.name if Rails.env.test?
+      end
     end
   end
 end

data/lib/classy/yaml/helpers.rb

@@ -57,18 +57,26 @@ module Classy
           fetched_classes = nil
 
           classy_yamls.reverse_each do |classy_yaml|
-            base_classes ||= if classy_yaml.send(:dig, *key).is_a?(Hash)
-                               classy_yaml.send(:dig, *(key + ['base'])).try(:split, " ")
-                             else
-                               classy_yaml.send(:dig, *(key[0...-1] + ['base'])).try(:split, " ")
-                             end
-
-            fetched_classes ||= unless classy_yaml.send(:dig, *key).is_a?(Hash)
-                                  classy_yaml.send(:dig, *key).try(:split, " ")
-                                end
-
-            base_classes = nil if base_classes.blank?
-            fetched_classes = nil if fetched_classes.blank?
+            begin
+              base_classes ||= if classy_yaml.send(:dig, *key).is_a?(Hash)
+                                 classy_yaml.send(:dig, *(key + ['base'])).try(:split, " ")
+                               else
+                                 classy_yaml.send(:dig, *(key[0...-1] + ['base'])).try(:split, " ")
+                               end
+            rescue
+              raise Classy::Yaml::InvalidKeyError.new(data: key)
+            end
+
+            begin
+              fetched_classes ||= unless classy_yaml.send(:dig, *key).is_a?(Hash)
+                                    classy_yaml.send(:dig, *key).try(:split, " ")
+                                  end
+
+              base_classes = nil if base_classes.blank?
+              fetched_classes = nil if fetched_classes.blank?
+            rescue
+              raise Classy::Yaml::InvalidKeyError.new(data: key)
+            end
           end
 
           classes << base_classes

data/lib/classy/yaml/invalid_key_error.rb

@@ -0,0 +1,13 @@
+module Classy
+  module Yaml
+    class InvalidKeyError < StandardError
+      def initialize(data)
+        @data = data
+      end
+
+      def message
+        "yass called with invalid keys: #{@data}. This error can be raised when calling nested keys on an un-nested root."
+      end
+    end
+  end
+end

data/lib/classy/yaml/version.rb

@@ -1,5 +1,5 @@
 module Classy
   module Yaml
-    VERSION = '0.5.1'
+    VERSION = '0.6.0'
   end
 end

data/lib/classy/yaml.rb

@@ -5,5 +5,6 @@ module Classy
   module Yaml
     autoload :Helpers, "classy/yaml/helpers"
     autoload :ComponentHelpers, "classy/yaml/component_helpers"
+    autoload :InvalidKeyError, "classy/yaml/invalid_key_error"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classy-yaml
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Tonksthebear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: view_component
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.36'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.36'
 description: Rails helper to allow yaml configuration of utility css classes
 email:
 - ''
@@ -38,6 +66,7 @@ files:
 - lib/classy/yaml/component_helpers.rb
 - lib/classy/yaml/engine.rb
 - lib/classy/yaml/helpers.rb
+- lib/classy/yaml/invalid_key_error.rb
 - lib/classy/yaml/version.rb
 - lib/tasks/classy/yaml_tasks.rake
 homepage: https://github.com/Tonksthebear/classy-yaml