transproc 1.0.2 → 1.1.0

data/lib/transproc/proc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Transproc
   # Transformation functions for Procs
   #

data/lib/transproc/recursion.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'transproc/conditional'
 
 module Transproc

data/lib/transproc/registry.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Transproc
   # Container to define transproc functions in, and access them via `[]` method

data/lib/transproc/store.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Transproc
   # Immutable collection of named procedures from external modules

data/lib/transproc/support/deprecations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Transproc
   module Deprecations
     def self.announce(name, msg)

data/lib/transproc/transformer.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'transproc/transformer/class_interface'
+require 'transproc/transformer/deprecated/class_interface'
 
 module Transproc
   # Transfomer class for defining transprocs with a class DSL.
@@ -45,6 +48,9 @@ module Transproc
   # @api public
   class Transformer
     extend ClassInterface
+    extend Deprecated::ClassInterface
+
+    attr_reader :transproc
 
     # Execute the transformation pipeline with the given input.
     #
@@ -63,7 +69,7 @@ module Transproc
     #
     # @api public
     def call(input)
-      self.class.transproc.call(input)
+      transproc.call(input)
     end
   end
 end

data/lib/transproc/transformer/class_interface.rb

@@ -1,7 +1,14 @@
+# frozen_string_literal: true
+
+require 'transproc/transformer/dsl'
+
 module Transproc
   class Transformer
-    # @api private
+    # @api public
     module ClassInterface
+      # @api private
+      attr_reader :dsl
+
       # Return a base Transproc::Transformer class with the
       # container configured to the passed argument.
       #
@@ -17,14 +24,18 @@ module Transproc
       #
       # @api public
       def [](container)
-        klass = Class.new(Transformer)
+        klass = Class.new(self)
         klass.container(container)
         klass
       end
 
       # @api private
       def inherited(subclass)
+        super
+
         subclass.container(@container) if defined?(@container)
+
+        subclass.instance_variable_set('@dsl', dsl.dup) if dsl
       end
 
       # Get or set the container to resolve transprocs from.
@@ -45,41 +56,32 @@ module Transproc
       # @return [Transproc::Registry]
       #
       # @api private
-      def container(container = ::Transproc::Undefined)
-        if container == ::Transproc::Undefined
-          ensure_container_presence!
-          @container
+      def container(container = Undefined)
+        if container.equal?(Undefined)
+          @container ||= Module.new.extend(Transproc::Registry)
         else
           @container = container
         end
       end
 
-      # Define an anonymous transproc derived from given Transformer
-      # Evaluates block with transformations and returns initialized transproc.
-      # Does not mutate original Transformer
-      #
-      # @example
-      #
-      #   class MyTransformer < Transproc::Transformer[MyContainer]
-      #   end
-      #
-      #   transproc = MyTransformer.define do
-      #     map_values t(:to_string)
-      #   end
-      #   transproc.call(a: 1, b: 2)
-      #   # => {a: '1', b: '2'}
-      #
-      # @yield Block allowing to define transformations. The same as class level DSL
-      #
-      # @return [Function] Composed transproc
-      #
       # @api public
-      def define(&block)
-        return transproc unless block_given?
+      def import(*args)
+        container.import(*args)
+      end
+
+      # @api public
+      def define!(&block)
+        @dsl ||= DSL.new(container)
+        @dsl.instance_eval(&block)
+        self
+      end
 
-        Class.new(self).tap { |klass| klass.instance_eval(&block) }.transproc
+      # @api public
+      def new(*args)
+        super(*args).tap do |transformer|
+          transformer.instance_variable_set('@transproc', dsl.(transformer)) if dsl
+        end
       end
-      alias build define
 
       # Get a transformation from the container,
       # without adding it to the transformation pipeline
@@ -105,42 +107,6 @@ module Transproc
       def t(fn, *args)
         container[fn, *args]
       end
-
-      # @api private
-      def method_missing(method, *args, &block)
-        if container.contain?(method)
-          args.push(define(&block)) if block_given?
-          transformations << t(method, *args)
-        else
-          super
-        end
-      end
-
-      # @api private
-      def respond_to_missing?(method, _include_private = false)
-        container.contain?(method) || super
-      end
-
-      # @api private
-      def transproc
-        transformations.reduce(:>>)
-      end
-
-      private
-
-      # An array containing the transformation pipeline
-      #
-      # @api private
-      def transformations
-        @transformations ||= []
-      end
-
-      # @api private
-      def ensure_container_presence!
-        return if defined?(@container)
-        raise ArgumentError, 'Transformer function registry is empty. '\
-                             'Provide your registry via Transproc::Transformer[YourRegistry]'
-      end
     end
   end
 end

data/lib/transproc/transformer/deprecated/class_interface.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module Transproc
+  class Transformer
+    module Deprecated
+      # @api public
+      module ClassInterface
+        # @api public
+        def new(*args)
+          super(*args).tap do |transformer|
+            transformer.instance_variable_set('@transproc', transproc) if transformations.any?
+          end
+        end
+
+        # @api private
+        def inherited(subclass)
+          super
+
+          if transformations.any?
+            subclass.instance_variable_set('@transformations', transformations.dup)
+          end
+        end
+
+        # Define an anonymous transproc derived from given Transformer
+        # Evaluates block with transformations and returns initialized transproc.
+        # Does not mutate original Transformer
+        #
+        # @example
+        #
+        #   class MyTransformer < Transproc::Transformer[MyContainer]
+        #   end
+        #
+        #   transproc = MyTransformer.define do
+        #     map_values t(:to_string)
+        #   end
+        #   transproc.call(a: 1, b: 2)
+        #   # => {a: '1', b: '2'}
+        #
+        # @yield Block allowing to define transformations. The same as class level DSL
+        #
+        # @return [Function] Composed transproc
+        #
+        # @api public
+        def define(&block)
+          return transproc unless block_given?
+
+          Class.new(Transformer[container]).tap { |klass| klass.instance_eval(&block) }.transproc
+        end
+        alias build define
+
+        # @api private
+        def method_missing(method, *args, &block)
+          super unless container.contain?(method)
+          func = block ? t(method, *args, define(&block)) : t(method, *args)
+          transformations << func
+          func
+        end
+
+        # @api private
+        def respond_to_missing?(method, _include_private = false)
+          super || container.contain?(method)
+        end
+
+        # @api private
+        def transproc
+          transformations.reduce(:>>)
+        end
+
+        private
+
+        # An array containing the transformation pipeline
+        #
+        # @api private
+        def transformations
+          @transformations ||= []
+        end
+      end
+    end
+  end
+end

data/lib/transproc/transformer/dsl.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'transproc/compiler'
+
+module Transproc
+  class Transformer
+    # @api public
+    class DSL
+      # @api private
+      attr_reader :container
+
+      # @api private
+      attr_reader :ast
+
+      # @api private
+      def initialize(container, ast: [], &block)
+        @container = container
+        @ast = ast
+        instance_eval(&block) if block
+      end
+
+      # @api private
+      def dup
+        self.class.new(container, ast: ast.dup)
+      end
+
+      # @api private
+      def call(transformer)
+        Compiler.new(container, transformer).(ast)
+      end
+
+      private
+
+      # @api private
+      def node(&block)
+        [:t, self.class.new(container, &block).ast]
+      end
+
+      # @api private
+      def respond_to_missing?(method, _include_private = false)
+        super || container.contain?(method)
+      end
+
+      # @api private
+      def method_missing(meth, *args, &block)
+        arg_nodes = *args.map { |a| [:arg, a] }
+        ast << [:fn, (block ? [meth, [*arg_nodes, node(&block)]] : [meth, arg_nodes])]
+      end
+    end
+  end
+end

data/lib/transproc/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Transproc
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/spec_helper.rb

@@ -1,19 +1,23 @@
-if RUBY_ENGINE == 'ruby' && RUBY_VERSION == '2.3.1'
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter '/spec/'
+# frozen_string_literal: true
+
+if RUBY_ENGINE == 'ruby' && ENV['COVERAGE'] == 'true'
+  require 'yaml'
+  rubies = YAML.load(File.read(File.join(__dir__, '..', '.travis.yml')))['rvm']
+  latest_mri = rubies.select { |v| v =~ /\A\d+\.\d+.\d+\z/ }.max
+
+  if RUBY_VERSION == latest_mri
+    require 'simplecov'
+    SimpleCov.start do
+      add_filter '/spec/'
+    end
   end
 end
 
-require 'equalizer'
-require 'anima'
-require 'ostruct'
-require 'transproc/all'
-
 begin
   require 'byebug'
-rescue LoadError
-end
+rescue LoadError;end
+
+require 'transproc/all'
 
 root = Pathname(__FILE__).dirname
 Dir[root.join('support/*.rb').to_s].each { |f| require f }

data/spec/unit/array/combine_spec.rb

@@ -1,4 +1,6 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require 'forwardable'
 
 describe Transproc::ArrayTransformations do
   describe '.combine' do

data/spec/unit/array_transformations_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe Transproc::ArrayTransformations do
   let(:hashes) { Transproc::HashTransformations }

data/spec/unit/class_transformations_spec.rb

@@ -1,9 +1,11 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require 'dry/equalizer'
 
 describe Transproc::ClassTransformations do
   describe '.constructor_inject' do
     let(:klass) do
-      Struct.new(:name, :age) { include Equalizer.new(:name, :age) }
+      Struct.new(:name, :age) { include Dry::Equalizer.new(:name, :age) }
     end
 
     it 'returns a new object initialized with the given arguments' do
@@ -21,12 +23,13 @@ describe Transproc::ClassTransformations do
   describe '.set_ivars' do
     let(:klass) do
       Class.new do
-        include Anima.new(:name, :age)
+        include Dry::Equalizer.new(:name, :age)
 
-        attr_reader :test
+        attr_reader :name, :age, :test
 
-        def initialize(*args)
-          super
+        def initialize(name:, age:)
+          @name = name
+          @age = age
           @test = true
         end
       end

data/spec/unit/coercions_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe Transproc::Coercions do
   describe '.identity' do

data/spec/unit/composer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe Transproc::Composer do
   before do

data/spec/unit/conditional_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe Transproc::Conditional do
   describe '.not' do

data/spec/unit/function_not_found_error_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 describe Transproc::FunctionNotFoundError do
   it 'complains that the function not registered' do