jing 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0109a16bd2e74f10edbe5aa725d5e8b63ff68e1ba1c5b5668641f351a2f172f
-  data.tar.gz: f5c8d6cf786cfc9032d3f06c1a8c4361e7a612a3b8927c11b1e45256981ce3dc
+  metadata.gz: 40b0c3e50b02a0213e97bd9b1a7fd5f4e8b8efce03faad1e4943906bc300c186
+  data.tar.gz: 2ad0975e17e68f10b3187f38dab7321f98c23adac21e7e9b477149325c0c8f2f
 SHA512:
-  metadata.gz: d2bb4d26c9d2371c680f347e1ffec482c83a2179a750063a252791ffb70c0440027991f398ca40d6cd65a4b1e0c9e5097a9a67fdb244b99ca1f0bb9f8528c104
-  data.tar.gz: 23ed2e92a0df6b52bd94c0c48a81ba5364125a4e1e0380e2c47cff09f929f11e0837cc21c6a306f47680c991ecf936657f68f5dc167a30dd31f59d663d010242
+  metadata.gz: 0dc11fe05f38be3035d01941b3aea6ea8f0a4dfe978711dbfad8421ddecb0bfd0e54a3be57ba5ea5b38461d9670eb32f0983674113e13111ff8a4677aa53bfb0
+  data.tar.gz: 3ce97d022d737b8b781ee95a916dd5d72b2d0390410fe5e43c165b44567f466e5ff320de2e9a4d717b2a7719c66d13230c9fec8bfb70291b63888949ed7a188b

data/README.md

@@ -61,9 +61,15 @@ Folders starting with `_` have special meaning, they generally won't get copied
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Extending is fairly easy.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+`@converters` variable in the initialize method holds a bunch of converters. Just add one in the spirit of the others. You can also do this on the fly when initiating the Jing Class by passing the `converter_addons` option.
+
+Class methods that end in a bang `!` automatically are registered as cli commands. If you wish to add a command just add a bang-method and you should be done.
+
+Feel free to open issues for questions / ideas etc that you don't know how to work on or have no time working on as well as actual bugs and quirky etc. I'm sure there are some.
+
+Please fork and make a pull request if you want to contribute.
 
 ## Contributing
 

data/build_and_install.sh

@@ -0,0 +1,3 @@
+#rm *.gem
+gem build jing.gemspec
+rake install

data/lib/jing.rb

@@ -9,19 +9,22 @@ module Jing
     def initialize(opts={})
       @src = File.expand_path(opts[:src] || Dir.pwd)
       @dst = File.expand_path(opts[:dst] || File.join(@src, '_dst'))
