munge 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5afa7095e7748d33f0ed3eb2896c4c25d2fa5dd
-  data.tar.gz: c772f9864ea064587b5d16f1445f6e6064780024
+  metadata.gz: 7fa33dfb3bfa3c6040f2b72dd3a5f382d52f1805
+  data.tar.gz: 7c053502ee9c5bf4f7571d80ae40ba5c87731c40
 SHA512:
-  metadata.gz: 396bfa27c4b98d242674f24e9845b6161b45cadc94fa7bacb17565766d0b3a72528b0b26415682056af7f012529973be0e6b565712e0510a279c94591a5cbc50
-  data.tar.gz: a4df269dd5dd9b109409427f603a9c44565156f88e5ffb9fd16bffa24a3727bc2afa4a70a812dc2ad94e81d954bc44ec370ba6277bd98f8ae624bfa22ef32788
+  metadata.gz: 8d3061ee4abaf367192b0afde561b912f0dee607b867bed033ce02baaaa58a69805f205a49aeb084d016581de59399f7a591fa26d48f8d74153d3dca11c98ad8
+  data.tar.gz: 5c2842c9a228b1a283fa587160eb5ad80e8ee97d716984675e9f7eacfd906f2e7022ebca728cedd7ff6a43271e03dfde447f5655fd250cffccec09d4e185775c

data/.rubocop.yml

@@ -4,13 +4,17 @@ AllCops:
     - vendor/bundle/**/*
     - Gemfile
     - Rakefile
-    - seeds/**/*
+    - munge.gemspec
 
 Metrics/AbcSize:
   Exclude:
     - test/**/*
 
+Metrics/LineLength:
+  Max: 120
+
 Metrics/MethodLength:
+  Max: 15
   Exclude:
     - test/**/*
 
@@ -42,5 +46,9 @@ Style/MultilineOperationIndentation:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
+Style/SymbolProc:
+  Exclude:
+    - seeds/**/*
+
 Style/UnneededInterpolation:
   Enabled: false

data/lib/munge.rb

@@ -19,7 +19,10 @@ require "munge/util/path"
 require "munge/util/symbol_hash"
 require "munge/util/config"
 require "munge/system/router"
+require "munge/system/router/itemish"
 require "munge/system/item_factory"
+require "munge/system/item_factory/content_parser"
+require "munge/system/item_factory/item_identifier"
 require "munge/system/collection"
 require "munge/system/readers/filesystem"
 require "munge/system/alterant"
@@ -29,7 +32,8 @@ require "munge/writers/noop"
 require "munge/write_manager"
 require "munge/application"
 require "munge/runner"
-require "munge/bootstrap"
+require "munge/init"
+require "munge/bootloader"
 
 # Extensions
 require "munge/helpers/asset_tags"

data/lib/munge/bootloader.rb

@@ -0,0 +1,27 @@
+module Munge
+  class Bootloader
+    def initialize(root_path:)
+      @root_path   = root_path
+      @config_path = File.join(root_path, "config.yml")
+      @setup_path  = File.join(root_path, "setup.rb")
+      @rules_path  = File.join(root_path, "rules.rb")
+      @config      = Munge::Util::Config.read(@config_path)
+    end
+
+    def init
+      @init ||=
+        Init.new(
+          root_path: @root_path,
+          config: @config,
+          setup_path: @setup_path,
+          rules_path: @rules_path
+        )
+    end
+
+    attr_reader :root_path
+    attr_reader :config_path
+    attr_reader :setup_path
+    attr_reader :rules_path
+    attr_reader :config
+  end
+end

data/lib/munge/cli/commands/build.rb

@@ -2,18 +2,18 @@ module Munge
   module Cli
     module Commands
       class Build
