Merge remote-tracking branch 'origin/main' into typotolerance

Author: omid

.code-samples.meilisearch.yaml

@@ -152,17 +152,6 @@ update_settings_1: |-
   synonyms.insert(String::from("wolverine"), vec!["xmen", "logan"]);
   synonyms.insert(String::from("logan"), vec!["wolverine"]);
 
-  let min_word_size_for_typos = MinWordSizeForTypos {
-    one_typo: Some(4),
-    two_typos; Some(12)
-  }
-  let typo_tolerance = TypoToleranceSettings {
-    enabled: Some(true),
-    disable_on_attributes: Some(vec!["title".to_string()]),
-    disable_on_words: Some(vec![])
-    min_word_size_for_typos: Some(min_word_size_for_typos),
-  };
-
   let settings = Settings::new()
     .with_ranking_rules([
       "words",
@@ -195,8 +184,7 @@ update_settings_1: |-
       "title",
       "release_date"
     ])
-    .with_synonyms(synonyms)
-    .with_typo_tolerance(typo_tolerance);
+    .with_synonyms(synonyms);
 
   let task: TaskInfo = client
     .index("movies")
@@ -252,48 +240,6 @@ reset_pagination_settings_1: |-
     .reset_pagination()
     .await
     .unwrap();
-getting_started_typo_tolerance: |-
-  let min_word_size_for_typos = MinWordSizeForTypos {
-    one_typo: Some(5),
-    two_typos: Some(4)
-  }
-  let typo_tolerance = TypoToleranceSettings {
-    enabled: Some(true),
-    disable_on_attributes: Some(vec![]),
-    disable_on_words: Some(vec!["title".to_string()]),
-    min_word_size_for_typos: Some(min_word_size_for_typos),
-  };
-
-  let task: TaskInfo = client
-    .index("movies")
-    .set_typo_tolerance(&typo_tolerance)
-    .await
-    .unwrap();
-get_typo_tolerance_1: |-
-  let typo_tolerance: TypoToleranceSettings = client
-    .index("books")
-    .get_typo_tolerance()
-    .await
-    .unwrap();
-update_typo_tolerance_1: |-
-  let typo_tolerance = TypoToleranceSettings {
-    enabled: Some(false),
-    disable_on_attributes: Some(vec![]),
-    disable_on_words: Some(vec![]),
-    min_word_size_for_typos: Some(MinWordSizeForTypos::default()),
-  };
-
-  let task: TaskInfo = client
-    .index("books")
-    .set_typo_tolerance(&typo_tolerance)
-    .await
-    .unwrap();
-reset_typo_tolerance_1: |-
-  let task: TaskInfo = client
-    .index("books")
-    .reset_typo_tolerance()
-    .await
-    .unwrap();
 get_stop_words_1: |-
   let stop_words: Vec<String> = client
     .index("movies")
@@ -777,90 +723,6 @@ settings_guide_faceting_1: |-
     .set_settings(&settings)
     .await
     .unwrap();
-settings_guide_typo_tolerance_1: |-
-  let min_word_size_for_typos = MinWordSizeForTypos {
-    one_typo: Some(5),
-    two_typos: Some(12)
-  }
-  let typo_tolerance = TypoToleranceSettings {
-    enabled: Some(true),
-    disable_on_attributes: Some(vec![]),
-    disable_on_words: Some(vec!["title".to_string()]),
-    min_word_size_for_typos: Some(min_word_size_for_typos),
-  };
-
-  let settings = Settings::new()
-    .with_typo_tolerance(&typo_tolerance);
-
-  let task: TaskInfo = client
-    .index("movies")
-    .set_settings(&settings)
-    .await
-    .unwrap();
-typo_tolerance_guide_1: |-
-  let typo_tolerance = TypoToleranceSettings {
-    enabled: Some(false),
-    disable_on_attributes: Some(vec![]),
-    disable_on_words: Some(vec![]),
-    min_word_size_for_typos: Some(MinWordSizeForTypos::default()),
-  };
-
-  let task: TaskInfo = client
-    .index("movies")
-    .set_typo_tolerance(&typo_tolerance)
-    .await
-    .unwrap();
-typo_tolerance_guide_2: |-
-  let min_word_size_for_typos = MinWordSizeForTypos {
-    one_typo: Some(5),
-    two_typos: Some(12)
-  }
-  let typo_tolerance = TypoToleranceSettings {
-    enabled: Some(true),
-    disable_on_attributes: Some(vec!["title".to_string()]),
-    disable_on_words: Some(vec![]),
-    min_word_size_for_typos: Some(min_word_size_for_typos),
-  };
-
-  let task: TaskInfo = client
-    .index("movies")
-    .set_typo_tolerance(&typo_tolerance)
-    .await
-    .unwrap();
-typo_tolerance_guide_3: |-
-  let min_word_size_for_typos = MinWordSizeForTypos {
-    one_typo: Some(5),
-    two_typos: Some(12)
-  }
-  let typo_tolerance = TypoToleranceSettings {
-    enabled: Some(true),
-    disable_on_attributes: Some(vec![]),
-    disable_on_words: Some(vec!["shrek".to_string()]),
-    min_word_size_for_typos: Some(min_word_size_for_typos),
-  };
-  
-  let task: TaskInfo = client
-    .index("movies")
-    .set_typo_tolerance(&typo_tolerance)
-    .await
-    .unwrap();
-typo_tolerance_guide_4: |-
-  let min_word_size_for_typos = MinWordSizeForTypos {
-    one_typo: Some(4),
-    two_typos: Some(12)
-  };
-  let typo_tolerance = TypoToleranceSettings {
-    enabled: Some(true),
-    disable_on_attributes: Some(vec![]),
-    disable_on_words: Some(vec!["title".to_string()]),
-    min_word_size_for_typos: Some(min_word_size_for_typos),
-  };
-
-  let task: TaskInfo = client
-    .index("movies")
-    .set_typo_tolerance(&typo_tolerance)
-    .await
-    .unwrap();
 add_movies_json_1: |-
   use meilisearch_sdk::{
     indexes::*,

.github/dependabot.yml

@@ -1,5 +1,14 @@
 version: 2
 updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "monthly"
+  labels:
+    - 'skip-changelog'
+    - 'dependencies'
+  rebase-strategy: disabled
+
 - package-ecosystem: cargo
   directory: "/"
   schedule:

.github/scripts/check-release.sh

@@ -1,25 +1,37 @@
 #!/bin/sh
 
 # Checking if current tag matches the package version
-current_tag=$(echo $GITHUB_REF | tr -d 'refs/tags/v')
-major=$(echo $current_tag | cut -d '.' -f1 )
-minor=$(echo $current_tag | cut -d '.' -f2 )
-cropped_current_tag="$major.$minor"
+current_tag=$(echo $GITHUB_REF | cut -d '/' -f 3 | sed -r 's/^v//')
+major=$(echo $current_tag | cut -d '.' -f1)
+minor=$(echo $current_tag | cut -d '.' -f2)
+
 file1='Cargo.toml'
 file2='README.tpl'
 file3='.code-samples.meilisearch.yaml'
 file4='README.md'
+file5='./meilisearch-index-setting-macro/Cargo.toml'
 
 file_tag1=$(grep '^version = ' $file1 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
+file_tag_1_1=$(grep '{ path = "meilisearch-index-setting-macro", version =' $file1 | grep -Eo '[0-9]+.[0-9]+.[0-9]+')
 file_tag2=$(grep 'meilisearch-sdk = ' $file2 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
 file_tag3=$(grep 'meilisearch-sdk = ' $file3 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
 file_tag4=$(grep 'meilisearch-sdk = ' $file4 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
-if [ "$current_tag" != "$file_tag1" ] || [ "$current_tag" != "$file_tag2" ] || [ "$cropped_current_tag" != "$file_tag3" ] || [ "$current_tag" != "$file_tag4" ]; then
+file_tag5=$(grep '^version = ' $file5 | grep -Eo '[0-9]+.[0-9]+.[0-9]+')
+
+if [ "$current_tag" != "$file_tag1" ] ||
+  [ "$current_tag" != "$file_tag_1_1" ] ||
+  [ "$current_tag" != "$file_tag2" ] ||
+  [ "$current_tag" != "$file_tag3" ] ||
+  [ "$current_tag" != "$file_tag4" ] ||
+  [ "$current_tag" != "$file_tag5" ] \
+  ; then
   echo "Error: the current tag does not match the version in package file(s)."
   echo "$file1: found $file_tag1 - expected $current_tag"
+  echo "$file1: found $file_tag_1_1 - expected $current_tag"
   echo "$file2: found $file_tag2 - expected $current_tag"
-  echo "$file3: found $file_tag3 - expected $cropped_current_tag"
+  echo "$file3: found $file_tag3 - expected $current_tag"
   echo "$file4: found $file_tag4 - expected $current_tag"
+  echo "$file5: found $file_tag5 - expected $current_tag"
   exit 1
 fi
 

.github/workflows/pre-release-tests.yml

@@ -16,7 +16,7 @@ jobs:
     name: integration-tests-against-rc
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build
         run: cargo build --verbose
       - name: Get the latest Meilisearch RC

.github/workflows/publish.yml

@@ -9,15 +9,23 @@ jobs:
     name: Rust project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: hecrj/setup-rust-action@master
         with:
           rust-version: stable
       - name: Check release validity
         run: sh .github/scripts/check-release.sh
-      - name: Build
+      - name: Build meilisearch crate
         run: cargo build --release
+      - name: Build meilisearch crate
+        run: |-
+          cd meilisearch-index-setting-macro
+          cargo build --release
       - name: Login
         run: cargo login ${{ secrets.CRATES_TOKEN }}
-      - name: Publish to crates.io
+      - name: Publish meilisearch-index-setting-macro crate to crates.io
+        run: |-
+          cd meilisearch-index-setting-macro
+          cargo publish
+      - name: Publish meilisearch crate to crates.io
         run: cargo publish

.github/workflows/tests.yml

@@ -20,52 +20,52 @@ jobs:
     runs-on: ubuntu-latest
     name: integration-tests
     steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: cargo build --verbose
-    - name: Meilisearch (latest version) setup with Docker
-      run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --no-analytics --master-key=masterKey
-    - name: Run tests
-      run: cargo test --verbose
-    - name: Cargo check
-      uses: actions-rs/cargo@v1
-      with:
-        command: check
-        args: --workspace --all-targets --all
+      - uses: actions/checkout@v3
+      - name: Build
+        run: cargo build --verbose
+      - name: Meilisearch (latest version) setup with Docker
+        run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --no-analytics --master-key=masterKey
+      - name: Run tests
+        run: cargo test --verbose
+      - name: Cargo check
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --workspace --all-targets --all
 
   linter:
     name: clippy-check
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Install clippy
-      run: rustup component add clippy
-    - name: Run linter (clippy)
-      # Will fail when encountering warnings
-      run: cargo clippy -- -D warnings
+      - uses: actions/checkout@v3
+      - name: Install clippy
+        run: rustup component add clippy
+      - name: Run linter (clippy)
+        # Will fail when encountering warnings
+        run: cargo clippy -- -D warnings
 
   formatter:
     name: rust-format
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Run formatter
-      run: cargo fmt
+      - uses: actions/checkout@v3
+      - name: Run formatter
+        run: cargo fmt --all -- --check
 
   readme_check:
     name: readme-check
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Check the README.md file is up-to-date
-      run: sh scripts/check-readme.sh
+      - uses: actions/checkout@v3
+      - name: Check the README.md file is up-to-date
+        run: sh scripts/check-readme.sh
 
   wasm_build:
     name: wasm-build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run:  |
-        rustup target add wasm32-unknown-unknown
-        cargo check -p web_app --target wasm32-unknown-unknown
+      - uses: actions/checkout@v3
+      - name: Build
+        run: |
+          rustup target add wasm32-unknown-unknown
+          cargo check -p web_app --target wasm32-unknown-unknown