mascot 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6be4b1751690e6c59370910168e633fa512d4179
-  data.tar.gz: 953289c76d1245c7e037a5a32ededad0321ca8cc
+  metadata.gz: 3cbf26b5dbbcb679dee59b1f38f93d73dfd8bab7
+  data.tar.gz: 53bb98405c06bf85705c397c69bba07992895038
 SHA512:
-  metadata.gz: 61471911d2ef4efb0c017e371d4fa563af64116e40360a0eff0062d14f2397343755c9de4930ea01a8470f66408ef29a136994a1d07236e715ec42b136612df9
-  data.tar.gz: 2a24c41a5618965f225570b912346fa0d2b9863076c2e1e1d876efe6ea78dc79ee65847297dfcd64dc45f86a26f2868e288bfcb91c5d6e6c6f9658c205eb57d9
+  metadata.gz: 4ac9c815391409fd3e57fd942a23b49e7d106cf58f117e9e19f5155860c4f6958fbaeb3a3774658e4b46216788e48abb08efda31d7e74bbc57c4df1e084409d4
+  data.tar.gz: 49099b0682866088cb2aba0cbd16397682a280084de69cade3e378392b3306020be20bd9d0a805c8fa55ec20f5c5f1f65adb67c29aba5310360d94426bbc497c

data/lib/mascot/extensions/layouts.rb

@@ -14,7 +14,7 @@ module Mascot
       end
 
       def process_resources(node)
-        node.resources.each do |resource|
+        node.flatten.each do |resource|
           @rules.each do |rule|
             if rule.processor.call(resource)
               resource.data["layout"] ||= rule.layout

data/lib/mascot/extensions/proc_manipulator.rb

@@ -6,7 +6,7 @@ module Mascot
       end
 
       def process_resources(node)
-        node.resources.each do |resource|
+        node.flatten.each do |resource|
           if @block.arity == 1
             @block.call resource
           else # This will blow up if 0 or greater than 2.

data/lib/mascot/resources_node.rb

@@ -48,26 +48,12 @@ module Mascot
       child_nodes.empty?
     end
 
-    class Resources
-      include Enumerable
-
-      def initialize(node: )
-        @node = node
-      end
-
-      def each(&block)
-        @node.formats.each(&block)
-        @node.children.each { |child| child.resources.each(&block) }
-      end
-
-      def glob(pattern)
-        paths = Dir.glob(pattern)
-        select { |r| paths.include? r.asset.path.to_s }
+    def flatten(resources: [])
+      formats.each{ |resource| resources << resource }
+      children.each do |child|
+        child.flatten.each{ |resource| resources << resource }
       end
-    end
-
-    def resources
-      Resources.new(node: self)
+      resources
     end
 
     def remove
@@ -91,18 +77,18 @@ module Mascot
     end
     alias :[]= :add
 
-    def get_resource(path)
+    def get(path)
       *path, ext = tokenize(path)
       if node = dig(*path)
         node.formats.ext(ext)
       end
     end
 
-    def get(path)
-      *path, ext = tokenize(path)
+    def get_node(path)
+      *path, _ = tokenize(path)
       dig(*path)
     end
-    alias :[] :get
+    alias :[] :get_node
 
     def inspect
       "<#{self.class}: formats=#{formats.map(&:request_path)} children=#{children.map(&:name).inspect}>"

data/lib/mascot/site.rb

@@ -16,27 +16,33 @@ module Mascot
       self.root_path = root_path
     end
 
-    def glob(glob)
-      root.resources.glob(root_path.join(glob))
-    end
-
-    # Returns a list of resources.
+    # A tree representation of the resourecs wthin the site.
     def root
-      ResourcesNode.new.tap do |root_node|
-        DirectoryCollection.new(assets: assets, path: root_path).mount(root_node)
-        resources_pipeline.process root_node
+      ResourcesNode.new.tap do |node|
+        DirectoryCollection.new(assets: assets, path: root_path).mount(node)
+        resources_pipeline.process node
       end
     end
 
-    # Quick and dirty way to manipulate resources in the site without
-    # creating classes that implement the #process_resources method
-    def manipulate(&block)
-      resources_pipeline << Extensions::ProcManipulator.new(block)
+    # Returns a list of all the resources within #root.
+    def resources
+      root.flatten
+    end
+
+    def glob(pattern)
+      paths = Dir.glob root_path.join(pattern)
+      resources.select { |r| paths.include? r.asset.path.to_s }
     end
 
     # Find the page with a path.
     def get(request_path)
-      root.get_resource(request_path)
+      root.get(request_path)
+    end
+
+    # Quick and dirty way to manipulate resources in the site without
+    # creating classes that implement the #process_resources method
+    def manipulate(&block)
+      resources_pipeline << Extensions::ProcManipulator.new(block)
     end
 
     def root_path=(path)

data/lib/mascot/version.rb

@@ -1,3 +1,3 @@
 module Mascot
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mascot
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Brad Gessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-03 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler