site_prism-all_there 2.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 376c04f51a8a815bae55f513721968bf3069c6fdc0f7f4685eaed8f05240f131
-  data.tar.gz: 3d181c424334f8c7be4749bc7f381508b4a9ea8f27aaa8ce74fcb817b7d6cad4
+  metadata.gz: dbdb3fd1e22f9f832cb21e808f77a1c0c236f25442874f692df69bb0d1437367
+  data.tar.gz: b98ec38bc16d1f410dc1584ced388a451856295660a9492d64a2b789cd450153
 SHA512:
-  metadata.gz: c12c252c431577beb45a46a895a891e486f583293f860711c3ad5fc405b05a24db55e498e1892c294a37eab9c580806a9c6660eb6438092985a7291534e495c5
-  data.tar.gz: 6024f46050a28a69fbffcfa40d763899abe0c3a7d10cbb9e32405eef14b0acfc2a6643c86560e416f6162a56e623cb5f6776337ccf6814cd0a40997cfaff4c4d
+  metadata.gz: b068d588ecb66eae71bb7a5bca3ed990b6f38a7c5b6a6b617edab27f63666a2bfb7a6afd21c07f362cfbcc4930a2ce6b4b1dd6abb724927793f5f2438ba2602a
+  data.tar.gz: 0fa5d87ac1f7aa303dac2754eb3b6303522bfb5ba0b70772e971207f8a0da0621e606f7243c8db2f6065df0d22fc2202d2d31d998606dc3cdc0201710c8a8216

data/README.md

@@ -11,30 +11,13 @@
 This in the breakout gem from SitePrism to perform recursion checks for `#all_there?`
 
 This gem is a breakout of the current `SitePrism::Page#all_there?` and `SitePrism::Section#all_there?`
-methods which have already existed in the gem since version 2.
+methods which have already existed in the gem since version 2
 
-The gem is **now finally** version stable. It will be added as default
-functionality in `site_prism` version 4. Which is slated for release early 2023!
+The gem is **now finally** version stable. It is now default functionality in `site_prism` version 4
 
 ## Enabling gem methods
 
-- Add the following code to either `spec_helper.rb` or `env.rb` (Pre version 4)
-
-```rb
-require 'site_prism/all_there'
-
-SitePrism.use_all_there_gem = true
-
-# or...
-
-require 'site_prism/all_there'
-
-SitePrism.configure do |config|
-  config.use_all_there_gem = true
-end
-```
-
-> From version 4 onwards this is done by default and isn't required
+The gem methods are now (by default), enabled with `site_prism` version 4 and above
 
 ## Usage
 
@@ -45,7 +28,7 @@ your_page = YourPage.new
 
 your_page.all_there?(recursion: :none)     # This will do the standard `#all_there?` check on the current page
 your_page.all_there?(recursion: :one)      # This will do the standard `#all_there?` check on the current page as well recursing into all `:section` or `:sections` objects and then doing the standard `#all_there?` check on those `Section` instances
-your_page.all_there?(recursion: :invalid)  # This will not perform any checks and just throw an error message
+your_page.all_there?(recursion: :invalid)  # This will not perform any checks and just log an error
 ```
 
 ### Global configuration
@@ -69,7 +52,7 @@ Then you can perform the above checks using the global config.
 
 ## Troubleshooting
 
-Mixing and matching the global config won't work - To come in v3!
+**Mixing and matching the global config won't work - To come in v3!**
 
 Happy Testing / Developing!
 

data/lib/site_prism/all_there/expected_items.rb

@@ -23,7 +23,7 @@ module SitePrism
           elements,
           section,
           sections,
-          iframe,
+          iframe
         ]
       end
 
@@ -64,18 +64,14 @@ module SitePrism
       end
 
       def mapped_checklist
-        if checklist
+        if instance.class.expected_items
           SitePrism.logger.debug('Expected Items has been set.')
-          mapped_items.array.select { |name| checklist.include?(name) }
+          mapped_items.array & instance.class.expected_items
         else
           mapped_items.array
         end
       end
 
-      def checklist
-        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(legacy: false)
-      end
     end
   end
 end

data/lib/site_prism/all_there/recursion_checker.rb

@@ -16,9 +16,8 @@ module SitePrism
       end
 
       # @return [Boolean]
-      # This currently defaults to perform a recursion of depth +:one+
-      # It will be refactored to use either no input, +:none+, or +:one+ as the
-      # regular repo uses currently
+      # This currently defaults to perform a recursion of depth +:one+ (From the main `site_prism` gem)
+      # It will be refactored to use either no input, +:none+, or +:one+ as the regular repo uses currently
       def all_there?(recursion:)
         recursion = SitePrism.recursion_setting if SitePrism.recursion_setting
 

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'
+    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'
+  version: 2.0.2
 platform: ruby
 authors:
 - Luke Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,62 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.47.0
+        version: 1.50.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.47.0
+        version: 1.50.2
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.1
+        version: 2.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.1
+        version: 2.20.0
 - !ruby/object:Gem::Dependency
   name: site_prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +95,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 description: |-
-  SitePrism AllThere gives you a simple DSL in order to recursively query,
-  page/section/element structures on your page - exclusively for use with the SitePrism gem.
+  SitePrism AllThere allows you to recursively query page and section structures
+  on your page - exclusively for use with the SitePrism gem.
 email:
 - lukehill_uk@hotmail.com
 executables: []
@@ -138,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: An extension to allow you to recurse through your SitePrism Pages/Sections