-        def initialize(destination_root, config, options)
-          @app = application(destination_root)
-          @dry_run = options[:dry_run]
-          reporter_class = Munge::Reporters.const_get(options[:reporter])
+        def initialize(bootloader, dry_run:, reporter:)
+          destination_root = bootloader.root_path
+          config = bootloader.config
+          @app = application(bootloader)
 
           runner =
             Munge::Runner.new(
               items: @app.vomit(:items),
               router: @app.vomit(:router),
               alterant: @app.vomit(:alterant),
-              writer: writer,
-              reporter: reporter_class.new,
+              writer: writer(dry_run),
+              reporter: reporter(reporter),
               destination: File.expand_path(config[:output], destination_root)
             )
 
@@ -22,19 +22,23 @@ module Munge
 
         private
 
-        def application(root_path)
-          bootstrap = Munge::Bootstrap.new_from_dir(root_path: root_path)
+        def application(bootloader)
+          bootstrap = bootloader.init
 
           bootstrap.app
         end
 
-        def writer
-          if @dry_run
+        def writer(dry_run)
+          if dry_run
             Munge::Writers::Noop.new
           else
             Munge::Writers::Filesystem.new
           end
         end
+
+        def reporter(class_name)
+          Munge::Reporters.const_get(class_name).new
+        end
       end
     end
   end

data/lib/munge/cli/commands/view.rb

@@ -28,9 +28,8 @@ module Munge
   module Cli
     module Commands
       class View
-        def initialize(config_path, options)
-          config    = Munge::Util::Config.read(config_path)
-          rack_opts = { Host: options[:host], Port: options[:port] }
+        def initialize(bootloader, host:, port:)
+          config = bootloader.config
 
           app =
             Rack::Builder.new do
@@ -40,7 +39,7 @@ module Munge
               run Rack::File.new(config[:output])
             end
 
-          Rack::Handler::WEBrick.run(app, rack_opts)
+          Rack::Handler::WEBrick.run(app, Host: host, Port: port)
         end
       end
     end

data/lib/munge/cli/dispatch.rb

@@ -18,14 +18,14 @@ module Munge
       method_option :reporter, desc: "Set reporter", default: "Default", type: :string
       method_option :dry_run, desc: "Run without writing files", default: false, type: :boolean
       def build
-        Commands::Build.new(destination_root, loaded_config, options)
+        Commands::Build.new(bootloader, symbolized_options)
       end
 
       desc "view", "View built files"
       method_option :port, aliases: "-p", desc: "Set port", default: 7000, type: :numeric
       method_option :host, aliases: "-h", desc: "Set host", default: "0.0.0.0", type: :string
       def view
-        Commands::View.new(config_path, options)
+        Commands::View.new(bootloader, symbolized_options)
       end
 
       desc "version", "Print version"
@@ -36,16 +36,12 @@ module Munge
 
       private
 
-      def loaded_config
-        Munge::Util::Config.read(config_path)
+      def bootloader
+        Munge::Bootloader.new(root_path: destination_root)
       end
 
-      def config_path
-        File.join(destination_root, "config.yml")
-      end
-
-      def rules_path
-        File.join(destination_root, "rules.rb")
+      def symbolized_options
+        Munge::Util::SymbolHash.deep_convert(options)
       end
     end
   end

data/lib/munge/go/sass.rb

@@ -9,11 +9,13 @@ module Munge
       Sass.load_paths << File.join(*paths)
     end
 
+    # rubocop:disable Style/AccessorMethodName
     def set_sass_system!(system)
       Sass::Script::Functions.send(:define_method, :system) do
         system
       end
     end
+    # rubocop:enable Style/AccessorMethodName
 
     def add_sass_functions!(asset_roots)
       Sass::Script::Functions.send(:include, asset_roots)

data/lib/munge/helpers/rendering.rb

@@ -4,7 +4,7 @@ module Munge
       def render(item, engines: nil, data: {}, content_override: nil)
         content   = content_override || item.content
         renderers = tilt_renderer_list(item, engines)
-        mdata     = merged_data(item.frontmatter, data, { self_item: item })
+        mdata     = merged_data(item.frontmatter, data, self_item: item)
 
         render_string(content, data: mdata, engines: renderers)
       end
@@ -12,7 +12,7 @@ module Munge
       def layout(item_or_string, data: {}, &block)
         layout_item = resolve_layout(item_or_string)
         renderers   = tilt_renderer_list(layout_item, nil)
