great_pretender 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ded13adb89cf39cbc783b42fec961b8d1918a0e5
-  data.tar.gz: 5a3842182ee81c1acb8fb1937208a0f40f7ca45e
+  metadata.gz: eb62253be2761441bf8ea8afce272f260d2a2bb6
+  data.tar.gz: 150374a364f75f88ef4d501e4c8aae17d4314c1c
 SHA512:
-  metadata.gz: 492883658952702e1d4edf14d76a148e3c080d293a3ac72aeca6339d397d115d87258693e7f931be9c6f863b6bf43a0ccfa356f95f874fb40d47aa94283949f8
-  data.tar.gz: 2e77e4ce36db26b0ff71a39ec85f70260e0fb981b57d425fee7949646b61c5753aa3e8e4c65eb6ae1780f62b280cbcda847541dbe3fc5b03fb317bd403a59097
+  metadata.gz: 2e93f794863f798c0acd61d114bb702f1324d9986e3e29b71cf7a4f9a49071b9b0b5b3db168d346b4d223042d77ac2bb27cc0ab9a3ba3c40b489b284e41199db
+  data.tar.gz: a71df485d09157758175644eea9485ca2ff02e6dd50179dc5771b3bbbf85ddfa9a59fd9d7399193f5338e1f4bd589b55b2af03ffce024c3eb6d17034ab2c88d7

data/lib/great_pretender/mockup.rb

@@ -4,7 +4,7 @@ require "great_pretender/config"
 module GreatPretender
   class Mockup
 
-    attr_accessor :layout, :slug, :template
+    attr_accessor :layout, :path, :slug, :template
 
     alias :to_param :slug
 

data/lib/great_pretender/mockup_locator.rb

@@ -49,7 +49,9 @@ module GreatPretender
         # Mockups can have a layout by being in a folder named after that
         # layout; for example, "app/views/mockups/admin/index" will look for an
         # "admin" template
-        layout = slug.split('/').first
+        layout = slug.split('/')
+        layout.pop
+        layout = layout.join('/')
         if layout && layout.length > 0
           @view_paths.each do |view_path|
             layout_path = view_path.join('layouts')
@@ -63,6 +65,7 @@ module GreatPretender
 
     def mockup_for(view_path, root, path)
       mockup = Mockup.new(path)
+      mockup.path = path
       mockup.slug = slug_for(root, path)
       mockup.layout = layout_for(mockup.slug)
       mockup.template = template_for(view_path, root, mockup.slug)

data/lib/great_pretender/version.rb

@@ -1,3 +1,3 @@
 module GreatPretender
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/great_pretender/mockup_locator_spec.rb

@@ -19,10 +19,11 @@ describe GreatPretender::MockupLocator do
   let(:regular_mockup) { mockup_locator.mockups.find {|m| m.slug =~ /^processed/ } }
   let(:partial_mockup) { mockup_locator.mockups.find {|m| m.slug =~ /^_/ } }
   let(:admin_mockup) { mockup_locator.mockups.find {|m| m.slug =~ /admin/ } }
+  let(:nested_admin_mockup) { mockup_locator.mockups.find {|m| m.slug =~ /admin\/base/ } }
 
   context "::mockups" do
     it "returns all mockups in the pre-configured mockup directories" do
-      expect(mockup_locator.mockups.size).to eq(5)
+      expect(mockup_locator.mockups.size).to eq(6)
     end
 
     it "returns mockups with Rails-friendly template names" do
@@ -40,6 +41,10 @@ describe GreatPretender::MockupLocator do
     it "returns detected layouts for well-named mockups" do
       expect(admin_mockup.layout).to eq("admin")
     end
+
+    it "returns layouts in sub-folders, too" do
+      expect(nested_admin_mockup.layout).to eq("admin/base")
+    end
   end
 
   context "::find" do

data/spec/lib/great_pretender/mockup_spec.rb

@@ -28,7 +28,8 @@ describe GreatPretender::Mockup do
 
   context ".updated_at" do
     it "returns the template file's mtime for its slug" do
-      expect(mockup.updated_at).to eq(Time.at(1407427839))
+      `touch #{mockup.path}`
+      expect(mockup.updated_at.to_i).to eq(Time.now.to_i)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: great_pretender
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Flip Sasser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,10 +70,12 @@ files:
 - spec/controllers/great_pretender/mockups_controller_spec.rb
 - spec/fixtures/view_path_a/.DS_Store
 - spec/fixtures/view_path_a/layouts/admin.html.slim
+- spec/fixtures/view_path_a/layouts/admin/base.html.slim
 - spec/fixtures/view_path_a/mockups/_partial.haml
 - spec/fixtures/view_path_a/mockups/no_processed.slim
 - spec/fixtures/view_path_a/mockups/processed.html.erb
 - spec/fixtures/view_path_b/mockups/_partial.html.haml
+- spec/fixtures/view_path_b/mockups/admin/base/nested_layout.html.slim
 - spec/fixtures/view_path_b/mockups/admin/index.html.erb
 - spec/lib/great_pretender/config_spec.rb
 - spec/lib/great_pretender/mockup_locator_spec.rb
@@ -110,10 +112,12 @@ test_files:
 - spec/controllers/great_pretender/mockups_controller_spec.rb
 - spec/fixtures/view_path_a/.DS_Store
 - spec/fixtures/view_path_a/layouts/admin.html.slim
+- spec/fixtures/view_path_a/layouts/admin/base.html.slim
 - spec/fixtures/view_path_a/mockups/_partial.haml
 - spec/fixtures/view_path_a/mockups/no_processed.slim
 - spec/fixtures/view_path_a/mockups/processed.html.erb
 - spec/fixtures/view_path_b/mockups/_partial.html.haml
+- spec/fixtures/view_path_b/mockups/admin/base/nested_layout.html.slim
 - spec/fixtures/view_path_b/mockups/admin/index.html.erb
 - spec/lib/great_pretender/config_spec.rb
 - spec/lib/great_pretender/mockup_locator_spec.rb