pieces 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f7dc061f6f697acee3c861621544b165d2a2a8
-  data.tar.gz: a936fc1074f2aaa27e64e009b68be133a29fc63f
+  metadata.gz: cf95f21e65d0bf4fd7ca923670baf2a893c5d14d
+  data.tar.gz: 8d0e716fa17ee6ac4fb54a605fbb9114fdca7c99
 SHA512:
-  metadata.gz: 9349d82313f51c7d57bbccd08d9522d52a51a54de5cde1c147f44be3e837c8fefbfcf99f9c767364ea37f6ff2cf24f9e49469b91b0efc268b3bd5fe8773a131b
-  data.tar.gz: cf3270f620c425d55eca0b8040ba1f284c5da156fbd73360cb406dee74be9447dd74443878863e593fb0b4f1f3f2084463b43cc6f45ec5514aafaa55aafe2fd4
+  metadata.gz: a672697f08f2f7f3aa9c32f8741452058b346902175c1889f8142862efa0da12268b0a1908a4c0e53edae3be9659d1b4c1f0c0f4e6b76ed93a3f5a92a62f2835
+  data.tar.gz: db08a20f9635229d07baea336469dd3fc04c6279c5f48121fe8a3ec28b0d3efb16c7bb6f11b3fb1d3a38155f83f210d65ed1cb09aeb0b88ffd68ae851b960136

data/lib/pieces/builder.rb

@@ -16,6 +16,7 @@ module Pieces
     end
 
     def build
+      require 'pieces/tilt_extension'
       save_files(build_files)
     end
 

data/lib/pieces/compilers/route_compiler.rb

@@ -34,7 +34,7 @@ module Pieces
 
     def compile_piece(piece, data)
       view_model = OpenStruct.new(data['_global'].merge(data))
-      Tilt.new(piece_path(piece)).render(view_model) { yield_pieces(data) }
+      ::Tilt.new(piece_path(piece)).render(view_model) { yield_pieces(data) }
     end
 
     def yield_pieces(data)

data/lib/pieces/compilers/style_compiler.rb

@@ -9,7 +9,7 @@ module Pieces
     def compile(files)
       files.merge('compiled.css' => { contents: '', type: 'css' }).tap do |files|
         Dir["#{path}/app/views/*/*.{css,scss,sass,less}"].each do |file|
-          files['compiled.css'][:contents] << Tilt.new(file).render
+          files['compiled.css'][:contents] << ::Tilt.new(file).render
         end
       end
     end

data/lib/pieces/generator.rb

@@ -6,8 +6,29 @@ module Pieces
       path = config[:path] || Dir.pwd
       FileUtils.mkdir_p(path)
 
-      Dir["#{example_path}/{config,app}"].each do |dir|
-        FileUtils.cp_r(dir, path) unless Dir.exist?("#{path}/#{File.basename(dir)}")
+      if Dir.exist?("#{path}/app/views")
+        FileUtils.mkdir_p("#{path}/app/views/application")
+        FileUtils.mkdir_p("#{path}/app/views/layouts")
+
+        unless File.exist?("#{path}/app/views/layouts/pieces.html.erb")
+          FileUtils.cp("#{example_path}/app/views/layouts/pieces.html.erb", "#{path}/app/views/layouts")
+        end
+
+        unless File.exist?("#{path}/app/views/application/header.html.erb")
+          FileUtils.cp("#{example_path}/app/views/application/header.html.erb", "#{path}/app/views/application")
+        end
+
+        unless File.exist?("#{path}/app/views/application/footer.html.erb")
+          FileUtils.cp("#{example_path}/app/views/application/footer.html.erb", "#{path}/app/views/application")
+        end
+      else
+        FileUtils.mkdir_p("#{path}/app/")
+        FileUtils.cp_r("#{example_path}/app/views", "#{path}/app/views")
+      end
+
+      unless File.exist?("#{path}/config/pieces.yml")
+        FileUtils.mkdir_p("#{path}/config")
+        FileUtils.cp("#{example_path}/config/pieces.yml", "#{path}/config/pieces.yml")
       end
 
       unless File.exist?("#{path}/Gemfile")