-        mdata       = merged_data(layout_item.frontmatter, data, { self_layout: layout_item })
+        mdata       = merged_data(layout_item.frontmatter, data, self_layout: layout_item)
 
         render_string(layout_item.content, data: mdata, engines: renderers, &block)
       end
@@ -25,8 +25,8 @@ module Munge
 
         output =
           engines
-            .inject(content) do |output, engine|
-              template = engine.new { output }
+            .inject(content) do |memo, engine|
+              template = engine.new { memo }
 
               if inner
                 template.render(self, data) { inner }
@@ -44,7 +44,7 @@ module Munge
 
       def render_with_layout(item, content_engines: nil, data: {}, content_override: nil)
         inner = render(item, engines: content_engines, data: data, content_override: content_override)
-        mdata = merged_data(item.frontmatter, data, { self_item: item })
+        mdata = merged_data(item.frontmatter, data, self_item: item)
 
         if item.layout
           layout(item.layout, data: mdata) do

data/lib/munge/init.rb

@@ -0,0 +1,34 @@
+module Munge
+  class Init
+    def initialize(root_path:,
+                   config:,
+                   setup_path:,
+                   rules_path:)
+      @root_path  = root_path
+      @setup_path = setup_path
+      @rules_path = rules_path
+      @binding    = binding
+
+      system = Munge::System.new(root_path, config)
+
+      import(setup_path)
+
+      @app = Munge::Application.new(system)
+
+      import(rules_path)
+    end
+
+    def config_path
+      File.join(root_path, "config")
+    end
+
+    def import(file_path)
+      absolute_file_path = File.expand_path(file_path, root_path)
+      contents           = File.read(absolute_file_path)
+      @binding.eval(contents, absolute_file_path)
+    end
+
+    attr_reader :app
+    attr_reader :root_path
+  end
+end

data/lib/munge/reporters/default.rb

@@ -11,7 +11,7 @@ module Munge
         when :identical
           puts "identical #{item.route}"
         when :double_write_error
-          fail "attempted to write #{item.route} twice"
+          raise "attempted to write #{item.route} twice"
         end
       end
     end

data/lib/munge/runner.rb

@@ -1,11 +1,11 @@
 module Munge
   class Runner
     def initialize(items:, router:, alterant:, writer:, reporter:, destination:)
-      @items    = items
-      @router   = router
-      @alterant = alterant
-      @writer   = writer
-      @reporter = reporter
+      @items         = items
+      @router        = router
+      @alterant      = alterant
+      @writer        = writer
+      @reporter      = reporter
       @write_manager = Munge::WriteManager.new(driver: File)
       @destination   = destination
     end

data/lib/munge/system.rb

@@ -4,7 +4,6 @@ module Munge
     def initialize(root_path, config)
       source_path  = File.expand_path(config[:source], root_path)
       layouts_path = File.expand_path(config[:layouts], root_path)
-      output_path  = File.expand_path(config[:output], root_path)
       data_path    = File.expand_path(config[:data], root_path)
 
       @global_data = YAML.load_file(data_path) || {}

data/lib/munge/system/item_factory.rb

@@ -1,13 +1,10 @@
-require_relative "item_factory/content_parser"
-require_relative "item_factory/item_identifier"
-
 module Munge
   class System
     class ItemFactory
       def initialize(text_extensions:,
                      ignore_extensions:)
         @text_extensions = Set.new(text_extensions)
