@@ -11,24 +11,24 @@ module Compact
1111 # @param [String] property (nil)
1212 # @return [Array, Hash]
1313 def compact ( element , property = nil )
14- if property . nil?
15- log_debug ( "compact" ) { "element: #{ element . inspect } , ec: #{ context . inspect } " }
16- else
17- log_debug ( "compact" ) { "property: #{ property . inspect } " }
18- end
14+ # if property.nil?
15+ # log_debug("compact") {"element: #{element.inspect}, ec: #{context.inspect}"}
16+ # else
17+ # log_debug("compact") {"property: #{property.inspect}"}
18+ # end
1919 case element
2020 when Array
21- log_debug ( "" ) { "Array #{ element . inspect } " }
22- result = log_depth { element . map { |item | compact ( item , property ) } . compact }
21+ # log_debug("") {"Array #{element.inspect}"}
22+ result = element . map { |item | compact ( item , property ) } . compact
2323
2424 # If element has a single member and the active property has no
2525 # @container mapping to @list or @set, the compacted value is that
2626 # member; otherwise the compacted value is element
2727 if result . length == 1 && context . container ( property ) . nil? && @options [ :compactArrays ]
28- log_debug ( "=> extract single element: #{ result . first . inspect } " )
28+ # log_debug("=> extract single element: #{result.first.inspect}")
2929 result . first
3030 else
31- log_debug ( "=> array result: #{ result . inspect } " )
31+ # log_debug("=> array result: #{result.inspect}")
3232 result
3333 end
3434 when Hash
@@ -40,7 +40,7 @@ def compact(element, property = nil)
4040 if element . keys . any? { |k | %w( @id @value ) . include? ( k ) }
4141 result = context . compact_value ( property , element , log_depth : @options [ :log_depth ] )
4242 unless result . is_a? ( Hash )
43- log_debug ( "" ) { "=> scalar result: #{ result . inspect } " }
43+ # log_debug("") {"=> scalar result: #{result.inspect}"}
4444 return result
4545 end
4646 end
@@ -50,80 +50,79 @@ def compact(element, property = nil)
5050
5151 element . each_key do |expanded_property |
5252 expanded_value = element [ expanded_property ]
53- log_debug ( "" ) { "#{ expanded_property } : #{ expanded_value . inspect } " }
53+ # log_debug("") {"#{expanded_property}: #{expanded_value.inspect}"}
5454
5555 if %w( @id @type ) . include? ( expanded_property )
5656 compacted_value = [ expanded_value ] . flatten . compact . map do |expanded_type |
57- log_depth { context . compact_iri ( expanded_type , vocab : ( expanded_property == '@type' ) , log_depth : @options [ :log_depth ] ) }
57+ context . compact_iri ( expanded_type , vocab : ( expanded_property == '@type' ) , log_depth : @options [ :log_depth ] )
5858 end
5959 compacted_value = compacted_value . first if compacted_value . length == 1
6060
6161 al = context . compact_iri ( expanded_property , vocab : true , quiet : true )
62- log_debug ( expanded_property ) { "result[#{ al } ] = #{ compacted_value . inspect } " }
62+ # log_debug(expanded_property) {"result[#{al}] = #{compacted_value.inspect}"}
6363 result [ al ] = compacted_value
6464 next
6565 end
6666
6767 if expanded_property == '@reverse'
68- compacted_value = log_depth { compact ( expanded_value , '@reverse' ) }
69- log_debug ( "@reverse" ) { "compacted_value: #{ compacted_value . inspect } " }
68+ compacted_value = compact ( expanded_value , '@reverse' )
69+ # log_debug("@reverse") {"compacted_value: #{compacted_value.inspect}"}
7070 compacted_value . each do |prop , value |
7171 if context . reverse? ( prop )
7272 value = [ value ] if !value . is_a? ( Array ) &&
7373 ( context . container ( prop ) == '@set' || !@options [ :compactArrays ] )
74- log_debug ( "" ) { "merge #{ prop } => #{ value . inspect } " }
74+ # log_debug("") {"merge #{prop} => #{value.inspect}"}
7575 merge_compacted_value ( result , prop , value )
7676 compacted_value . delete ( prop )
7777 end
7878 end
7979
8080 unless compacted_value . empty?
8181 al = context . compact_iri ( '@reverse' , quiet : true )
82- log_debug ( "" ) { "remainder: #{ al } => #{ compacted_value . inspect } " }
82+ # log_debug("") {"remainder: #{al} => #{compacted_value.inspect}"}
8383 result [ al ] = compacted_value
8484 end
8585 next
8686 end
8787
8888 if expanded_property == '@index' && context . container ( property ) == '@index'
89- log_debug ( "@index" ) { "drop @index" }
89+ # log_debug("@index") {"drop @index"}
9090 next
9191 end
9292
9393 # Otherwise, if expanded property is @index, @value, or @language:
9494 if %w( @index @value @language ) . include? ( expanded_property )
9595 al = context . compact_iri ( expanded_property , vocab : true , quiet : true )
96- log_debug ( expanded_property ) { "#{ al } => #{ expanded_value . inspect } " }
96+ # log_debug(expanded_property) {"#{al} => #{expanded_value.inspect}"}
9797 result [ al ] = expanded_value
9898 next
9999 end
100100
101101 if expanded_value == [ ]
102- item_active_property = log_depth do
102+ item_active_property =
103103 context . compact_iri ( expanded_property ,
104104 value : expanded_value ,
105105 vocab : true ,
106106 reverse : inside_reverse ,
107107 log_depth : @options [ :log_depth ] )
108- end
109108
110109 iap = result [ item_active_property ] ||= [ ]
111110 result [ item_active_property ] = [ iap ] unless iap . is_a? ( Array )
112111 end
113112
114113 # At this point, expanded value must be an array due to the Expansion algorithm.
115114 expanded_value . each do |expanded_item |
116- item_active_property = log_depth do
115+ item_active_property =
117116 context . compact_iri ( expanded_property ,
118117 value : expanded_item ,
119118 vocab : true ,
120119 reverse : inside_reverse ,
121120 log_depth : @options [ :log_depth ] )
122- end
121+
123122 container = context . container ( item_active_property )
124123 value = list? ( expanded_item ) ? expanded_item [ '@list' ] : expanded_item
125- compacted_item = log_depth { compact ( value , item_active_property ) }
126- log_debug ( "" ) { " => compacted key: #{ item_active_property . inspect } for #{ compacted_item . inspect } " }
124+ compacted_item = compact ( value , item_active_property )
125+ # log_debug("") {" => compacted key: #{item_active_property.inspect} for #{compacted_item.inspect}"}
127126
128127 if list? ( expanded_item )
129128 compacted_item = [ compacted_item ] unless compacted_item . is_a? ( Array )
@@ -161,7 +160,7 @@ def compact(element, property = nil)
161160 result . keys . kw_sort . inject ( { } ) { |map , kk | map [ kk ] = result [ kk ] ; map }
162161 else
163162 # For other types, the compacted value is the element value
164- log_debug ( "compact" ) { element . class . to_s }
163+ # log_debug("compact") {element.class.to_s}
165164 element
166165 end
167166 end
0 commit comments