page_magic 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a818b71ddcc138a95601f724bcae9b6631bf87431a9bbd7edb0816f1bdac5fb8
-  data.tar.gz: 2d6a165aec8c854e49496c6375154c90aa714b97e28f00fa5cefc5d954fe8dd0
+  metadata.gz: 6da71e330b1c223cf3bae293c485653388c8e7db834f6c4fc3ac1de274763a46
+  data.tar.gz: da53a97958f3a55557dfb23b0b67054d6375b0f7151777b24d0e7046d982f871
 SHA512:
-  metadata.gz: 6145762ea0b3ddc8cea37e04957a95873b6d892798efe051d1f3e3937ebc9c6487e1ab9123dc02544190cf77ac3957197dcd0eaf14e87ce5b104c682aee21696
-  data.tar.gz: d5fc4d9729c2a68bab771e0f4538ed4346daa91a23a53b65cacbe8b75fff02e1ee83e68eef87f77bc5925852a2b1fbd0520e0f3bff2b85f5a2653f408c231faf
+  metadata.gz: 292d751ef686fad2d35b21c90c59b89b906ec1173a1d2c4ded593760e9890cd0152c535899a70fc6c887525e96b8a56b5c5708247caf8aa84fb2f768d10ebcf2
+  data.tar.gz: b7e9e00a2c766aa9e6e98087e9e5d7bd0ac04498f256a5854667558d8e5f4bb21a22b1cdbcaa8b016ca18cc6c5521ca6169266226a89c93387228e2305f702b5

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/page_magic/elements/config.rb

@@ -73,7 +73,9 @@ module PageMagic
       # Selector built using supplied configuration
       # @return [PageMagic::Element::Selector::Model]
       def selector
-        selector = self[:selector]
+        selector = self[:selector] || definition_class.selector
+        raise PageMagic::InvalidConfigurationException, INVALID_SELECTOR_MSG unless validate_selector?(selector)
+
         Element::Selector.find(selector.keys.first).build(type, selector.values.first, options: options)
       end
 
@@ -81,7 +83,6 @@ module PageMagic
       # @raise [PageMagic::InvalidConfigurationException]
       # @return [PageMagic::Elements::Config]
       def validate!
-        raise PageMagic::InvalidConfigurationException, INVALID_SELECTOR_MSG unless element || valid_selector?
         raise PageMagic::InvalidConfigurationException, 'element type required' unless type
         raise PageMagic::InvalidConfigurationException, INVALID_ELEMENT_CLASS_MSG unless valid_element_class?
 
@@ -90,8 +91,7 @@ module PageMagic
 
       private
 
-      def valid_selector?
-        selector = self[:selector]
+      def validate_selector?(selector)
         selector.is_a?(Hash) && !selector.empty?
       end
 

data/spec/page_magic/elements/config_spec.rb

@@ -59,6 +59,24 @@ RSpec.describe PageMagic::Elements::Config do
           expect(options.selector).to eq(PageMagic::Element::Selector.find(:id).build(:field, 'child'))
         end
 
+        context 'when is empty hash' do
+          it 'raises an error' do
+            options = described_class.build([{}], :field)
+            expect { options.selector }.to raise_exception(PageMagic::InvalidConfigurationException,
+                                                           described_class::INVALID_SELECTOR_MSG)
+          end
+        end
+
+        context 'when defined on both class and as parameter' do
+          it 'uses the supplied selector' do
+            options = described_class.build([{ css: 'supplied_selector' }], :field)
+            options.definition_class = Class.new(PageMagic::Element) do
+              selector css: 'class_selector'
+            end
+            expect(options.selector).to eq(PageMagic::Element::Selector.find(:css).build(:field, 'supplied_selector'))
+          end
+        end
+
         context 'when page_element class supplied' do
           it 'uses the selector on the class' do
             expected_selector = { css: 'class' }
@@ -91,6 +109,29 @@ RSpec.describe PageMagic::Elements::Config do
           end
         end
       end
+
+      context 'when no selector on class or page_element' do
+        context 'when dynamically assigned element definition block' do
+          it 'uses it' do
+            options = described_class.build([], :field)
+
+            options.definition_class = Class.new(PageMagic::Element) do
+              selector({ css: 'class' })
+            end
+
+            expect(options.selector).to eq(PageMagic::Element::Selector.find(:css).build(:field, 'class'))
+          end
+        end
+
+        context 'when not dynamically assigned' do
+          it 'raises and exception' do
+            options = described_class.build([], :field)
+            options.definition_class = Class.new(PageMagic::Element)
+            expect { options.selector }.to raise_exception(PageMagic::InvalidConfigurationException,
+                                                           described_class::INVALID_SELECTOR_MSG)
+          end
+        end
+      end
     end
 
     it 'sets prefetched options' do
@@ -119,44 +160,6 @@ RSpec.describe PageMagic::Elements::Config do
       }
     end
 
-    describe 'selector' do
-      context 'when nil' do
-        context 'and prefetched `element` is nil' do
-          it 'raise an error' do
-            subject = described_class.new(options.except(:selector, :element))
-            expect { subject.validate! }.to raise_exception(PageMagic::InvalidConfigurationException,
-                                                            described_class::INVALID_SELECTOR_MSG)
-          end
-        end
-
-        context 'when `element` is not nil' do
-          it 'does not raise an error' do
-            subject = described_class.new(options.except(:selector))
-            expect { subject.validate! }.not_to raise_exception
-          end
-        end
-      end
-
-      context 'when is empty hash' do
-        it 'raises an error' do
-          subject = described_class.new(options.update(selector: {}).except(:element))
-          expect { subject.validate! }.to raise_exception(PageMagic::InvalidConfigurationException,
-                                                          described_class::INVALID_SELECTOR_MSG)
-        end
-      end
-
-      context 'when defined on both class and as parameter' do
-        it 'uses the supplied selector' do
-          element_class = Class.new(PageMagic::Element) do
-            selector css: 'selector'
-          end
-
-          subject = described_class.new(options.update(element_class: element_class))
-          expect { subject.validate! }.not_to raise_exception
-        end
-      end
-    end
-
     context 'when type nil' do
       it 'raise an error' do
         subject = described_class.new(options.except(:type))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Leon Davis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport