Commit 7930297a authored by charlie-ablett's avatar charlie-ablett
Browse files

XSweet step update, including HandleListsStep

parent e5027d3e
......@@ -8,8 +8,9 @@ INK API, INK Client, Conversion step suite and Demo Steps - Collaborative Knowle
- Vasilios Kefallinos - Docker setup and process integration.
- Julien Taquet - INK Client 1.0 UX and design.
- Henrik von Leeuwen - INK Client 1.0 front page design. Colour scheme. Icons.
- Dr Craig Schock - Occasional reality checks around algorithms and data encoding.
- Dr Craig Schock - Occasional reality checks around algorithms and data encoding.
- Alex Theg - Logistical support and Xsweet integration.
- Richard Smith-Unna - Time zone based bug support.
- John Chodacki - Strategy support.
Coko for providing a supportive environment.
\ No newline at end of file
Thanks so much for everyone at Coko for providing a supportive environment.
\ No newline at end of file
......@@ -17,9 +17,9 @@ GIT
GIT
remote: https://gitlab.coko.foundation/INK/inkstep_coko_conversion.git
revision: 7a7786c02a330693c8d3d2952df28871f048cf6b
revision: f83862be48ccf1747cd56ecf79fbcba60d4acc6e
specs:
inkstep_coko_conversion (1.0.6)
inkstep_coko_conversion (1.0.7)
GIT
remote: https://gitlab.coko.foundation/INK/inkstep_coko_demo_steps.git
......
......@@ -18,7 +18,8 @@ editoria_recipe_step2 = editoria_recipe.recipe_steps.new(position: 2, step_class
editoria_recipe_step3 = editoria_recipe.recipe_steps.new(position: 3, step_class_name: InkStep::Coko::XsweetPipeline::DocxExtract::ScrubStep.to_s)
editoria_recipe_step4 = editoria_recipe.recipe_steps.new(position: 4, step_class_name: InkStep::Coko::XsweetPipeline::DocxExtract::JoinElementsStep.to_s)
editoria_recipe_step5 = editoria_recipe.recipe_steps.new(position: 5, step_class_name: InkStep::Coko::XsweetPipeline::DocxExtract::CollapseParagraphsStep.to_s)
editoria_recipe_step6 = editoria_recipe.recipe_steps.new(position: 6, step_class_name: InkStep::Coko::XsweetPipeline::HeaderPromote::HeaderPromotionStep.to_s)
editoria_recipe_step7 = editoria_recipe.recipe_steps.new(position: 7, step_class_name: InkStep::Coko::XsweetPipeline::FinaliseTypescript::FinalRinseStep.to_s)
editoria_recipe_step8 = editoria_recipe.recipe_steps.new(position: 8, step_class_name: InkStep::Coko::XsweetPipeline::PrepareForEditoria::EditoriaPrepareStep.to_s)
editoria_recipe_step6 = editoria_recipe.recipe_steps.new(position: 6, step_class_name: InkStep::Coko::XsweetPipeline::HandleLists::HandleListsStep.to_s)
editoria_recipe_step7 = editoria_recipe.recipe_steps.new(position: 7, step_class_name: InkStep::Coko::XsweetPipeline::HeaderPromote::HeaderPromotionStep.to_s)
editoria_recipe_step8 = editoria_recipe.recipe_steps.new(position: 8, step_class_name: InkStep::Coko::XsweetPipeline::FinaliseTypescript::FinalRinseStep.to_s)
editoria_recipe_step9 = editoria_recipe.recipe_steps.new(position: 9, step_class_name: InkStep::Coko::XsweetPipeline::PrepareForEditoria::EditoriaPrepareStep.to_s)
editoria_recipe.save!
\ No newline at end of file
......@@ -38,9 +38,10 @@ namespace :setup do
editoria_recipe_step3 = editoria_recipe.recipe_steps.new(position: 3, step_class_name: Constants.xsweet_step_3_scrub_step_class.to_s)
editoria_recipe_step4 = editoria_recipe.recipe_steps.new(position: 4, step_class_name: Constants.xsweet_step_4_join_step_class.to_s)
editoria_recipe_step5 = editoria_recipe.recipe_steps.new(position: 5, step_class_name: Constants.xsweet_step_5_collapse_paragraphs_step_class.to_s)
editoria_recipe_step6 = editoria_recipe.recipe_steps.new(position: 6, step_class_name: Constants.xsweet_step_6_header_promotion_step_class.to_s)
editoria_recipe_step7 = editoria_recipe.recipe_steps.new(position: 7, step_class_name: Constants.xsweet_step_7_final_rinse_step_class.to_s)
editoria_recipe_step8 = editoria_recipe.recipe_steps.new(position: 8, step_class_name: Constants.xsweet_step_8_editoria_step_class.to_s)
editoria_recipe_step6 = editoria_recipe.recipe_steps.new(position: 6, step_class_name: Constants.xsweet_step_6_handle_lists_step_class.to_s)
editoria_recipe_step7 = editoria_recipe.recipe_steps.new(position: 7, step_class_name: Constants.xsweet_step_7_header_promotion_step_class.to_s)
editoria_recipe_step8 = editoria_recipe.recipe_steps.new(position: 8, step_class_name: Constants.xsweet_step_8_final_rinse_step_class.to_s)
editoria_recipe_step9 = editoria_recipe.recipe_steps.new(position: 9, step_class_name: Constants.xsweet_step_9_editoria_step_class.to_s)
editoria_recipe.save!
end
acc = Account.find_by(email: args[:email])
......
......@@ -15,7 +15,7 @@
</xsl:copy>
</xsl:template>
<!-- Mappings declared on ticket at https://gitlab.coko.foundation/wendell/XSweet/issues/16 -->
<!-- Mappings declared on ticket at https://gitlab.coko.foundation/XSweet/XSweet/issues/16 -->
<!-- A p matches *only* when it contains element(s) span[@style='font-size: 24']/b
*and* it has no (non-ws) text nodes outside such element(s) -->
......
......@@ -32,7 +32,7 @@ describe "Account executes a real recipe" do
}
before do
stub_request(:get, "https://gitlab.coko.foundation/wendell/XSweet/raw/ink-api-publish/applications/docx-extract/docx-html-extract.xsl").
stub_request(:get, "https://gitlab.coko.foundation/XSweet/XSweet/raw/ink-api-publish/applications/docx-extract/docx-html-extract.xsl").
with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
to_return(status: 200, body: File.read(Rails.root.join('spec/fixtures/files/xsweet_pipeline/docx-html-extract.xsl')), headers: {})
......
......@@ -32,26 +32,21 @@ describe "Account executes a recipe xsweet pipeline" do
let!(:scrub3) { xsweet_step_3_scrub_step_class.to_s }
let!(:join4) { xsweet_step_4_join_step_class.to_s }
let!(:collapse5) { xsweet_step_5_collapse_paragraphs_step_class.to_s }
let!(:header6) { xsweet_step_6_header_promotion_step_class.to_s }
let!(:rinse7) { xsweet_step_7_final_rinse_step_class.to_s }
let!(:editoria8) { xsweet_step_8_editoria_step_class.to_s }
let!(:lists6) { xsweet_step_6_handle_lists_step_class.to_s }
let!(:header7) { xsweet_step_7_header_promotion_step_class.to_s }
let!(:rinse8) { xsweet_step_8_final_rinse_step_class.to_s }
let!(:editoria9) { xsweet_step_9_editoria_step_class.to_s }
let(:step_1_xsl_file) { File.read(Rails.root.join('spec/fixtures/files/xsweet_pipeline/docx-html-extract.xsl')) }
let(:step_1_remote_uri) { "https://gitlab.coko.foundation/wendell/XSweet/raw/ink-api-publish/applications/docx-extract/docx-html-extract.xsl" }
let(:step_1_remote_uri) { "https://gitlab.coko.foundation/XSweet/XSweet/raw/ink-api-publish/applications/docx-extract/docx-html-extract.xsl" }
let(:step_2_xsl_file) { File.read(Rails.root.join('spec/fixtures/files/xsweet_pipeline/handle-notes.xsl')) }
let(:step_2_remote_uri) { "https://gitlab.coko.foundation/wendell/XSweet/raw/ink-api-publish/applications/docx-extract/handle-notes.xsl" }
let(:step_2_remote_uri) { "https://gitlab.coko.foundation/XSweet/XSweet/raw/ink-api-publish/applications/docx-extract/handle-notes.xsl" }
let(:step_3_xsl_file) { File.read(Rails.root.join('spec/fixtures/files/xsweet_pipeline/scrub.xsl')) }
let(:step_3_remote_uri) { "https://gitlab.coko.foundation/wendell/XSweet/raw/ink-api-publish/applications/docx-extract/scrub.xsl" }
let(:step_3_remote_uri) { "https://gitlab.coko.foundation/XSweet/XSweet/raw/ink-api-publish/applications/docx-extract/scrub.xsl" }
let(:step_4_xsl_file) { File.read(Rails.root.join('spec/fixtures/files/xsweet_pipeline/join-elements.xsl')) }
let(:step_4_remote_uri) { "https://gitlab.coko.foundation/wendell/XSweet/raw/ink-api-publish/applications/docx-extract/join-elements.xsl" }
let(:step_4_remote_uri) { "https://gitlab.coko.foundation/XSweet/XSweet/raw/ink-api-publish/applications/docx-extract/join-elements.xsl" }
let(:step_5_xsl_file) { File.read(Rails.root.join('spec/fixtures/files/xsweet_pipeline/collapse-paragraphs.xsl')) }
let(:step_5_remote_uri) { "https://gitlab.coko.foundation/wendell/XSweet/raw/ink-api-publish/applications/docx-extract/collapse-paragraphs.xsl" }
# let(:step_6_xsl_file) { File.read(Rails.root.join('spec/fixtures/files/xsweet_pipeline/collapse-paragraphs.xsl')) }
# let(:step_6_remote_uri) { "https://gitlab.coko.foundation/wendell/XSweet/raw/ink-api-publish/applications/docx-extract/collapse-paragraphs.xsl" }
let(:step_7_xsl_file) { File.read(Rails.root.join('spec/fixtures/files/xsweet_pipeline/collapse-paragraphs.xsl')) }
let(:step_7_remote_uri) { "https://gitlab.coko.foundation/wendell/XSweet/raw/ink-api-publish/applications/docx-extract/collapse-paragraphs.xsl" }
# let(:step_8_xsl_file) { File.read(Rails.root.join('spec/fixtures/files/xsweet_pipeline/collapse-paragraphs.xsl')) }
# let(:step_8_remote_uri) { "https://gitlab.coko.foundation/wendell/XSweet/raw/ink-api-publish/applications/docx-extract/collapse-paragraphs.xsl" }
let(:step_5_remote_uri) { "https://gitlab.coko.foundation/XSweet/XSweet/raw/ink-api-publish/applications/docx-extract/collapse-paragraphs.xsl" }
before do
stub_xsl_download(step_1_remote_uri, step_1_xsl_file)
......
......@@ -71,15 +71,20 @@ module StepClassConstants
InkStep::Coko::XsweetPipeline::DocxExtract::CollapseParagraphsStep
end
def xsweet_step_6_header_promotion_step_class
def xsweet_step_6_handle_lists_step_class
InkStep::Coko::XsweetPipeline::HandleLists::HandleListsStep
end
def xsweet_step_7_header_promotion_step_class
InkStep::Coko::XsweetPipeline::HeaderPromote::HeaderPromotionStep
end
def xsweet_step_7_final_rinse_step_class
def xsweet_step_8_final_rinse_step_class
InkStep::Coko::XsweetPipeline::FinaliseTypescript::FinalRinseStep
end
def xsweet_step_8_editoria_step_class
def xsweet_step_9_editoria_step_class
InkStep::Coko::XsweetPipeline::PrepareForEditoria::EditoriaPrepareStep
end
end
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment