roger_themes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b63e9a0d29f1d4e0df12497b08d7f56d83affac
-  data.tar.gz: 4fef515bcb437cd4f8cbbf4c459943ad63b5aba6
+  metadata.gz: c557907ae7ff03c77d87796dee8b90bb8ceb61ae
+  data.tar.gz: 05b2114889f32f02edc66b47c9233604a991eff2
 SHA512:
-  metadata.gz: 968477fc9647d6a5db8e0c9263f3cbc2fa82b33949cfa4784218e291aaaf7e91e26174a9dafcf6d66db1d2603694edf214578e0d47b464fc97eb617692574e26
-  data.tar.gz: 82782688fd8b8503391d1fbb06d253dda0e8d730ab0c7660da57429548d41e22691e321da0095fa9410831b8ee9af1e3f188de869444166e50affc7b2853e898
+  metadata.gz: d6b5873d6dd589818aafbe801437298c7ca86eedabbd168a1f3b0a7283694607f08fbf597f9c93bbd3038434ee507f67ec866cb71490da488e431b74edc48668
+  data.tar.gz: ef451f5bb58427ee8a5380511a159a0481a7a7cf8445a20bfcbb0068ad669f8a8060a3c15527c29a63530737dd5befc4133d399852143db9062d199f704741d8

data/README.md

@@ -48,6 +48,10 @@ mockup.release do |r|
 
 ## Changelog
 
+### v0.1.2
+
+* Fix dir merging when a local folder exists
+
 ### v0.1.1
 
 * Update processor

data/lib/roger_themes/processor.rb

@@ -1,3 +1,4 @@
+require "roger/release"
 require "roger/release/processors/mockup"
 
 module RogerThemes
@@ -17,7 +18,7 @@ module RogerThemes
       @options = defaults.update(options)
     end
 
-    def call(release, options)
+    def call(release, options = {})
       @options = @options.dup.update(options)
 
       files_glob = "**/*{.html,.html.erb}"
@@ -74,7 +75,9 @@ module RogerThemes
         Dir.chdir(release.build_path + "themes/#{theme}") do
           release.debug self, "Copying assets for #{theme}"
           shared_folders.folders.each do |copy_from, copy_to|
-            cp_r release.build_path + copy_from, copy_to
+            if File.directory? release.build_path + copy_from
+              cp_r release.build_path + "#{copy_from}/.", copy_to
+            end
           end
         end
       end

data/lib/roger_themes/version.rb

@@ -1,3 +1,3 @@
 module RogerThemes
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/processor_test.rb

@@ -0,0 +1,56 @@
+require "./lib/roger_themes/processor"
+require "roger/testing/mock_release"
+
+require "test_helper"
+
+module RogerThemes
+  class TestProcessor < ::Test::Unit::TestCase
+    def setup
+      @release = Roger::Testing::MockRelease.new
+      @release.project.construct.directory "build" do |dir|
+        dir.directory "themes/default/"
+      end
+
+      @processor = Processor.new
+    end
+
+    def teardown
+      @release.destroy
+    end
+
+    def test_processor_can_be_called
+      assert(@processor.respond_to?(:call))
+    end
+
+    def test_processor_copies_shared_folders
+      @release.project.construct.directory "build" do |dir|
+        dir.file "fonts/abc/info.txt", "Default font"
+      end
+
+      @processor.call(@release)
+
+      shared_font = read_file_in_build("themes/default/fonts/abc/info.txt")
+      assert shared_font.include?("Default font")
+    end
+
+    def test_processor_copies_shared_folders_with_local_folder
+      @release.project.construct.directory "build" do |dir|
+        dir.file "themes/default/fonts/def/info.txt", "Custom theme font"
+        dir.file "fonts/abc/info.txt", "Default font"
+      end
+
+      @processor.call(@release)
+
+      localised_font = read_file_in_build("themes/default/fonts/def/info.txt")
+      shared_font = read_file_in_build("themes/default/fonts/abc/info.txt")
+      assert localised_font.include?("Custom theme font")
+      assert shared_font.include?("Default font")
+    end
+
+    protected
+
+    def read_file_in_build(path)
+      File.read((@release.build_path + path).to_s)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger_themes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Edwin van der Graaf
@@ -115,6 +115,7 @@ files:
 - lib/roger_themes/xc_finalizer.rb
 - roger_themes.gemspec
 - test/middleware_test.rb
+- test/processor_test.rb
 - test/shared_folders_test.rb
 - test/test_helper.rb
 homepage: https://github.com/digitpaint/roger_themes
@@ -143,5 +144,6 @@ specification_version: 4
 summary: Create themes and release them as static site
 test_files:
 - test/middleware_test.rb
+- test/processor_test.rb
 - test/shared_folders_test.rb
 - test/test_helper.rb