+      @layouts = opts[:layouts] || '_layouts'
+      @partials = opts[:partials] || '_partials'
+      @loaded_gems = {}
       @converters = (opts[:converter_addons] || []) + [
         {extensions: %w[erb], handler: Proc.new { |body, meta, ctx|
           ERB.new(body).result(OpenStruct.new(meta: meta).instance_eval { ctx })
         }},
         {extensions: %w[html htm], handler: Proc.new { |body, meta, ctx|
-          if meta[:layout] && layout = Dir[File.join(@src, '_layouts', "#{meta[:layout]}.*")].first
+          if meta[:layout] && layout = Dir[File.join(@src, @layouts, "#{meta[:layout]}.*")].first
             content = load_content(layout, meta)
             ERB.new(content[:body]).result(OpenStruct.new(meta: meta, body: body).instance_eval { ctx })
           else
             ERB.new(body).result(OpenStruct.new(meta: meta).instance_eval { ctx })
           end
         }},
-        {extensions: %w[scss sass], handler: ->(body, meta, ctx){
+        {extensions: %w[scss sass css], handler: ->(body, meta, ctx){
           load_gem 'sassc'
           SassC::Engine.new(body, style: (meta[:style] || :compressed)).render
         }},
@@ -31,7 +34,7 @@ module Jing
         }},
         {extensions: %w[js], handler: ->(body, meta, ctx){
           load_gem 'uglifier'
-          Uglifier.compile(body, harmony: true, output: {ascii_only: true})
+          Uglifier.compile(body, harmony: true, compress: false, mangle: false, output: {ascii_only: true})
         }},
         {extensions: %w[md markdown], handler: ->(body, meta, ctx){
           load_gem 'kramdown'
@@ -45,11 +48,17 @@ module Jing
     end
 
     def load_gem(name, opts={})
-      gemfile { source(opts.delete(:source)||'https://rubygems.org'); gem(name, opts) }
+      @loaded_gems[name] ||= gemfile { source(opts.delete(:source)||'https://rubygems.org'); gem(name, opts) }
+    end
+
+    def active_exts(file)
+      File.basename(file).split('.').reverse.take_while{|e| @converter_extensions.include?(e)}
     end
 
     def dstname(file, path=File.dirname(file))
-      File.join(path, File.basename(file).split('.', 3)[0..1].join('.'))
+      exts = active_exts(file).reverse
+      size = exts.size > 1 ? exts[1..-1].join('.').size+2 : 1
+      File.join(path, File.basename(file)[0..-size])
     end
 
     def load_content(file, meta={})
@@ -62,18 +71,19 @@ module Jing
 
     def render(file, meta={})
       if !File.file?(file)
-        file = Dir[File.join(@src, '_partials', "#{file}.*")].first
+        file = Dir[File.join(@src, @partials, "#{file}.*")].first
       else
         meta.merge!(file: file)
       end
       t = Time.now
       content = load_content(file, meta)
       body = content[:body]
-      File.basename(file).split('.')[1..-1].reverse.each do |ext|
+      exts = active_exts(file)
+      exts.each do |ext|
         converter = @converters.find { |c| c[:extensions].include?(ext) }
         body = converter ? converter[:handler].call(body, content[:meta], binding) : body
       end
-      puts "#{'%.4fs' % (Time.now-t)}\t#{file[@src.size+1..-1]} => #{dstname(file, @dst)[@dst.size+1..-1]} (#{(body.size/1024.0).round(2)}kb)"
+      puts "#{'%.4fs' % (Time.now-t)}\t#{file[@src.size+1..-1]} >#{exts.join('>')}> #{dstname(file, @dst)[@dst.size+1..-1]} (#{(body.size/1024.0).round(2)}kb)"
       body
     rescue => e
       puts "Error\t#{file[@src.size+1..-1]}\n\t#{e.message}\n#{e.backtrace.map{|x| "\t#{x}"}.join("\n")}"
@@ -96,12 +106,13 @@ module Jing
     end
 
     def watch!(opts={})
-      @converter_extensions.delete('js')
+      @converters.delete_if{|e| e[:extensions]==['js']}
+      @converters<<{extensions: %w[js], handler: ->(body, meta, ctx){body}}
       build!(opts)
       load_gem('filewatcher')
       Filewatcher.new([@src, '**', '*']).watch do |filename, event|
         unless File.expand_path(filename) == @dst
-          puts "WATCHED #{filename}\t#{event}"
+          puts "\nWATCHED: #{filename}\t#{event}\t#{Time.now}"
           build!(opts)
         end
       end
@@ -113,8 +124,8 @@ module Jing
 
     def create!(opts={})
       abort("usage: #{File.basename($0)} create -name <pathname>") unless opts[:name]
-      %w[_layouts _partials].each { |e| FileUtils.mkdir_p(File.join(opts[:name], e)) }
-      File.write(File.join(opts[:name], '.meta.yml'), "---\ngenerator: jing\nname: #{File.basename(opts[:name])}\n---\n")
+      [@layouts, @partials].each { |e| FileUtils.mkdir_p(File.join(opts[:name], e)) }
+      File.write(File.join(opts[:name], '.meta.yml'), "---\ngenerator: jing #{VERSION}\nname: #{File.basename(opts[:name])}\n---\n")
     end
 
     def version!(opts={})

data/lib/jing/version.rb

@@ -1,3 +1,3 @@
 module Jing
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/publish.sh

@@ -0,0 +1,4 @@
+gem build jing.gemspec
+gemfile=$(ls *.gem | tail -n 1)
+echo pushing $gemfile
+gem push $gemfile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jing
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - pachacamac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,7 @@ files:
 - bin/console
 - bin/jing
 - bin/setup
+- build_and_install.sh
 - examples/README.md
 - examples/simplepage/.meta.yml
 - examples/simplepage/_layouts/main.html.erb
@@ -67,6 +68,7 @@ files:
 - jing.gemspec
 - lib/jing.rb
 - lib/jing/version.rb
+- publish.sh
 homepage: https://github.com/pachacamac/jing
 licenses:
 - MIT