pieces 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7161643008f10d4bbf17b26d79e932f4372f004b
-  data.tar.gz: 2c6d081965d88f549c94de4af7b9ad2be023b191
+  metadata.gz: ef88dd45bb8a84d1b98ea3ec868532c80a8ddec2
+  data.tar.gz: d879f16096b632ce1ead38a69ff11bd45da962bc
 SHA512:
-  metadata.gz: e7dbcb86cff8f805379f89749dc21d49a2be17ae1afc458fa8b2e681c632789db36c5abf19c15dd098d6926443fe70d7397c17b328939a9b4dd2bb8c7810eaf8
-  data.tar.gz: 0d3e2772554880ef914e915cc1fe82674dca8f7e06c141b132cbfbfb5d4d60656ca2b7abaffa81bdd097011cf916a29a726043c611492a95ac9fbee77baf14da
+  metadata.gz: 4dd85e804b3d6dbc9815f24466040e568d3b271d62f5690d96ae7c09a57870e1b08a508defc562c7d7b72f765c32cced51b915d03f52a7ca7612de51989116c9
+  data.tar.gz: 4526624987dc7b634928bacfca58709c99998f26c093e6c7c67f3b08065da174837511894ce906652d7b4c8d769f3b8be869595749b20b369bfb00007fa4c01b

data/bin/pieces

@@ -1,18 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'pieces'
+require 'pieces/cli'
 
-case ARGV[0]
-when 'init'
-  init_path = ARGV[1] || '.'
-  Pieces::Generator.new.init(path: init_path)
-  puts "Pieces placed in #{init_path}"
-when 'build'
-  print 'Building pieces into current directory...'
-  Pieces::Builder.new.build(path: '.')
-  puts 'done.'
-else
-  puts 'Run either `pieces init` or `pieces build`'
-  exit(1)
-end
+Pieces::CLI.start(ARGV)

data/lib/pieces.rb

@@ -1,7 +1,9 @@
-require 'pieces/version'
+require 'pieces/compilers/route_compiler'
+require 'pieces/compilers/style_compiler'
 require 'pieces/builder'
 require 'pieces/generator'
 require 'pieces/tilt_extension'
+require 'pieces/version'
 
 module Pieces
 end

data/lib/pieces/builder.rb

@@ -3,70 +3,46 @@ require 'yaml'
 
 module Pieces
   class Builder
-    def build(config)
-      Dir.chdir(config[:path]) do
-        save_files(routes.reduce({}) { |files, (name, route)| build_route(files, name, route) })
-      end
+    def self.build(config)
+      new(config).build
     end
 
-    private
+    attr_reader :path
+    attr_reader :route_config
 
-    def route_config
-      @route_config ||= YAML.load_file('config/routes.yml')
+    def initialize(config)
+      @path = config[:path]
+      @route_config ||= YAML.load_file("#{path}/config/routes.yml")
     end
 
-    def globals
-      route_config['_global'] or {}
+    def build
+      save_files(build_files)
     end
 
-    def routes
-      route_config.reject { |key, _| key =~ /^_/ }
-    end
-
-    def build_route(files, name, route)
-      route['_pieces'].reduce(files) do |files, piece|
-        piece, data = piece.keys.first, piece.values.first
-        data['_global'] = globals.merge(route.delete('_global') || {}).merge(data['_global'] || {})
-
-        Dir["pieces/*/*.{css,scss,sass,less}"].each do |file|
-          files['compiled.css'] = { contents: '', type: 'css', compiled: [] } unless files.has_key?('compiled.css')
-
-          unless files['compiled.css'][:compiled].include?(file)
-            files['compiled.css'][:contents] << Tilt.new(file).render
-            files['compiled.css'][:compiled] << file
-          end
-        end
+    private
 
-        files["#{name}.html"] = { contents: '', type: 'html' } unless files.has_key?("#{name}.html")
-        view_model = OpenStruct.new(data['_global'].merge(data))
-        content = Tilt.new(piece_path(piece)).render(view_model) { yield_route_pieces(data) }
-        files["#{name}.html"][:contents] << content
+    def build_files
+      files = {}
+      StyleCompiler.new(path: path).compile(files)
+      route_compiler = RouteCompiler.new(path: path, globals: route_config['_global'])
 
-        files
+      routes.reduce(files) do |files, (name, route)|
+        route_compiler.compile(files, name, route)
       end
     end
 
-    def piece_path(piece)
-      Dir["pieces/{#{piece},#{piece}/#{piece},application/#{piece}}.html.*"].first
-    end
-
-    def yield_route_pieces(parent_data)
-      return '' unless parent_data.has_key?('_pieces')
-
-      parent_data['_pieces'].reduce('') do |content, piece|
-        piece, data = piece.keys.first, piece.values.first
-        data['_global'] = (parent_data['_global'] || {}).merge(data['_global'] || {})
-        view_model = OpenStruct.new(data['_global'].merge(data))
-        content << Tilt.new(piece_path(piece)).render(view_model) { yield_route_pieces(data) }
-      end
+    def routes
+      route_config.reject { |key, _| key =~ /^_/ }
     end
 
     def save_files(files)
-      FileUtils.rm_rf('build')
-      Dir.mkdir('build')
+      Dir.chdir(path) do
+        FileUtils.rm_rf('build')
+        Dir.mkdir('build')
 
-      files.each do |name, file|
-        save_file(name, file)
+        files.each do |name, file|
+          save_file(name, file)
+        end
       end
     end
 

data/lib/pieces/cli.rb

@@ -0,0 +1,20 @@
+require 'pieces'
+require 'thor'
+
+module Pieces
+  class CLI < Thor
+    desc 'init DIR', 'create new pieces app in DIR'
+    def init(path = '.')
+      print "Placing new pieces in #{path}... "
+      Pieces::Generator.init(path: path)
+      puts 'done.'
+    end
+
+    desc 'build DIR', 'build pieces in DIR'
+    def build(path = '.')
+      print "Building pieces into #{path}... "
+      Pieces::Builder.build(path: path)
+      puts 'done.'
+    end
+  end
+end

data/lib/pieces/compilers/route_compiler.rb

@@ -0,0 +1,42 @@
+module Pieces
+  class RouteCompiler
+    attr_reader :path
+    attr_reader :globals
+
+    def initialize(config)
+      @path = config[:path] || Dir.pwd
+      @globals = config[:globals] || {}
+    end
+
+    def compile(files, name, route)
+      route['_pieces'].reduce(files) do |files, piece|
+        piece, data = piece.keys.first, piece.values.first
+        data['_global'] = globals.merge(route.delete('_global') || {}).merge(data['_global'] || {})
+
+        files["#{name}.html"] = { contents: '', type: 'html' } unless files.has_key?("#{name}.html")
+        view_model = OpenStruct.new(data['_global'].merge(data))
+        content = Tilt.new(piece_path(piece)).render(view_model) { yield_route_pieces(data) }
+        files["#{name}.html"][:contents] << content
+
+        files
+      end
+    end
+
+    private
+
+    def piece_path(piece)
+      Dir["#{path}/pieces/{#{piece},#{piece}/#{piece},application/#{piece}}.html.*"].first
+    end
+
+    def yield_route_pieces(parent_data)
+      return '' unless parent_data.has_key?('_pieces')
+
+      parent_data['_pieces'].reduce('') do |content, piece|
+        piece, data = piece.keys.first, piece.values.first
+        data['_global'] = (parent_data['_global'] || {}).merge(data['_global'] || {})
+        view_model = OpenStruct.new(data['_global'].merge(data))
+        content << Tilt.new(piece_path(piece)).render(view_model) { yield_route_pieces(data) }
+      end
+    end
+  end
+end

data/lib/pieces/compilers/style_compiler.rb

@@ -0,0 +1,19 @@
+module Pieces
+  class StyleCompiler
+    attr_reader :path
+
+    def initialize(config = {})
+      @path = config[:path] || Dir.pwd
+    end
+
+    def compile(files)
+      files['compiled.css'] = { contents: '', type: 'css' }
+
+      Dir["#{path}/pieces/*/*.{css,scss,sass,less}"].each do |file|
+        files['compiled.css'][:contents] << Tilt.new(file).render
+      end
+
+      files
+    end
+  end
+end

data/lib/pieces/generator.rb

@@ -1,13 +1,16 @@
 module Pieces
-  class Generator
-    def init(config)
-      FileUtils.mkdir_p(config[:path])
+  module Generator
+    extend self
+
+    def init(config = {})
+      path = config[:path] || Dir.pwd
+      FileUtils.mkdir_p(path)
 
       Dir["#{example_path}/{config,layouts,pieces}"].each do |dir|
-        FileUtils.cp_r(dir, config[:path])
+        FileUtils.cp_r(dir, path)
       end
 
-      FileUtils.cp("#{example_path}/Gemfile", "#{config[:path]}/Gemfile")
+      FileUtils.cp("#{example_path}/Gemfile", "#{path}/Gemfile")
     end
 
     private

data/lib/pieces/version.rb

@@ -1,3 +1,3 @@
 module Pieces
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/pieces.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'tilt', '~> 2.0.1'
+  spec.add_dependency 'thor', '~> 0.19.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'codeclimate-test-reporter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pieces
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Luke Morton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,9 @@ files:
 - examples/original/pieces/posts/posts.html.erb
 - lib/pieces.rb
 - lib/pieces/builder.rb
+- lib/pieces/cli.rb
+- lib/pieces/compilers/route_compiler.rb
+- lib/pieces/compilers/style_compiler.rb
 - lib/pieces/generator.rb
 - lib/pieces/tilt_extension.rb
 - lib/pieces/version.rb