Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop -> Master merge, Release v5.33.2 #162

Merged
merged 2 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,29 @@ GEM
domain_name (~> 0.5)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.7.2)
json_pure (2.7.2)
json (2.8.1)
json_pure (2.8.1)
logger (1.6.1)
macaddr (1.7.2)
systemu (~> 2.6.5)
method_source (1.1.0)
mime-types (3.5.2)
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0903)
mime-types-data (3.2024.1105)
minitest (4.7.5)
multi_json (1.15.0)
mustermann (3.0.3)
ruby2_keywords (~> 0.0.1)
net-http (0.4.1)
net-http (0.5.0)
uri
net-http-persistent (2.9.4)
netrc (0.11.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (6.0.1)
rack (2.2.9)
rack (2.2.10)
rack-accept (0.4.5)
rack (>= 0.4)
rack-post-body-to-params (0.1.8)
Expand All @@ -97,7 +98,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.7)
rexml (3.3.9)
rsolr (2.6.0)
builder (>= 2.1.2)
faraday (>= 0.9, < 3, != 2.0.0)
Expand All @@ -124,12 +125,13 @@ GEM
thread_safe (0.3.6)
tilt (2.4.0)
tzinfo (0.3.62)
uri (0.13.1)
uri (1.0.1)
uuid (2.3.9)
macaddr (~> 1.0)

PLATFORMS
arm64-darwin-22
arm64-darwin-23
x86_64-darwin-21
x86_64-darwin-23
x86_64-linux
Expand All @@ -151,4 +153,4 @@ DEPENDENCIES
uuid

BUNDLED WITH
2.5.20
2.5.11
4 changes: 2 additions & 2 deletions lib/goo/base/resource.rb
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,11 @@ def self.map_attributes(inst,equivalent_predicates=nil, include_languages: false
if object.is_a?(Hash)
object = object.transform_values{|values| Array(values).map{|o|o.is_a?(RDF::URI) ? o : o.object}}
else
object = object.map {|o| o.is_a?(RDF::URI) ? o : o.object}
object = Array(object).map {|o| o.is_a?(RDF::URI) ? o : o.object}
end

if klass.range(attr)
object = object.map { |o|
object = Array(object).map { |o|
o.is_a?(RDF::URI) ? klass.range_object(attr,o) : o }
end

Expand Down