site_prism-all_there 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30c5d744ba8f905404ca0528296024d8cde291be2e7608d2c50202c74990edbe
-  data.tar.gz: 6f10c96510f93848b8ecb2088fb344c28d89a0e0059e686811dd076777d14e05
+  metadata.gz: dbdb3fd1e22f9f832cb21e808f77a1c0c236f25442874f692df69bb0d1437367
+  data.tar.gz: b98ec38bc16d1f410dc1584ced388a451856295660a9492d64a2b789cd450153
 SHA512:
-  metadata.gz: e8a8ec5769a6a32eb9b8c7475544a3d39491e35d4f30b38418e3b8eb59f5daa8b3de8a98ae0bb0d2aa8aa51166a53902db5d41d70750a76493c028c088ae9cdb
-  data.tar.gz: d1d7abc5f369069f99681c8488aa1ee500c1ffdaf41702a7496b3292eff9769e8ddf5e11c4261b146691051f0b40ca8df8debb168ec486be5557ed1d6c17daa6
+  metadata.gz: b068d588ecb66eae71bb7a5bca3ed990b6f38a7c5b6a6b617edab27f63666a2bfb7a6afd21c07f362cfbcc4930a2ce6b4b1dd6abb724927793f5f2438ba2602a
+  data.tar.gz: 0fa5d87ac1f7aa303dac2754eb3b6303522bfb5ba0b70772e971207f8a0da0621e606f7243c8db2f6065df0d22fc2202d2d31d998606dc3cdc0201710c8a8216

data/lib/site_prism/all_there/expected_items.rb

@@ -64,18 +64,14 @@ module SitePrism
       end
 
       def mapped_checklist
-        if expected_items
+        if instance.class.expected_items
           SitePrism.logger.debug('Expected Items has been set.')
-          mapped_items.array.select { |name| expected_items.include?(name) }
+          mapped_items.array & instance.class.expected_items
         else
           mapped_items.array
         end
       end
 
-      def expected_items
-        instance.class.expected_items
-      end
-
       def mapped_items
         @mapped_items ||= MappedItems.new(instance)
       end

data/lib/site_prism/all_there/mapped_items.rb

@@ -8,11 +8,10 @@ module SitePrism
     # The Expected Items on a SitePrism Page or Section structured in an enumerable way
     #
     class MappedItems
-      attr_reader :instance
-      private :instance
+      attr_reader :hash
 
       def initialize(instance)
-        @instance = instance
+        @hash = instance.class.mapped_items
       end
 
       # @return [Array<Symbol>]
@@ -20,12 +19,6 @@ module SitePrism
       def array
         hash.values.flatten.uniq
       end
-
-      # @return [Hash<Symbol>]
-      # All expected mapped items on the SitePrism instance as a Symbol Hash
-      def hash
-        instance.class.mapped_items
-      end
     end
   end
 end

data/lib/site_prism/all_there/version.rb

@@ -4,6 +4,6 @@ module SitePrism
   module AllThere
     # @return [String]
     # Version of the gem
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_prism-all_there
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Luke Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-01 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: An extension to allow you to recurse through your SitePrism Pages/Sections