fixer_upper 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f17d076ad0560c75356d33ca5492fbb5adb288bc
-  data.tar.gz: 239fc8b0a65b17a08134ed437a7286060b68bdf1
+  metadata.gz: cd048ff747c17e9b203c63f89ba9c39ac1d7894b
+  data.tar.gz: ad1cf61e1c489d37519618782692f3c42db748d6
 SHA512:
-  metadata.gz: ee1c19957a62ebb59c34cca172fb9a5f2babc992309672e83a75b8396c17dc25932e389309a5cce5f26476cf99f1d8682479b6e2bc031581b87f76218d07f0f8
-  data.tar.gz: 3c2ca497612378216dc759246b7c2052065061dd6cbf326b3caaae7703702c8d0826ba30490f95510d95ef78d0faaa0312156c36cfeedc9070aab936696d48b5
+  metadata.gz: fccbaf7810c6ef7f114f7021afa0b0e7f5075d1bcfbf3206411b37baa1b62272612320deec52dcdc14477b3b4dd2985044be915dffc2b47f2f9e8d83439d6d23
+  data.tar.gz: 92b70790d2bda9592d21a4bb7a8fdd256a3e741be62e13802140238b566dab186afb0cdf3ccc16aea84ce1ce48893f634d043a2bbbf787f0aa3c083085bed7e4

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+/.sass-cache/

data/.rubocop.yml

@@ -8,6 +8,10 @@ Metrics/LineLength:
   IgnoredPatterns:
     - !ruby/regexp /^\s*#/
 
+Metrics/MethodLength:
+  Exclude:
+    - test/**/*.rb
+
 Style/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 

data/.travis.yml

@@ -2,4 +2,17 @@ sudo: false
 language: ruby
 rvm:
   - 2.4.0
-before_install: gem install bundler -v 1.14.6
+  - 2.3
+  - 2.2
+  - 2.1
+  - ruby-head
+cache: bundler
+before_install:
+  - gem install bundler -v 1.15.0
+notifications:
+  email: false
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: 2.1

data/README.md

@@ -1,5 +1,7 @@
 # FixerUpper
 
+[![Build Status](https://travis-ci.org/zachahn/fixer_upper.svg?branch=master)](https://travis-ci.org/zachahn/fixer_upper)
+
 You have a file and it just has so much potential.
 
 Gut job or not, FixerUpper makes that file into the result of your dreams,

data/fixer_upper.gemspec

@@ -21,9 +21,12 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.1.0"
+
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "sass"
 end

data/lib/fixer_upper.rb

@@ -1,3 +1,4 @@
+require "fixer_upper/contractor"
 require "fixer_upper/error"
 require "fixer_upper/renovation"
 require "fixer_upper/version"
@@ -20,29 +21,43 @@ class FixerUpper
     @engine_registry[key]
   end
 
-  def renovate(filepath, contents = nil, **options)
+  def renovate(filepath, contents = nil, **options, &block)
     @renovation.renovate(
       filepath: filepath,
       text: contents,
       options: options,
+      block: block,
       bang: false
     )
   end
 
-  def renovate!(filepath, contents = nil, **options)
+  def renovate!(filepath, contents = nil, **options, &block)
     @renovation.renovate(
       filepath: filepath,
       text: contents,
       options: options,
+      block: block,
       bang: true
     )
   end
 
-  def diy(text, *engines, **options)
-    @renovation.diy(text: text, engines: engines, options: options, bang: false)
+  def diy(text, *engines, **options, &block)
+    @renovation.diy(
+      text: text,
+      engines: engines,
+      options: options,
+      block: block,
+      bang: false
+    )
   end
 
-  def diy!(text, *engines, **options)
-    @renovation.diy(text: text, engines: engines, options: options, bang: true)
+  def diy!(text, *engines, **options, &block)
+    @renovation.diy(
+      text: text,
+      engines: engines,
+      options: options,
+      block: block,
+      bang: true
+    )
   end
 end

data/lib/fixer_upper/contractor.rb

@@ -0,0 +1,77 @@
+class FixerUpper
+  class Contractor
+    def initialize(registry, options)
+      @registry = registry
+      @options = options
+    end
+
+    def call(text:, engines:, options:, filepath:, block:, bang:)
+      engines.reduce(text) do |memo, engine_name|
+        engine = find_engine(engine_name, bang)
+
+        if engine.nil?
+          next memo
+        end
+
+        parameters = parameters_for(engine)
+        merged_options =
+          options_for_engine(engine_name, options, parameters, filepath)
+
+        engine_invoke(engine, memo, merged_options, parameters, block)
+      end
+    end
+
+    private
+
+    def find_engine(engine_name, bang)
+      if bang
+        engine_or_raise(engine_name)
+      else
+        engine_or_nil(engine_name)
+      end
+    end
+
+    def engine_invoke(engine, text, options, parameters, block)
+      if options.any? && parameters.count >= 2
+        engine.call(text, **options, &block)
+      else
+        engine.call(text, &block)
+      end
+    end
+
+    def parameters_for(engine)
+      if engine.respond_to?(:parameters)
+        engine.parameters
+      else
+        engine.method(:call).parameters
+      end
+    end
+
+    def options_for_engine(engine_name, local_options, parameters, filepath)
+      default_options = @options[engine_name] || {}
+      specific_options = local_options[engine_name.to_sym] || {}
+
+      merged_options = default_options.merge(specific_options)
+
+      if parameters.include?([:keyreq, :filepath])
+        merged_options[:filepath] = filepath
+      end
+
+      merged_options
+    end
+
+    def engine_or_nil(engine_name)
+      @registry[engine_name]
+    end
+
+    def engine_or_raise(engine_name)
+      found_engine = @registry[engine_name]
+
+      if found_engine
+        found_engine
+      else
+        raise Error::EngineNotFound, "unknown engine: `#{engine_name}`"
+      end
+    end
+  end
+end

data/lib/fixer_upper/engine/erb.rb

@@ -0,0 +1,13 @@
+class FixerUpper
+  module Engine
+    class Erb
+      def call(text, scope:, filepath:, &block)
+        scope_binding = scope.instance_eval { binding }
+
+        erb = ::ERB.new(text)
+        erb.filename = filepath
+        erb.result(scope_binding)
+      end
+    end
+  end
+end

data/lib/fixer_upper/engine/noop.rb

@@ -0,0 +1,9 @@
+class FixerUpper
+  module Engine
+    class Noop
+      def call(text)
+        text
+      end
+    end
+  end
+end

data/lib/fixer_upper/engine/scss.rb

@@ -0,0 +1,12 @@
+class FixerUpper
+  module Engine
+    class Scss
+      def call(text, filepath:, **options)
+        options = options.merge(syntax: :scss, filename: filepath)
+
+        engine = ::Sass::Engine.new(text, **options)
+        engine.render
+      end
+    end
+  end
+end

data/lib/fixer_upper/renovation.rb

@@ -5,62 +5,33 @@ class FixerUpper
       @options = options
     end
 
-    def renovate(filepath:, text: nil, options:, bang:)
+    def renovate(filepath:, text: nil, options:, block: nil, bang:)
       contents = file_contents(filepath, text)
 
       diy(
         text: contents,
         engines: extensions(filepath).reverse,
         options: options,
+        filepath: filepath,
+        block: block,
         bang: bang
       )
     end
 
-    def diy(text:, engines:, options:, bang:)
-      engines.reduce(text) do |memo, engine_name|
-        engine = find_engine(engine_name, bang)
-
-        merged_options = options_for_engine(engine_name, options)
-
-        if merged_options.any? && engine.method(:call).parameters.count >= 2
-          engine.call(memo, **merged_options)
-        else
-          engine.call(memo)
-        end
-      end
+    def diy(text:, engines:, options:, filepath: nil, block: nil, bang:)
+      contractor = Contractor.new(@registry, @options)
+      contractor.call(
+        text: text,
+        engines: engines,
+        options: options,
+        filepath: filepath,
+        block: block,
+        bang: bang
+      )
     end
 
     private
 
-    def options_for_engine(engine_name, local_options)
-      default_options = @options[engine_name] || {}
-      specific_options = local_options[engine_name.to_sym] || {}
-
-      default_options.merge(specific_options)
-    end
-
-    def find_engine(engine_name, bang)
-      if bang
-        engine_or_raise(engine_name)
-      else
-        engine_or_nil(engine_name)
-      end
-    end
-
-    def engine_or_nil(engine_name)
-      @registry[engine_name]
-    end
-
-    def engine_or_raise(engine_name)
-      found_engine = @registry[engine_name]
-
-      if found_engine
-        found_engine
-      else
-        raise Error::EngineNotFound, "unknown engine: `#{engine_name}`"
-      end
-    end
-
     def file_contents(filepath, contents)
       if contents
         contents

data/lib/fixer_upper/version.rb

@@ -1,3 +1,3 @@
 class FixerUpper
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixer_upper
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple interface for template engines
 email:
 - engineering@zachahn.com
@@ -100,6 +114,10 @@ files:
 - bin/setup
 - fixer_upper.gemspec
 - lib/fixer_upper.rb
+- lib/fixer_upper/contractor.rb
+- lib/fixer_upper/engine/erb.rb
+- lib/fixer_upper/engine/noop.rb
+- lib/fixer_upper/engine/scss.rb
 - lib/fixer_upper/error.rb
 - lib/fixer_upper/renovation.rb
 - lib/fixer_upper/version.rb
@@ -115,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="