jrf 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce648c2afbfe10dc161b08badb05acdb411baf839dde77433927380b6bb7439
-  data.tar.gz: 6be5a0851eecd3cfcbe93aff1cb8fdd163a84dd96a7b12e440fc514db03f67a0
+  metadata.gz: 408c1f9706af5efaa1bf0125201d6647b4c108aa4aa28c99a93b59fb9cc94f02
+  data.tar.gz: 702f2fb14dc9d498292b02c41f0cdb4a91c0fa3e093ad9a71435d9a2604532fa
 SHA512:
-  metadata.gz: aa4dfead95dbe09453ec720cdbcf77ba4c7e3f1047c60f51d4ff54724dfa540bb1dbd5630ecb07d09d745e1e61e4c236f50f4407ff6d4c17dd5431b385679f57
-  data.tar.gz: 03c3f5dd3f36675a2bc31981effc506bb1822bb170e754785ccffe077becdd5af13421b4cbfd18fea1c1262f06feef61561be3e3243ca0379e1e6af21ad003c5
+  metadata.gz: 80dfa6d2bb7c9304e779a3e80815efbde9c599d66665708738b833b08daa1918ae54bc5b170c8b90c60399fe18b0df06d576e2c8c3d8b76b74f9daa826efcfa8
+  data.tar.gz: 597b715fd3ebd31a49cb2839f7dda814b845cd5aa87a3ac9a9cf551553792b453af749e287652553903de851ea7b06a9e5940abc7c25fccd319a9e7e72d75840

data/lib/jrf/row_context.rb

@@ -26,10 +26,12 @@ module Jrf
     def initialize(obj = nil)
       @obj = obj
       @__jrf_current_stage = nil
+      @__jrf_current_input = obj
     end
 
     def reset(obj)
       @obj = obj
+      @__jrf_current_input = obj
       self
     end
 
@@ -38,11 +40,11 @@ module Jrf
     end
 
     def flat
-      Control::Flat.new(@obj)
+      Control::Flat.new(current_input)
     end
 
     def select(predicate)
-      predicate ? @obj : Control::DROPPED
+      predicate ? current_input : Control::DROPPED
     end
 
     define_reducer(:sum) do |_ctx, value, initial: 0, block: nil|
@@ -111,15 +113,16 @@ module Jrf
     define_reducer(:sort) do |ctx, key = MISSING, block: nil|
       if block
         {
-          value: ctx._,
+          value: ctx.send(:current_input),
           initial: -> { [] },
           finish: ->(rows) { rows.sort(&block) },
           step: ->(rows, row) { rows << row }
         }
       else
-        resolved_key = key.equal?(MISSING) ? ctx._ : key
+        current = ctx.send(:current_input)
+        resolved_key = key.equal?(MISSING) ? current : key
         {
-          value: [resolved_key, ctx._],
+          value: [resolved_key, current],
           initial: -> { [] },
           finish: ->(pairs) { pairs.sort_by(&:first).map(&:last) },
           step: ->(pairs, pair) { pairs << pair }
@@ -128,7 +131,7 @@ module Jrf
     end
 
     define_reducer(:group) do |ctx, value = MISSING, block: nil|
-      resolved_value = value.equal?(MISSING) ? ctx._ : value
+      resolved_value = value.equal?(MISSING) ? ctx.send(:current_input) : value
       { value: resolved_value, initial: -> { [] }, step: ->(acc, v) { acc << v } }
     end
 
@@ -158,7 +161,7 @@ module Jrf
     def reduce(initial, &block)
       raise ArgumentError, "reduce requires a block" unless block
 
-      @__jrf_current_stage.allocate_reducer(@obj, initial: initial, &block)
+      @__jrf_current_stage.allocate_reducer(current_input, initial: initial, &block)
     end
 
     def map(&block)
@@ -180,6 +183,18 @@ module Jrf
 
     private
 
+    def current_input
+      @__jrf_current_input
+    end
+
+    def __jrf_with_current_input(value)
+      saved_input = current_input
+      @__jrf_current_input = value
+      yield
+    ensure
+      @__jrf_current_input = saved_input
+    end
+
     def reducer_initial_value(initial)
       return initial.call if initial.respond_to?(:call)
       return initial.dup if initial.is_a?(Array) || initial.is_a?(Hash)

data/lib/jrf/stage.rb

@@ -64,10 +64,7 @@ module Jrf
 
       # Transformation mode (detected on first call)
       if @map_transforms[idx]
-        case type
-        when :array then return collection.map(&block)
-        when :hash then return collection.transform_values(&block)
-        end
+        return transform_collection(type, collection, &block)
       end
 
       map_reducer = (@reducers[idx] ||= MapReducer.new(type))
@@ -78,7 +75,7 @@ module Jrf
         collection.each_with_index do |v, i|
           slot = map_reducer.slot(i)
           with_scoped_reducers(slot.reducers) do
-            result = block.call(v)
+            result = @ctx.send(:__jrf_with_current_input, v) { block.call(v) }
             slot.template ||= result
           end
         end
@@ -87,7 +84,7 @@ module Jrf
         collection.each do |k, v|
           slot = map_reducer.slot(k)
           with_scoped_reducers(slot.reducers) do
-            result = block.call(v)
+            result = @ctx.send(:__jrf_with_current_input, v) { block.call(v) }
             slot.template ||= result
           end
         end
@@ -97,12 +94,7 @@ module Jrf
       if @mode.nil? && map_reducer.slots.values.all? { |s| s.reducers.empty? }
         @map_transforms[idx] = true
         @reducers[idx] = nil
-        case type
-        when :array
-          return map_reducer.slots.sort_by { |k, _| k }.map { |_, s| s.template }
-        when :hash
-          return map_reducer.slots.transform_values(&:template)
-        end
+        return transformed_slots(type, map_reducer)
       end
 
       ReducerToken.new(idx)
@@ -115,7 +107,7 @@ module Jrf
       row = @ctx._
       slot = map_reducer.slot(key)
       with_scoped_reducers(slot.reducers) do
-        result = block.call(row)
+        result = @ctx.send(:__jrf_with_current_input, row) { block.call(row) }
         slot.template ||= result
       end
 
@@ -146,6 +138,60 @@ module Jrf
       @cursor = saved_cursor
     end
 
+    def transform_collection(type, collection, &block)
+      case type
+      when :array
+        raise TypeError, "map expects Array, got #{collection.class}" unless collection.is_a?(Array)
+
+        collection.each_with_object([]) do |value, result|
+          mapped = @ctx.send(:__jrf_with_current_input, value) { block.call(value) }
+          append_map_result(result, mapped)
+        end
+      when :hash
+        raise TypeError, "map_values expects Hash, got #{collection.class}" unless collection.is_a?(Hash)
+
+        collection.each_with_object({}) do |(key, value), result|
+          mapped = @ctx.send(:__jrf_with_current_input, value) { block.call(value) }
+          next if mapped.equal?(Control::DROPPED)
+          raise TypeError, "flat is not supported inside map_values" if mapped.is_a?(Control::Flat)
+
+          result[key] = mapped
+        end
+      end
+    end
+
+    def transformed_slots(type, map_reducer)
+      case type
+      when :array
+        map_reducer.slots
+          .sort_by { |k, _| k }
+          .each_with_object([]) do |(_, slot), result|
+            append_map_result(result, slot.template)
+          end
+      when :hash
+        map_reducer.slots.each_with_object({}) do |(key, slot), result|
+          next if slot.template.equal?(Control::DROPPED)
+          raise TypeError, "flat is not supported inside map_values" if slot.template.is_a?(Control::Flat)
+
+          result[key] = slot.template
+        end
+      end
+    end
+
+    def append_map_result(result, mapped)
+      return if mapped.equal?(Control::DROPPED)
+
+      if mapped.is_a?(Control::Flat)
+        unless mapped.value.is_a?(Array)
+          raise TypeError, "flat expects Array, got #{mapped.value.class}"
+        end
+
+        result.concat(mapped.value)
+      else
+        result << mapped
+      end
+    end
+
     class MapReducer
       attr_reader :slots
 

data/lib/jrf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jrf
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/jrf_test.rb

@@ -174,6 +174,14 @@ stdout, stderr, status = run_jrf('_["items"] >> flat >> group', input_flat)
 assert_success(status, stderr, "flat then group")
 assert_equal(['[1,2,3]'], lines(stdout), "flat then group output")
 
+stdout, stderr, status = run_jrf('map { |x| flat }', "[[1,2],[3],[4,5,6]]\n")
+assert_success(status, stderr, "flat inside map")
+assert_equal(['[1,2,3,4,5,6]'], lines(stdout), "flat inside map output")
+
+stdout, stderr, status = run_jrf('map_values { |v| flat }', "{\"a\":[1,2],\"b\":[3]}\n")
+assert_failure(status, "flat inside map_values")
+assert_includes(stderr, "flat is not supported inside map_values")
+
 stdout, stderr, status = run_jrf('_["foo"] >> flat', input)
 assert_failure(status, "flat requires array")
 assert_includes(stderr, "flat expects Array")
@@ -540,6 +548,10 @@ stdout, stderr, status = run_jrf('_["values"] >> map { |x| sum(_[0] + x) }', inp
 assert_success(status, stderr, "map keeps ambient _")
 assert_equal(['[12,66,606]'], lines(stdout), "map ambient _ output")
 
+stdout, stderr, status = run_jrf('_["values"] >> map { |x| reduce(0) { |acc, v| acc + v } }', input_map)
+assert_success(status, stderr, "map with reduce")
+assert_equal(['[6,60,600]'], lines(stdout), "map with reduce output")
+
 input_map_varying = <<~NDJSON
   [1,10]
   [2,20,200]
@@ -550,6 +562,20 @@ stdout, stderr, status = run_jrf('map { |x| sum(x) }', input_map_varying)
 assert_success(status, stderr, "map varying lengths")
 assert_equal(['[6,30,200]'], lines(stdout), "map varying lengths output")
 
+input_map_unsorted = <<~NDJSON
+  {"values":[3,30]}
+  {"values":[1,10]}
+  {"values":[2,20]}
+NDJSON
+
+stdout, stderr, status = run_jrf('_["values"] >> map { |x| group }', input_map)
+assert_success(status, stderr, "map with group")
+assert_equal(['[[1,2,3],[10,20,30],[100,200,300]]'], lines(stdout), "map with group output")
+
+stdout, stderr, status = run_jrf('_["values"] >> map { |x| sort }', input_map_unsorted)
+assert_success(status, stderr, "map with sort default key")
+assert_equal(['[[1,2,3],[10,20,30]]'], lines(stdout), "map with sort default key output")
+
 input_map_values = <<~NDJSON
   {"a":1,"b":10}
   {"a":2,"b":20}
@@ -578,10 +604,18 @@ stdout, stderr, status = run_jrf('map_values { |v| count(v) }', input_map_values
 assert_success(status, stderr, "map_values with count")
 assert_equal(['{"a":3,"b":3}'], lines(stdout), "map_values with count output")
 
+stdout, stderr, status = run_jrf('map_values { |v| group }', input_map_values)
+assert_success(status, stderr, "map_values with group")
+assert_equal(['{"a":[1,2,3],"b":[10,20,30]}'], lines(stdout), "map_values with group output")
+
 stdout, stderr, status = run_jrf('map_values { |v| sum(_["a"] + v) }', input_map_values)
 assert_success(status, stderr, "map_values keeps ambient _")
 assert_equal(['{"a":12,"b":66}'], lines(stdout), "map_values ambient _ output")
 
+stdout, stderr, status = run_jrf('map_values { |v| reduce(0) { |acc, x| acc + x } }', input_map_values)
+assert_success(status, stderr, "map_values with reduce")
+assert_equal(['{"a":6,"b":60}'], lines(stdout), "map_values with reduce output")
+
 stdout, stderr, status = run_jrf('select(false) >> map { |x| sum(x) }', input_map)
 assert_success(status, stderr, "map no matches")
 assert_equal([], lines(stdout), "map no matches output")
@@ -599,10 +633,18 @@ stdout, stderr, status = run_jrf('_["values"] >> map { |x| x + 1 }', input_map)
 assert_success(status, stderr, "map transform")
 assert_equal(['[2,11,101]', '[3,21,201]', '[4,31,301]'], lines(stdout), "map transform output")
 
+stdout, stderr, status = run_jrf('_["values"] >> map { |x| select(x >= 20) }', input_map)
+assert_success(status, stderr, "map transform with select")
+assert_equal(['[100]', '[20,200]', '[30,300]'], lines(stdout), "map transform with select output")
+
 stdout, stderr, status = run_jrf('map_values { |v| v * 2 }', input_map_values)
 assert_success(status, stderr, "map_values transform")
 assert_equal(['{"a":2,"b":20}', '{"a":4,"b":40}', '{"a":6,"b":60}'], lines(stdout), "map_values transform output")
 
+stdout, stderr, status = run_jrf('map_values { |v| select(v >= 10) }', input_map_values)
+assert_success(status, stderr, "map_values transform with select")
+assert_equal(['{"b":10}', '{"b":20}', '{"b":30}'], lines(stdout), "map_values transform with select output")
+
 stdout, stderr, status = run_jrf('_["values"] >> map { |x| x + 1 } >> map { |x| x * 10 }', input_map)
 assert_success(status, stderr, "chained map transforms")
 assert_equal(['[20,110,1010]', '[30,210,2010]', '[40,310,3010]'], lines(stdout), "chained map transforms output")
@@ -639,6 +681,12 @@ stdout, stderr, status = run_jrf('group_by(_["status"]) { |row| group(row["path"
 assert_success(status, stderr, "group_by with group(expr)")
 assert_equal(['{"200":["/a","/c","/d"],"404":["/b"]}'], lines(stdout), "group_by with group(expr) output")
 
+stdout, stderr, status = run_jrf('group_by(_["status"]) { group }', input_gb)
+assert_success(status, stderr, "group_by with implicit group")
+result = JSON.parse(lines(stdout).first)
+assert_equal(3, result["200"].length, "group_by implicit group 200 count")
+assert_equal("/a", result["200"][0]["path"], "group_by implicit group first row")
+
 stdout, stderr, status = run_jrf('group_by(_["status"]) { |row| min(row["latency"]) }', input_gb)
 assert_success(status, stderr, "group_by with min")
 assert_equal(['{"200":10,"404":50}'], lines(stdout), "group_by with min output")
@@ -647,6 +695,10 @@ stdout, stderr, status = run_jrf('group_by(_["status"]) { |row| {total: sum(row[
 assert_success(status, stderr, "group_by with multi-reducer")
 assert_equal(['{"200":{"total":60,"n":3},"404":{"total":50,"n":1}}'], lines(stdout), "group_by multi-reducer output")
 
+stdout, stderr, status = run_jrf('group_by(_["status"]) { reduce(0) { |acc, row| acc + row["latency"] } }', input_gb)
+assert_success(status, stderr, "group_by with reduce")
+assert_equal(['{"200":60,"404":50}'], lines(stdout), "group_by with reduce output")
+
 stdout, stderr, status = run_jrf('select(false) >> group_by(_["status"]) { count() }', input_gb)
 assert_success(status, stderr, "group_by no matches")
 assert_equal([], lines(stdout), "group_by no matches output")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrf
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - kazuho