site_prism-all_there 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b0ff10287854efb639165548ea3718efc57094ab5e0e1f11daf8ec7a0f58c6
-  data.tar.gz: 9257c12cd32806afeca3a0891754d942b3cfeac06dc62b082680bf2bac2ee9dd
+  metadata.gz: 98959a1d3f689e5d849760ef9a7960ef696cac8cb8e19c52cfc56da862eabf3d
+  data.tar.gz: 331306ed4ffa6f70922d21da78b1cdbe18b25da839d8fce1afb796d9db0c92d9
 SHA512:
-  metadata.gz: 5a2603278f614090cd7ecca80d1baf2ae6cf4085eec044fbb68df527d89e1dcec8729e634b89b5fcf70f5eef28bcf529e4f8be60bedd5ef2905c002390f02a14
-  data.tar.gz: 4357d5ce9856f1e9b0193481d813e3f6aeb9189e1950ed5b212e219144b66b3307ab9a710fb5150e8d3711551b1c57faef52bed3a896395fd2ba46accd320951
+  metadata.gz: 9e37113f2844e37e68dc9e4f5e5d3c9324cd4b46f9341a001a70dbfe9ea0cdb538b0700201eabba77265b3ec822ab1774bc3ea2225823cd7170ede0e3c8ea34f
+  data.tar.gz: 8e4ae6832dc3cd2d09d65fbb0af6f13089b65c33286f4c2b3f509b7a4764910cfd58330b09d7385971614516711b970cc81035d14eff8e092737ccee99748c90

data/lib/site_prism/all_there/expected_items.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module SitePrism
+  module AllThere
+    # Returns the Expected Item Map on a specific SitePrism object
+    #
+    # api private
+    #
+    class ExpectedItems
+      attr_reader :instance
+      private :instance
+
+      def initialize(instance)
+        @instance = instance
+      end
+
+      def array
+        [
+          mapped_checklist_of(:element),
+          mapped_checklist_of(:elements),
+          mapped_checklist_of(:section),
+          mapped_checklist_of(:sections),
+          mapped_checklist_of(:iframe),
+        ]
+      end
+
+      private
+
+      def mapped_checklist_of(type)
+        mapped_items.hash[type].select { |name| mapped_checklist.include?(name) }
+      end
+
+      # If the page or section has expected_items set, return expected_items that are mapped
+      # otherwise just return the list of all mapped_items
+      def mapped_checklist
+        if checklist
+          SitePrism.logger.debug('Expected Items has been set.')
+          mapped_items.array.select { |name| checklist.include?(name) }
+        else
+          mapped_items.array
+        end
+      end
+
+      # List of expected_items as defined during build phase
+      def checklist
+        instance.class.expected_items
+      end
+
+      def mapped_items
+        @mapped_items ||= MappedItems.new(instance)
+      end
+    end
+  end
+end

data/lib/site_prism/all_there/recursion_checker.rb

@@ -54,34 +54,7 @@ module SitePrism
       end
 
       def expected_item_map
-        [
-          expected(:element),
-          expected(:elements),
-          expected(:section),
-          expected(:sections),
-          expected(:iframe),
-        ]
-      end
-
-      def expected(type)
-        MappedItems.new(instance).hash[type].select { |name| elements_to_check.include?(name) }
-      end
-
-      # If the page or section has expected_items set, return expected_items that are mapped
-      # otherwise just return the list of all mapped_items
-      def elements_to_check
-        if _expected_items
-          SitePrism.logger.debug('Expected Items has been set.')
-          MappedItems.new(instance).array.select do |name|
-            _expected_items.include?(name)
-          end
-        else
-          MappedItems.new(instance).array
-        end
-      end
-
-      def _expected_items
-        instance.class.expected_items
+        ExpectedItems.new(instance).array
       end
 
       def there?(name)

data/lib/site_prism/all_there/version.rb

@@ -2,6 +2,6 @@
 
 module SitePrism
   module AllThere
-    VERSION = '0.2'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_prism-all_there
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Luke Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,6 +92,7 @@ files:
 - LICENSE.md
 - README.md
 - lib/site_prism/all_there.rb
+- lib/site_prism/all_there/expected_items.rb
 - lib/site_prism/all_there/mapped_items.rb
 - lib/site_prism/all_there/recursion_checker.rb
 - lib/site_prism/all_there/version.rb