data/lib/pieces/tilt/css.rb

@@ -0,0 +1,8 @@
+require 'tilt/plain'
+
+module Pieces
+  module Tilt
+    class CssTemplate < ::Tilt::PlainTemplate
+    end
+  end
+end

data/lib/pieces/tilt/mustache.rb

@@ -0,0 +1,30 @@
+module Pieces
+  module Tilt
+    class MustacheTemplate < ::Tilt::Template
+      def initialize_engine; end
+
+      def prepare; end
+
+      def evaluate(scope, locals, &block)
+        require 'mustache'
+        Mustache.render(data, with_block(view_model(scope, locals), &block))
+      end
+
+      private
+
+      def view_model(scope, locals)
+        if scope.is_a?(Hash)
+          locals.merge(scope)
+        elsif scope.respond_to?(:to_h)
+          locals.merge(scope.to_h)
+        else
+          locals
+        end
+      end
+
+      def with_block(view_model, &block)
+        view_model.merge(:yield => block.nil? ? '' : block.call)
+      end
+    end
+  end
+end

data/lib/pieces/tilt_extension.rb

@@ -4,13 +4,11 @@ module Tilt
   if respond_to?(:register_lazy)
     register_lazy :MustacheTemplate, 'tilt/mustache', 'mustache', 'ms'
     register_lazy :CssTemplate, 'tilt/css', 'css'
-  elsif defined?(Rails)
-    # Register these yourself
   else # support tilt v1
-    require 'tilt/mustache'
-    register MustacheTemplate, 'mustache', 'ms'
+    require 'pieces/tilt/mustache'
+    register Tilt::MustacheTemplate, 'mustache', 'ms'
 
-    require 'tilt/css'
-    register CssTemplate, 'css'
+    require 'pieces/tilt/css'
+    register Tilt::CssTemplate, 'css'
   end
 end

data/lib/pieces/version.rb

@@ -1,3 +1,3 @@
 module Pieces
-  VERSION = '0.3.3'
+  VERSION = '0.3.5'
 end

data/lib/pieces.rb

@@ -5,7 +5,6 @@ require 'pieces/generator'
 require 'pieces/listener'
 require 'pieces/server'
 require 'pieces/rails'
-require 'pieces/tilt_extension'
 require 'pieces/version'
 
 module Pieces

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pieces
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Luke Morton
@@ -238,10 +238,10 @@ files:
 - lib/pieces/listener.rb
 - lib/pieces/rails.rb
 - lib/pieces/server.rb
+- lib/pieces/tilt/css.rb
+- lib/pieces/tilt/mustache.rb
 - lib/pieces/tilt_extension.rb
 - lib/pieces/version.rb
-- lib/tilt/css.rb
-- lib/tilt/mustache.rb
 - pieces.gemspec
 homepage: https://github.com/drpheltright/pieces
 licenses:

data/lib/tilt/css.rb

@@ -1,6 +0,0 @@
-require 'tilt/plain'
-
-module Tilt
-  class CssTemplate < PlainTemplate
-  end
-end

data/lib/tilt/mustache.rb

@@ -1,29 +0,0 @@
-require 'mustache'
-
-module Tilt
-  class MustacheTemplate < Template
-    def initialize_engine; end
-
-    def prepare; end
-
-    def evaluate(scope, locals, &block)
-      Mustache.render(data, with_block(view_model(scope, locals), &block))
-    end
-
-    private
-
-    def view_model(scope, locals)
-      if scope.is_a?(Hash)
-        locals.merge(scope)
-      elsif scope.respond_to?(:to_h)
-        locals.merge(scope.to_h)
-      else
-        locals
-      end
-    end
-
-    def with_block(view_model, &block)
-      view_model.merge(:yield => block.nil? ? '' : block.call)
-    end
-  end
-end