mascot-rails 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29781381e53ccaa59c4ad31f6d72f7d3758ce577
-  data.tar.gz: a7fc2422181f3cdc8a92ddb2656f08dc16197f27
+  metadata.gz: af6e9c3364ea71baba94e6f5ef9bb1da5f6b9f1a
+  data.tar.gz: 2005e26040c90e08b059b47badb31892f9cd13d8
 SHA512:
-  metadata.gz: 40015fba5b9569f3fe55000e73b497abfc3d3d1d90a44bb2171a2ce00b0f853319d008a0595235fbebe1e86c280152596a16d8cfa1a286289058b9d453753fce
-  data.tar.gz: e1672053721e6092c34966dddae73f24170db1b1bf2fdd523965ec3552fd33d7cc65e9a8be67bb66ccd677cd79b4c5d57c9d2dbf1986d8007eb131db64a58a3b
+  metadata.gz: af3841f8d9b0e042e6ef4504fd4032e144ae40473caff36b0265db9ddbc05f8b4b6edc571c5c4055cdfe533ea16a7a7db149691b03d1c1459548e1166fc6c412
+  data.tar.gz: df370017cb3d2f457720c3a7126eeef85515d066278e6cb05b7bb1685dca3ceb3adb1850da4504e6f710c3c6fbb36bb9fb126e2cfefb9ffeecb92e6a22758707

data/lib/mascot/action_controller_context.rb

@@ -29,7 +29,7 @@ module Mascot
     # Mascot::PageNotFoundError is handled in the default Mascot::SiteController
     # with an execption that Rails can use to display a 404 error.
     def get(path)
-      resource = resources.get(path)
+      resource = resources.get_resource(path)
       if resource.nil?
         # TODO: Display error in context of Reources class root.
         raise Mascot::PageNotFoundError, "No such page: #{path}"

data/lib/mascot/extensions/index_request_path.rb

@@ -9,11 +9,13 @@ module Mascot
         @file_name = file_name
       end
 
-      def process_resources(resources)
-        resources.each do |r|
-          if r.asset.path.basename.to_s.start_with? @file_name
-            # TODO: Conslidate this into SafeRoot.
-            r.request_path = Pathname.new("/").join(r.request_path).dirname.cleanpath.to_s
+      def process_resources(node)
+        node.each do |r|
+          asset = r.asset
+          if asset.path.basename.to_s.start_with? @file_name
+            request_path = Pathname.new("/").join(r.request_path).dirname.cleanpath.to_s
+            node.remove_resource(r)
+            node.add(path: request_path, asset: asset)
           end
         end
       end

data/lib/mascot/extensions/partials_remover.rb

@@ -7,7 +7,7 @@ module Mascot
 
       def process_resources(resources)
         resources.each do |r|
-          resources.remove r if self.class.partial? r.asset.path # Looks like a smiley face, doesn't it?
+          r.node.remove if self.class.partial? r.asset.path # Looks like a smiley face, doesn't it?
         end
       end
 

data/lib/mascot/extensions/rails_request_paths.rb

@@ -5,7 +5,10 @@ module Mascot
     class RailsRequestPaths
       def process_resources(resources)
         resources.each do |r|
-          r.request_path = self.class.format_path r.request_path
+          asset = r.asset
+          request_path = r.request_path
+          r.node.remove
+          resources.add path: self.class.format_path(request_path), asset: asset
         end
       end