ar_sync 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce8f54d9f17ebdd9341d3ba5e1087bde5875d5a4f88b5eeddded0602aece480
-  data.tar.gz: 209d8c04edf0d06b42c853eea568e298ccd626438fb64b416a8cc8e82293f0b8
+  metadata.gz: ab145d5094c25600e95e01ab625c0128782b2a0592be95d8c9333539a5128bd1
+  data.tar.gz: 062fcf8cb8996e145dfa35eb25b31f2ecc2b4a486183bc70678d055db2bf2bc8
 SHA512:
-  metadata.gz: bb0b79346ca7062f69f77254ac4463aba3261ae8419937c64b0a0cb17715b5e97dc4035c76c863bdc87739fb1070ee21c27b034d908839309b83f26462038663
-  data.tar.gz: 2b633cdcff19283fd2626e41751de5e969888e905452f2a86621c39be9eed6a6c467e5abe98d194b120aa7096e370f95a5fdb80439829a47cf60047f9ed0d608
+  metadata.gz: 556a1c954088cea90d44bb61cec1fc250804f1fc5ec4e1c4101ff642343af49bc4ce8870be152de4627802931409d3c5f25707fa34b59ba8e53e9873a99e9b54
+  data.tar.gz: 28846608f3314be4a117d1ffbf265702f2170755f027696300f991b01a9228302d7e218fce757826c7528c8643d98f66e1073741305c1d851f1fe6602c9f185b

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Test
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '3.0', '3.1' ]
+        gemfiles:
+          - gemfiles/Gemfile-rails-6
+          - gemfiles/Gemfile-rails-7
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '14.x'
+    - run: |
+        sudo apt-get update
+        sudo apt-get install -y libsqlite3-dev
+    - run: bundle install --gemfile ${{ matrix.gemfiles }} --jobs 4 --retry 3
+    - run: npm install
+    - run: npm run build
+    - run: bundle exec --gemfile ${{ matrix.gemfiles }} rake

data/Gemfile

@@ -4,3 +4,4 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in ar_sync.gemspec
 gemspec
+gem 'ar_serializer'

data/Gemfile.lock

@@ -1,52 +1,50 @@
 PATH
   remote: .
   specs:
-    ar_sync (1.0.5)
+    ar_sync (1.1.0)
       activerecord
       ar_serializer
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord-import (1.0.2)
-      activerecord (>= 3.2)
-    activesupport (6.0.2.1)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activerecord (7.0.2.3)
+      activemodel (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activerecord-import (1.4.0)
+      activerecord (>= 4.2)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    ar_serializer (1.1.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ar_serializer (1.2.0)
       activerecord
       top_n_loader
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    i18n (1.7.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    method_source (0.9.2)
-    minitest (5.13.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (12.3.2)
+    method_source (1.0.0)
+    minitest (5.15.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.6)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    top_n_loader (1.0.1)
+    top_n_loader (1.0.2)
       activerecord
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord-import
+  ar_serializer
   ar_sync!
   pry
   rake

data/core/ArSyncApi.d.ts

@@ -1,8 +1,14 @@
 declare function apiBatchFetch(endpoint: string, requests: object[]): Promise<any>;
+declare type Request = {
+    api: string;
+    params?: any;
+    query: any;
+    id?: number;
+};
 declare const ArSyncApi: {
     domain: string | null;
     _batchFetch: typeof apiBatchFetch;
-    fetch: (request: object) => Promise<unknown>;
-    syncFetch: (request: object) => Promise<unknown>;
+    fetch: (request: Request) => Promise<unknown>;
+    syncFetch: (request: Request) => Promise<unknown>;
 };
 export default ArSyncApi;

data/core/ArSyncApi.js

@@ -79,6 +79,16 @@ var ApiFetcher = /** @class */ (function () {
     }
     ApiFetcher.prototype.fetch = function (request) {
         var _this = this;
+        if (request.id != null) {
+            return new Promise(function (resolve, reject) {
+                _this.fetch({ api: request.api, params: { ids: [request.id] }, query: request.query }).then(function (result) {
+                    if (result[0])
+                        resolve(result[0]);
+                    else
+                        reject({ type: 'Not Found', retry: false });
+                }).catch(reject);
+            });
+        }
         return new Promise(function (resolve, reject) {
             _this.batches.push([request, { resolve: resolve, reject: reject }]);
             if (_this.batchFetchTimer)
@@ -108,7 +118,7 @@ var ApiFetcher = /** @class */ (function () {
                         var callbacks = callbacksList[i];
                         for (var _i = 0, callbacks_1 = callbacks; _i < callbacks_1.length; _i++) {
                             var callback = callbacks_1[_i];
-                            if (result.data) {
+                            if (result.data !== undefined) {
                                 callback.resolve(result.data);
                             }
                             else {