mascot 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 343ff35dc45cb328c96b03d009e1d5363af15596
-  data.tar.gz: 3790e946be54e8797e486254c4c1abd34eaacc89
+  metadata.gz: 3076800f4b6e26c015d5ebd26ef066554c791740
+  data.tar.gz: 623e0ab9c640f0176f1358b318252ece1d14cae2
 SHA512:
-  metadata.gz: c7d62cff29add7de74381c8b7fbdbdcdbd3adf69cac04f5202d9e29d4cb0d46fa37073cb61d2b2afd3414e97b991e834dd47cfb2ef11c204f76f9d8fd482fa0b
-  data.tar.gz: 21d6e1e972cc405b0c0178b1abf445ee7f341ee89b191ec6ea744eb020ad4dc90053054d8afaa7a1add49aa07fcf460369e9724e8eec550bff1a94c445f90143
+  metadata.gz: ff1773ff6586b2f6f3da6158abe7177b0208db6235ed6bcdb2f2c6f050e0ec24a05e44001565365a262a7816dd68c4c0564ee93a39a58925ea7ac43c02aa9d31
+  data.tar.gz: 62826327d9c4b2605f1348053b9abce0d80384e7caa3acee6c36ef4dbfcf8f51a78f2ab572231f088bc3a89a5f58b13ce5004894adec50550dc928132e5b38eb

data/lib/mascot/version.rb

@@ -1,3 +1,3 @@
 module Mascot
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/mascot.rb

@@ -34,13 +34,6 @@ module Mascot
     # the resource and figure out what to do with it.
     DEFAULT_MIME_TYPE = MIME::Types["application/octet-stream"].first
 
-    # TODO: I don't like the Binding, locals, and frontmatter
-    # being in the Resource. That should be moved to a page
-    # object and be delegated to that. Or perhaps the page body?
-    # I'm moving forward with this now though to keep the objects simpler.
-    # We'll see how it evolves.
-    Binding = Struct.new(:data)
-
     attr_reader :request_path, :file_path
 
     extend Forwardable
@@ -53,11 +46,6 @@ module Mascot
       @mime_types = Array(mime_type) if mime_type
     end
 
-    # Locals that should be merged into or given to the rendering context.
-    def locals
-      { current_page: Binding.new(data) }
-    end
-
     # List of all file extensions.
     def extensions
       @file_path.basename.to_s.split(".").drop(1)
@@ -94,21 +82,31 @@ module Mascot
     # Default root request path
     DEFAULT_ROOT_REQUEST_PATH = Pathname.new("/").freeze
 
+    attr_reader :file_path, :request_path
+
     def initialize(file_path: DEFAULT_ROOT_DIR, request_path: DEFAULT_ROOT_REQUEST_PATH)
-      @file_path = Pathname.new(file_path)
-      @request_path = Pathname.new(request_path)
+      self.file_path = file_path
+      self.request_path = request_path
     end
 
     # Lazy stream of resources.
     def resources(glob = DEFAULT_GLOB)
-      Dir[@file_path.join(glob)].lazy.map do |path|
+      Dir[@file_path.join(glob)].select(&File.method(:file?)).lazy.map do |path|
         Resource.new request_path: request_path(path), file_path: path
       end
     end
 
     # Find the page with a path.
     def find_by_request_path(request_path)
-      resources.find { |r| r.request_path == request_path }
+      resources.find { |r| r.request_path == File.join("/", request_path) }
+    end
+
+    def file_path=(path)
+      @file_path = Pathname.new(path)
+    end
+
+    def request_path=(path)
+      @request_path = Pathname.new(path)
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mascot
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Brad Gessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler