fixer_upper 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 222ca8f8dffc3a73359f8676c8ec6818e410166e
-  data.tar.gz: 7d31e42a287ebd8226bb647c982f755fcad11ecf
+  metadata.gz: f17d076ad0560c75356d33ca5492fbb5adb288bc
+  data.tar.gz: 239fc8b0a65b17a08134ed437a7286060b68bdf1
 SHA512:
-  metadata.gz: e6146fa503db14d781810be48d71511ddab8f1ccf96e6729dbe81936e5ab02ccb728180dcc7a03bd48fd02a9cecd9a4f46f80fb816b282f913d21d02a88d4d65
-  data.tar.gz: bb463a18b1bfd1e6a04fe9ccd49b462af80882380515c6c5d495c84b64de4001414c9c70fad851045556d589b84fcbb8c737e4ee0fc3810574bdc3b7a3621fdd
+  metadata.gz: ee1c19957a62ebb59c34cca172fb9a5f2babc992309672e83a75b8396c17dc25932e389309a5cce5f26476cf99f1d8682479b6e2bc031581b87f76218d07f0f8
+  data.tar.gz: 3c2ca497612378216dc759246b7c2052065061dd6cbf326b3caaae7703702c8d0826ba30490f95510d95ef78d0faaa0312156c36cfeedc9070aab936696d48b5

data/.rubocop.yml

@@ -47,8 +47,5 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   Enabled: false
 
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma

data/lib/fixer_upper/renovation.rb

@@ -5,20 +5,25 @@ class FixerUpper
       @options = options
     end
 
-    def renovate(filepath, contents, bang:)
-      text = file_contents(filepath, contents)
+    def renovate(filepath:, text: nil, options:, bang:)
+      contents = file_contents(filepath, text)
 
-      diy(text, *extensions(filepath).reverse, bang: bang)
+      diy(
+        text: contents,
+        engines: extensions(filepath).reverse,
+        options: options,
+        bang: bang
+      )
     end
 
-    def diy(text, *engines, bang:)
-      mapped_engines = map_engines(engines, bang: bang).compact
+    def diy(text:, engines:, options:, bang:)
+      engines.reduce(text) do |memo, engine_name|
+        engine = find_engine(engine_name, bang)
 
-      mapped_engines.reduce(text) do |memo, engine|
-        default_options = @options[engine]
+        merged_options = options_for_engine(engine_name, options)
 
-        if default_options && engine.method(:call).parameters.count >= 2
-          engine.call(memo, **default_options)
+        if merged_options.any? && engine.method(:call).parameters.count >= 2
+          engine.call(memo, **merged_options)
         else
           engine.call(memo)
         end
@@ -27,17 +32,18 @@ class FixerUpper
 
     private
 
-    def map_engines(engines, bang:)
-      engines.map do |engine_request|
-        if engine_request.respond_to?(:call)
-          next engine_request
-        end
+    def options_for_engine(engine_name, local_options)
+      default_options = @options[engine_name] || {}
+      specific_options = local_options[engine_name.to_sym] || {}
 
-        if bang
-          engine_or_raise(engine_request)
-        else
-          engine_or_nil(engine_request)
-        end
+      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
 
@@ -49,7 +55,7 @@ class FixerUpper
       found_engine = @registry[engine_name]
 
       if found_engine
-        file_contents
+        found_engine
       else
         raise Error::EngineNotFound, "unknown engine: `#{engine_name}`"
       end

data/lib/fixer_upper/version.rb

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

data/lib/fixer_upper.rb

@@ -12,28 +12,37 @@ class FixerUpper
   def register(*keys, to:, **options)
     keys.each do |key|
       @engine_registry[key] = to
+      @options_registry[key] = options
     end
-
-    @options_registry[to] = options
   end
 
   def for(key)
     @engine_registry[key]
   end
 
-  def renovate(filepath, contents = nil)
-    @renovation.renovate(filepath, contents, bang: false)
+  def renovate(filepath, contents = nil, **options)
+    @renovation.renovate(
+      filepath: filepath,
+      text: contents,
+      options: options,
+      bang: false
+    )
   end
 
-  def renovate!(filepath, contents = nil)
-    @renovation.renovate(filepath, contents, bang: true)
+  def renovate!(filepath, contents = nil, **options)
+    @renovation.renovate(
+      filepath: filepath,
+      text: contents,
+      options: options,
+      bang: true
+    )
   end
 
-  def diy(text, engines)
-    @renovation.diy(text, engines, bang: false)
+  def diy(text, *engines, **options)
+    @renovation.diy(text: text, engines: engines, options: options, bang: false)
   end
 
-  def diy!(text, engines)
-    @renovation.diy(text, engines, bang: true)
+  def diy!(text, *engines, **options)
+    @renovation.diy(text: text, engines: engines, options: options, bang: true)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fixer_upper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Zach Ahn