Skip to content

Commit

Permalink
Renames @current_level to @aggregator_level as it did not reflect it'…
Browse files Browse the repository at this point in the history
…s value
  • Loading branch information
thisismydesign committed Sep 18, 2017
1 parent 1ff80b9 commit cc6d22b
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions lib/json/streamer/callbacks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Callbacks

def initialize(conditions)
@conditions = conditions
@current_level = -1
@aggregator_level = -1
@aggregator = []
end

Expand All @@ -19,7 +19,7 @@ def start_array
end

def key(k, symbolize_keys)
@aggregator[@current_level][:key] = symbolize_keys ? k.to_sym : k
@aggregator[@aggregator_level][:key] = symbolize_keys ? k.to_sym : k
end

def value(value)
Expand All @@ -44,29 +44,29 @@ def end_level
data = @aggregator.last[:data].clone

@aggregator.pop
@current_level -= 1
@aggregator_level -= 1

if @conditions.yield?(next_level, current_key)
yield data
else
add_value(data) unless @current_level < 0
add_value(data) unless @aggregator_level < 0
end
end

def add_value(value)
if array_level?(@current_level)
@aggregator[@current_level][:data] << value
if array_level?(@aggregator_level)
@aggregator[@aggregator_level][:data] << value
else
@aggregator[@current_level][:data][current_key] = value
@aggregator[@aggregator_level][:data][current_key] = value
end
end

def current_key
@aggregator[@current_level][:key] unless @current_level < 0
@aggregator[@aggregator_level][:key] unless @aggregator_level < 0
end

def new_level(type)
@current_level += 1
@aggregator_level += 1
@aggregator.push(data: type)
end

Expand All @@ -75,7 +75,7 @@ def array_level?(nesting_level)
end

def next_level
@current_level + 1
@aggregator_level + 1
end
end
end
Expand Down

0 comments on commit cc6d22b

Please sign in to comment.