From cc2085d249509fd0409a5612857d2287b25d8616 Mon Sep 17 00:00:00 2001 From: Michael Ginalick Date: Thu, 23 Feb 2023 08:36:42 -0600 Subject: [PATCH 1/7] Support span tags in render_node method --- lib/contentstack_utils/model/options.rb | 4 +++- spec/lib/model/option_spec.rb | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/contentstack_utils/model/options.rb b/lib/contentstack_utils/model/options.rb index 5db11c9..94abecb 100644 --- a/lib/contentstack_utils/model/options.rb +++ b/lib/contentstack_utils/model/options.rb @@ -105,9 +105,11 @@ def render_node(node_type, node, inner_html) renderString = "#{inner_html}" when 'reference' renderString = "" + when 'span' + renderString = "#{inner_html}" end renderString end end end -end \ No newline at end of file +end diff --git a/spec/lib/model/option_spec.rb b/spec/lib/model/option_spec.rb index 9e4f3ff..23be650 100644 --- a/spec/lib/model/option_spec.rb +++ b/spec/lib/model/option_spec.rb @@ -305,5 +305,12 @@ def getMetadata(itemType=nil, styleType=nil, linkText=nil) expect(result).to eq "" end + it 'Should return span string for span node type' do + doc = getJson(BlankDocument) + + result = subject.render_node('span', doc, linkText) + expect(result).to eq "#{linkText}" + end + end -end \ No newline at end of file +end From 38fea4fd073adb69f39b492e2d3af7c10e4cebac Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Fri, 24 Feb 2023 11:58:36 +0530 Subject: [PATCH 2/7] Updated Dependency gem --- contentstack_utils.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contentstack_utils.gemspec b/contentstack_utils.gemspec index 12adf9d..82bf99d 100644 --- a/contentstack_utils.gemspec +++ b/contentstack_utils.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.test_files = s.files.grep(%r{^spec/}) s.require_paths = ["lib"] - s.add_dependency 'activesupport', '>= 3.2', '< 6.2' + s.add_dependency 'activesupport', '>= 3.2', '< 7.0.4' s.add_dependency 'nokogiri', '~> 1.11', '>= 1.11.0' s.add_development_dependency 'rake', '~> 13.0.3' From b222cf9f403724d1cf5b0542f062063241c7c094 Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Fri, 24 Feb 2023 12:01:25 +0530 Subject: [PATCH 3/7] Updated license year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index d3b9d20..c042d14 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2012-2022 Contentstack. All Rights Reserved +Copyright (c) 2012-2023 Contentstack. All Rights Reserved Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 2a105753196336f7e0e525735c5a60397d91f036 Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Fri, 24 Feb 2023 12:30:56 +0530 Subject: [PATCH 4/7] Updated Gemfile.lock --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b17a80c..bf62daa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,13 +2,13 @@ PATH remote: . specs: contentstack_utils (1.1.0) - activesupport (>= 3.2, < 6.2) + activesupport (>= 3.2, < 7.0.4) nokogiri (~> 1.11, >= 1.11.0) GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7) + activesupport (6.1.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -16,7 +16,7 @@ GEM zeitwerk (~> 2.3) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) crack (0.4.5) rexml diff-lcs (1.5.0) @@ -24,15 +24,15 @@ GEM hashdiff (1.0.1) i18n (1.12.0) concurrent-ruby (~> 1.0) - mini_portile2 (2.8.0) - minitest (5.16.3) - nokogiri (1.13.9) + mini_portile2 (2.8.1) + minitest (5.17.0) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.9-x64-mingw32) + nokogiri (1.13.10-x64-mingw32) racc (~> 1.4) - public_suffix (5.0.0) - racc (1.6.0) + public_suffix (5.0.1) + racc (1.6.2) rake (13.0.6) rexml (3.2.5) rspec (3.10.0) @@ -54,7 +54,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) webmock (3.11.3) addressable (>= 2.3.6) @@ -63,7 +63,7 @@ GEM webrick (1.7.0) yard (0.9.28) webrick (~> 1.7.0) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby From 33b128f42653c611c5e0bfb1cca3329c8e4f227c Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Fri, 24 Feb 2023 12:53:29 +0530 Subject: [PATCH 5/7] Updated utils ruby SDK version --- lib/contentstack_utils/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/contentstack_utils/version.rb b/lib/contentstack_utils/version.rb index dec2e11..1ea58c5 100644 --- a/lib/contentstack_utils/version.rb +++ b/lib/contentstack_utils/version.rb @@ -1,3 +1,3 @@ module ContentstackUtils - VERSION = "1.1.0" + VERSION = "1.1.2" end \ No newline at end of file From 1cd8cd236072d38e2bb2e012459549ecf27b3e18 Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:04:29 +0530 Subject: [PATCH 6/7] Added SDK version info in changelog file --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 804b6e2..1969107 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## [1.1.1](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.1.1) (2022-04-21) + - Json RTE image, link and frame source url issue resolved + ## [1.1.0](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.1.0) (2021-08-10) - GQL Json rte to Html content support added From 14789d1fa41f648a47874bd561779e934ec48d3b Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Mon, 27 Feb 2023 18:20:40 +0530 Subject: [PATCH 7/7] Updated Change Log file --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1969107..d9f14bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## [1.1.2](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.1.2) (2023-02-27) + - Dependency gem updated (Activesupport gem) + ## [1.1.1](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.1.1) (2022-04-21) - Json RTE image, link and frame source url issue resolved