chopin 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c5f551420f6275ad7d568ee1dba02cb46f55b69
-  data.tar.gz: 0ce8517aa65ed6d018af7fdb572e5e79b69dea8b
+  metadata.gz: 0c70a52f652b5dcb36cc2439e958656110ee1fac
+  data.tar.gz: 36a5e98ade67fa135bce10ba6bc86d2752a8b84b
 SHA512:
-  metadata.gz: 95a22b4c2c10d70788466793267cf3497febd94d2e9f4265f760264b7da1d72702f14746f561dfcdbf77114455a048f730b9ccee09f26be9585592c345903c96
-  data.tar.gz: ecb7d7fb16bb61418ed6ae3f1cc07d858f5bd6c155f6fe09be94e520a41487d9525fea5e532b65268e92b027d3c8470eaad377717803653067c95eb157a20bfb
+  metadata.gz: a75e3768ecfdb1dc124b87c712bab77173bcab5bbd7b59441c92b7532331fe8f64f465c023f8abb4603d756499bf1d5c2eb160a44aca81ffac1f74d2efe60439
+  data.tar.gz: 0ac052c43843764c920b556526b3918a75fdcc73dc704ab31ab0f385c8434cccfac716ec8edc9e2dc70c69b312dc9ea86d984ad4bf39519abbf31c19250ab259

data/bin/chopin

@@ -4,4 +4,4 @@ $:.unshift(lib_path)
 
 require 'chopin'
 
-Chopin.copy(ARGV[0], ARGV[1])
+Chopin.copy(ARGV[0].chomp('/'), ARGV[1].chomp('/'))

data/lib/chopin.rb

@@ -6,21 +6,20 @@ require 'redcarpet'
 require 'sass'
 
 module Chopin
-  def self.copy(source, destination, layout = nil)
+  def self.copy(source, dest_root, layout = nil)
     @root = source unless @root
 
     if File.directory?(source)
+      destination = "#{dest_root}/#{File.basename(source).sub(@root, '')}".chomp('/')
+
       unless Dir.exists?(destination)
         Dir.mkdir(destination)
         puts " #{GREEN}Create#{WHITE} #{destination}"
       end
 
-      source_directory = Dir.new(source)
-      destination_directory = Dir.new(destination)
-
       layout = "#{source}/layout.erb" if File.exist?("#{source}/layout.erb")
 
-      source_directory.each do |file|
+      Dir.new(source).each do |file|
         next if file == '.' || file == '..'
 
         if file[0] == '.'
@@ -33,20 +32,20 @@ module Chopin
     else
       case File.extname(source)
         when '.erb'
-          process_erb(source, destination, layout) unless File.basename(source, '.erb') == 'layout'
+          process_erb(source, dest_root, layout) unless File.basename(source, '.erb') == 'layout'
 
         when '.md'
-          process_markdown(source, destination, layout)
+          process_markdown(source, dest_root, layout)
 
         when '.sass'
-          process_sass(source, destination, :sass) unless File.basename(source)[0] == '_'
+          process_sass(source, dest_root, :sass) unless File.basename(source)[0] == '_'
 
         when '.scss'
-          process_sass(source, destination, :scss) unless File.basename(source)[0] == '_'
+          process_sass(source, dest_root, :scss) unless File.basename(source)[0] == '_'
 
         else
           puts " #{BLUE}Copy#{WHITE} #{source} -> #{destination}"
-          FileUtils.cp(source, destination)
+          FileUtils.cp(source, dest_root)
       end
     end
   end
@@ -59,34 +58,45 @@ module Chopin
       .join('-')
   end
 
-  def self.process_erb(source, destination, layout)
+  def self.process_erb(source, dest_dir, layout)
     base_name = File.basename(source, '.erb')
-    destination_html = "#{destination}/#{base_name}.html"
-    puts " #{PURPLE}Parse#{WHITE} #{source} (into #{layout}) -> #{destination_html}"
+    destination = "#{dest_dir}/#{base_name}.html"
 
-    render_template(destination_html, layout, Namespace.new({
-      page_name: get_page_name(source),
-      content: ERB.new(File.read(source)).result
-    }))
+    if layout == nil
+      puts " #{PURPLE}Parse#{WHITE} #{source} -> #{destination}"
+
+      File.new(destination, 'w').write(
+        ERB.new(File.read(source)).result(Namespace.new({
+          page_name: get_page_name(source)
+        }).get_binding)
+      )
+    else
+      puts " #{PURPLE}Parse#{WHITE} #{source} (into #{layout}) -> #{destination}"
+
+      render_template(destination, layout, Namespace.new({
+        page_name: get_page_name(source),
+        content: ERB.new(File.read(source)).result
+      }))
+    end
   end
 
-  def self.process_markdown(source, destination, layout)
+  def self.process_markdown(source, dest_dir, layout)
     base_name = File.basename(source, '.md')
-    destination_html = "#{destination}/#{base_name}.html"
-    puts " #{PURPLE}Parse#{WHITE} #{source} (into #{layout}) -> #{destination_html}"
+    destination = "#{dest_dir}/#{base_name}.html"
+    puts " #{PURPLE}Parse#{WHITE} #{source} (into #{layout}) -> #{destination}"
 
-    render_template(destination_html, layout, Namespace.new({
+    render_template(destination, layout, Namespace.new({
       page_name: get_page_name(source),
       content: MD.render(File.new(source).read)
     }))
   end
 
-  def self.process_sass(source, destination, type)
+  def self.process_sass(source, dest_dir, type)
     base_name = File.basename(source, File.extname(source))
-    destination_css = "#{destination}/#{base_name}.css"
-    puts " #{CYAN}Convert#{WHITE} #{source} -> #{destination_css}"
+    destination = "#{dest_dir}/#{base_name}.css"
+    puts " #{CYAN}Convert#{WHITE} #{source} -> #{destination}"
 
-    File.new(destination_css, 'w').write(
+    File.new(destination, 'w').write(
       Sass::Engine.new(File.new(source).read,
         load_paths: [File.dirname(source)],
         syntax: type
@@ -94,8 +104,8 @@ module Chopin
     )
   end
 
-  def self.render_template(destination_html, layout, namespace)
-    File.new(destination_html, 'w').write(
+  def self.render_template(destination, layout, namespace)
+    File.new(destination, 'w').write(
       ERB.new(File.read(layout)).result(namespace.get_binding)
     )
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chopin
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Josh Forisha