-        @item_identifier = Munge::System::ItemFactory::ItemIdentifier.new(remove_extensions: ignore_extensions)
+        @item_identifier = ItemIdentifier.new(remove_extensions: ignore_extensions)
       end
 
       def build(relpath:,
@@ -34,7 +31,7 @@ module Munge
         type = compute_file_type(relpath)
 
         if type == :text
-          parsed = Munge::System::ItemFactory::ContentParser.new(content)
+          parsed = ContentParser.new(content)
 
           build(
             relpath: relpath,

data/lib/munge/system/router.rb

@@ -1,5 +1,3 @@
-require_relative "router/itemish"
-
 module Munge
   class System
     class Router

data/lib/munge/version.rb

@@ -1,3 +1,3 @@
 module Munge
-  VERSION = "0.7.0"
+  VERSION = "0.7.1".freeze
 end

data/seeds/config/routing.rb

@@ -15,5 +15,5 @@ system.router.register(
   ))
 system.router.register(
   Routers::AutoAddExtension.new(
-    keep_extensions: config[:bin_extensions] + config[:bintext_extensions],
+    keep_extensions: config[:bin_extensions] + config[:bintext_extensions]
   ))

data/seeds/config/sass.rb

@@ -1,7 +1,7 @@
 require "munge/go/sass"
 
-Munge::Go::add_sass_load_path!(root_path, config[:source], AssetRoots.stylesheets_root)
+Munge::Go.add_sass_load_path!(root_path, config[:source], AssetRoots.stylesheets_root)
 
-Munge::Go::set_sass_system!(system)
+Munge::Go.set_sass_system!(system)
 
-Munge::Go::add_sass_functions!(AssetRoots)
+Munge::Go.add_sass_functions!(AssetRoots)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munge
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,7 +192,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.7.0/README.md
+description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.7.1/README.md
 email:
 - zach.ahn@gmail.com
 executables:
@@ -212,7 +212,7 @@ files:
 - exe/munge
 - lib/munge.rb
 - lib/munge/application.rb
-- lib/munge/bootstrap.rb
+- lib/munge/bootloader.rb
 - lib/munge/cli.rb
 - lib/munge/cli/commands/build.rb
 - lib/munge/cli/commands/view.rb
@@ -226,6 +226,7 @@ files:
 - lib/munge/helpers/link.rb
 - lib/munge/helpers/rendering.rb
 - lib/munge/helpers/tag.rb
+- lib/munge/init.rb
 - lib/munge/item.rb
 - lib/munge/reporters/default.rb
 - lib/munge/routers/add_index_html.rb

data/lib/munge/bootstrap.rb

@@ -1,81 +0,0 @@
-module Munge
-  class Bootstrap
-    class << self
-      def new_from_dir(root_path:)
-        new_from_fs(
-          root_path: root_path,
-          config_path: config_path(root_path),
-          setup_path: setup_path(root_path),
-          rules_path: rules_path(root_path)
-        )
-      end
-
-      def new_from_fs(root_path:,
-                      config_path:,
-                      setup_path:,
-                      rules_path:)
-        new(
-          root_path: root_path,
-          config: read_config(config_path),
-          setup_string: File.read(setup_path),
-          setup_path: setup_path,
-          rules_string: File.read(rules_path),
-          rules_path: rules_path
-        )
-      end
-
-      private
-
-      def read_config(config_path)
-        Munge::Util::Config.read(config_path)
-      end
-
-      def config_path(root_path)
-        File.join(root_path, "config.yml")
-      end
-
-      def setup_path(root_path)
-        File.join(root_path, "setup.rb")
-      end
-
-      def rules_path(root_path)
-        File.join(root_path, "rules.rb")
-      end
-    end
-
-    def initialize(root_path:,
-                   config:,
-                   setup_string:,
-                   rules_string:,
-                   setup_path:,
-                   rules_path:)
-      @setup_path = setup_path
-      @rules_path = rules_path
-      @binding    = binding
-
-      system = Munge::System.new(root_path, config)
-
-      import(setup_path, setup_string)
-
-      @app = Munge::Application.new(system)
-
-      import(rules_path, rules_string)
-    end
-
-    def root_path
-      File.dirname(@setup_path)
-    end
-
-    def config_path
-      File.join(root_path, "config")
-    end
-
-    def import(file_path, file_contents = nil)
-      absolute_file_path = File.expand_path(file_path, root_path)
-      contents           = file_contents || File.read(absolute_file_path)
-      @binding.eval(contents, absolute_file_path)
-    end
-
-    attr_reader :app
-  end
-end