roger_themes 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a509ded3df0137eb3a297dac0fbc2b53375c5b21
-  data.tar.gz: 77e911078d4f2092123c38ba08471e0f29294db6
+  metadata.gz: 6b72e6fba70a480098551b1f513c9058a5a9cf7e
+  data.tar.gz: 034d928755f8362f5d67202ba7c889025fdf0727
 SHA512:
-  metadata.gz: 46c1970744052789bacaac8e47ec780ba0806efb70f2cd4ce1603087bfc622e096ed2fee751d1e17a8c2a830888d6caa6abee17954fc45a12355b8bbfa28815b
-  data.tar.gz: 3060c2b37a403c0ececb828fe06777290126d773e68f756a7f6514b9d0548724f2fb74a7726f14de5adf9969897786629e6ac7cfa3bb706ad975b7618d1eeb81
+  metadata.gz: d112e902c4ea612e0256ccfb88161d7144047ad1645eed1ef063930179391e4c2190d889c14097707e23e79b2502271d7fd70475e9a2affe77efa3f65bdcbe50
+  data.tar.gz: 6512d6905aac96b5bfa387ab4ba40379e874f01ce0892dd328fd376816c259febed7e68b6524773241063ef9978d45ccc5c62c7773da551aad4fc9d47fc6a803

data/README.md

@@ -48,6 +48,10 @@ mockup.release do |r|
 
 ## Changelog
 
+### v0.4.0
+
+* Resolve issue around shared paths (#1)
+
 ### v0.1.2
 
 * Fix dir merging when a local folder exists

data/lib/roger_themes/middleware.rb

@@ -2,6 +2,8 @@ require File.dirname(__FILE__) + "/shared_folders"
 
 module RogerThemes
   class Middleware
+    attr_accessor :project
+
     def initialize(app, options = {})
       @app = app
 
@@ -29,7 +31,7 @@ module RogerThemes
       ret = @app.call(env)
 
       # Fallback for shared images
-      unless ret[0] == 200
+      if ret[0] == 404
 
         shared_path = @shared_folders.local_to_shared_path(path)
 

data/lib/roger_themes/processor.rb

@@ -57,6 +57,8 @@ module RogerThemes
             "MOCKUP_PROJECT" => release.project
           }
         })
+
+        release.log self, "Running mockup processor for theme: #{theme}"
         mockup_processor.call(release)
 
         # cp html/images and html/fonts => html/themes/**/images && html/themes/**/fonts

data/lib/roger_themes/version.rb

@@ -1,3 +1,3 @@
 module RogerThemes
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/fixture/html/themes/my-awesome-theme/index.html

@@ -0,0 +1 @@
+<h1>My awesome theme index file!</h1>

data/test/middleware_test.rb

@@ -1,18 +1,43 @@
 require "test_helper"
+require "rack/mock"
+require "roger/testing/mock_project"
+
 require "./lib/roger_themes/middleware"
 
-require "rack/mock"
+class MockApp
+  attr_reader :call_stack
+  attr_writer :return_value
+
+  def initialize()
+    @call_stack = []
+
+    @return_value = [200, {}, ["YAM"]]
+  end
+
+  def call(env)
+    @call_stack.push env.dup
+    @return_value
+  end
+end
+
 
 module RogerThemes
   class TestMiddleware < ::Test::Unit::TestCase
 
     def setup
-      @app =  proc { [200, {}, ["YAM"]] } # Yet another middleware
+      @app =  MockApp.new # Yet another middleware
       @middleware = Middleware.new @app
 
+      # Inject mock project
+      @middleware.project = Roger::Testing::MockProject.new("test/fixture")
+
       @request = Rack::MockRequest.new(@middleware)
     end
 
+    def teardown
+      @middleware.project.destroy
+    end
+
     def test_middleware_can_be_called
       assert(@middleware.respond_to?(:call))
     end
@@ -21,5 +46,30 @@ module RogerThemes
       assert_equal @request.get("/my.js").body, "YAM"
     end
 
+    # Theme links work by means of rewriting the path info i.e.
+    # to render and setting the env[site_theme] var
+    def test_theme_links
+      @request.get("/themes/my-awesome-theme/theme/elements/index.html")
+      assert_equal @app.call_stack.length, 1
+      assert_equal @app.call_stack[0]["SITE_THEME"], "my-awesome-theme"
+      assert_equal @app.call_stack[0]["PATH_INFO"], "elements/index.html"
+    end
+
+    def test_shared_resources
+      # Shared resource will update the PATH_INFO to render a shared image or font
+      @app.return_value = [404, {}, ["YAM"]]
+      @request.get("/themes/my-awesome-theme/images/fancy.png")
+      assert_equal @app.call_stack.length, 2
+      assert_equal @app.call_stack[1]["PATH_INFO"], "/images/fancy.png"
+    end
+
+    def test_shared_resources_when_not_modified_is_returned
+      @app.return_value = [304, {}, ["YAM"]]
+      @request.get("/themes/my-awesome-theme/images/fancy.png")
+      assert_equal @app.call_stack.length, 1
+      assert_equal @app.call_stack[0]["PATH_INFO"], "/themes/my-awesome-theme/images/fancy.png"
+    end
+
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger_themes
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Edwin van der Graaf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roger
@@ -116,6 +116,7 @@ files:
 - lib/roger_themes/version.rb
 - lib/roger_themes/xc_finalizer.rb
 - roger_themes.gemspec
+- test/fixture/html/themes/my-awesome-theme/index.html
 - test/middleware_test.rb
 - test/processor_test.rb
 - test/shared_folders_test.rb
@@ -145,6 +146,7 @@ signing_key:
 specification_version: 4
 summary: Create themes and release them as static site
 test_files:
+- test/fixture/html/themes/my-awesome-theme/index.html
 - test/middleware_test.rb
 - test/processor_test.rb
 - test/shared_folders_test.rb