site_prism-all_there 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13d340b7a35050d9497c7f8f581bdd9fd52e2e1de277dc8898160f00d589b116
-  data.tar.gz: 63f61f0accbe52abb0037aeb77d9f4a3f290281f0257e261520e20499beb5298
+  metadata.gz: 33b0ff10287854efb639165548ea3718efc57094ab5e0e1f11daf8ec7a0f58c6
+  data.tar.gz: 9257c12cd32806afeca3a0891754d942b3cfeac06dc62b082680bf2bac2ee9dd
 SHA512:
-  metadata.gz: 82a6b3eaa4873687a697e2f969cf85b20c74ffb72fe84572a47ee37f076a1e5a26868f8be48c6aefce3ac42888d079d846a10cb84eb5eeca6f345c53a2684841
-  data.tar.gz: 952de2d7fb8aafef01786dadd9e3bc329d0d278fe660fab4835a1f2f085cdc9558ae1ff398c85d60dd2cf72567ed4ed3df605aef641f7da8145ba538fc7a3f59
+  metadata.gz: 5a2603278f614090cd7ecca80d1baf2ae6cf4085eec044fbb68df527d89e1dcec8729e634b89b5fcf70f5eef28bcf529e4f8be60bedd5ef2905c002390f02a14
+  data.tar.gz: 4357d5ce9856f1e9b0193481d813e3f6aeb9189e1950ed5b212e219144b66b3307ab9a710fb5150e8d3711551b1c57faef52bed3a896395fd2ba46accd320951

data/README.md

@@ -8,26 +8,22 @@ As such at the moment, the gem is very much considered a Work in Progress and wo
 
 It is fully expected to have a number of bug-fix / refactor PR's in between each minor release.
 
-In order to use this gem you simply need to do the following
+Add the following code to either `spec_helper.rb` or `env.rb`
 
 ```rb
-# In either spec_helper.rb or env.rb
-
 require 'site_prism/all_there
 
-# Then in either a config or initializer location (Or env.rb / spec_helper.rb)
-
 SitePrism.use_all_there_gem = true
 
-or ...
+# or...
 
 SitePrism.configure do |config|
   config.use_all_there_gem = true
 end
 ```
 
-v1.0 is slated for release some-time in the Autumn/Winter of 2019, with a variety of small interim
-releases being planned in the meantime.
+This gem is currently in the `0.x` phase, meaning it is API unstable and likely to change
+structure going forwards, to conform to the pairing of both gems.
 
 Happy Testing / Developing!
 

data/lib/site_prism/all_there/mapped_items.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module SitePrism
+  module AllThere
+    # Returns the Mapped Items on a specific SitePrism object
+    #
+    # api private
+    #
+    class MappedItems
+      attr_reader :instance
+      private :instance
+
+      def initialize(instance)
+        @instance = instance
+      end
+
+      # All Mapped items on the SitePrism instance as a Symbol Array
+      def array
+        hash.values.flatten.uniq
+      end
+
+      # All 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

@@ -12,19 +12,23 @@ module SitePrism
         @instance = instance
       end
 
-      # This is currently hard-coded to perform a recursion of depth :one
-      # It will be refactored to use either no input, :none, or :one as the
+      # This is currently hard-coded 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
-      def all_there?
-        current_class_all_there? &&
-          section_classes_all_there? &&
-          sections_classes_all_there?
+      def all_there?(recursion: :one)
+        if recursion == :one || SitePrism.recursion_setting == :one
+          current_class_all_there? &&
+            section_classes_all_there? &&
+            sections_classes_all_there?
+        else
+          current_class_all_there?
+        end
       end
 
       private
 
       # This will check all elements that are in the current scope
-      # This is equivalent to checking a recursion value of +:none+
+      # This is equivalent to checking with a recursion value of +:none+
       def current_class_all_there?
         expected_item_map.flatten.all? { |name| there?(name) }
       end
@@ -51,16 +55,16 @@ module SitePrism
 
       def expected_item_map
         [
-          expected(mapped_items, :element),
-          expected(mapped_items, :elements),
-          expected(mapped_items, :section),
-          expected(mapped_items, :sections),
-          expected(mapped_items, :iframe),
+          expected(:element),
+          expected(:elements),
+          expected(:section),
+          expected(:sections),
+          expected(:iframe),
         ]
       end
 
-      def expected(map, type)
-        map[type].select { |name| elements_to_check.include?(name) }
+      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
@@ -68,16 +72,14 @@ module SitePrism
       def elements_to_check
         if _expected_items
           SitePrism.logger.debug('Expected Items has been set.')
-          _mapped_items.select { |name| _expected_items.include?(name) }
+          MappedItems.new(instance).array.select do |name|
+            _expected_items.include?(name)
+          end
         else
-          _mapped_items
+          MappedItems.new(instance).array
         end
       end
 
-      def _mapped_items
-        mapped_items.values.flatten.uniq
-      end
-
       def _expected_items
         instance.class.expected_items
       end
@@ -85,10 +87,6 @@ module SitePrism
       def there?(name)
         instance.send("has_#{name}?")
       end
-
-      def mapped_items
-        @mapped_items ||= instance.class.mapped_items(legacy: false)
-      end
     end
   end
 end

data/lib/site_prism/all_there/version.rb

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

data/lib/site_prism/all_there.rb

@@ -1,20 +1,17 @@
 # frozen_string_literal: true
 
+require 'site_prism/all_there/mapped_items'
 require 'site_prism/all_there/recursion_checker'
 
 # Configure the behaviour of the site_prism-all_there gem
 module SitePrism
   class << self
-    attr_writer :recursion_setting
+    # Configuration setting to use on a global scale
+    # Note this global setting can be overridden at runtime for each individual call
+    attr_accessor :recursion_setting
 
     def configure
       yield self
     end
-
-    # Pass in a configuration setting to use on a global scale
-    # Note this can be overridden at runtime for each individual call
-    def recursion_setting
-      @recursion_setting ||= :none
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_prism-all_there
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Luke Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-07-11 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/mapped_items.rb
 - lib/site_prism/all_there/recursion_checker.rb
 - lib/site_prism/all_there/version.rb
 homepage: https://github.com/site-prism/site_prism-all_there