watermelon_db_sync 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b9015f5a02d5c6b6e26d8a0052fb9f051ea6c8117809d31eb3b47c3e71a2534
-  data.tar.gz: 9dfd41be7553e2ab5ba5e6446b7cfabcd7b3d0d20a191fbd0c8f8737dd50dcce
+  metadata.gz: 74af5a7823495e5bd4461fff2bdb28c18070dc590268988a8bdafef6b28dd639
+  data.tar.gz: 952be479c9fd26479dca94009db6861581b947e08e19adee1233b69902cc2e7d
 SHA512:
-  metadata.gz: 3834629e0e18f18fd6013c4f00758187638eaf2e83e3611b9ab5a8e025143d4ca85cfafb527708a6f3f5a4aca9b9b4b3d7a507d21d0db4633f9b5aa4676d7775
-  data.tar.gz: 07621474f58f843f13bb37d12b7ae05a63defd525f70ebca2aada8839fb1e36e691f35aba7320eec70e40227ca58fed200e3d9581ac727d0dbbd2788610d584a
+  metadata.gz: de9cb3d1f3ba06edf15d8049ec0af10a270f00f587d65ccdf3df41835eb87c083030fcb5f10393500d0e5ac5ea98da5fcdb2b045e0b3635af290ed4776c6ab23
+  data.tar.gz: 5f5b4bf1b9bf2eb979f20ab67a4f6c2a5759bb762075b72312bca358c0637c999a6acc19a39bb7b19bb0630fd755ab7b53a65e7b26da26dde3a2ad66123802ea

data/lib/watermelon_db_sync/sync_pull.rb

@@ -1,69 +1,88 @@
 module WatermelonDbSync
   class SyncPull < Sync
-    
     attr_accessor :last_pulled_version, :models, :data
 
     def initialize(params)
-      @last_pulled_version = params[:last_pulled_version] || 0
+      @last_pulled_version = params[:last_pulled_version].to_i || 0
       @push_id = params[:push_id]
-      @format_response = {created: [], updated: [], deleted: [] }
       @models = WatermelonDbSync.configuration.sync_models
-      @data = {last_global_seqs: 0, response: build_default_response}
+      @data = { last_global_seqs: 0, response: build_default_response }
     end
 
     def pull
-      self.get_from_all
+      get_from_all
     end
 
     def get_from_all
-      begin
-        max_list = []
-        @models.each do |model|
-          max_list << self.query(eval(model))
-        end
-
-        @data[:last_global_seqs] = max_list.flatten.max || @last_pulled_version.to_i #Sync.last_global_seqs
-        return true
-      rescue => e
-        e.message
+      max_versions = @models.map do |model_name|
+        model = model_name.constantize
+        query(model)
       end
-    end
 
-    # Filtered by push_id, for differentiate record just pushed
-    def query(model=nil)
+      @data[:last_global_seqs] =
+        max_versions.flatten.compact.max || @last_pulled_version
 
-      all_with_deleted = model.with_deleted.where("version_created > #{@last_pulled_version} OR version > #{@last_pulled_version}")
-      max_list = all_with_deleted.pluck(:version, :version_created)
+      true
+    rescue => e
+      e.message
+    end
 
-      all_with_deleted = all_with_deleted.where("push_id != ? or push_id is ?", @push_id, nil) if @push_id.present?
+    private
 
-      created = all_with_deleted.where(deleted_at_server: nil).where("version_created > #{@last_pulled_version}")
+    def base_scope(model)
+      model.respond_to?(:with_deleted) ? model.with_deleted : model.all
+    end
 
-      updated = all_with_deleted.where(deleted_at_server: nil).where("created_at_server != updated_at_server")
-      new_updated = []
-      updated.each do |obj_updated|
-        new_updated << obj_updated unless created.map{|d|d.as_json}.include?(obj_updated.as_json)
+    def deleted_scope(model)
+      if model.respond_to?(:only_deleted)
+        model.only_deleted
+      else
+        model.where.not(deleted_at_server: nil)
       end
-      
-      deleted = all_with_deleted.only_deleted
-      deleted = deleted.pluck(:id)
-      
-      @data[:response][model.table_name.to_sym][:created] = created&.as_json
-      @data[:response][model.table_name.to_sym][:updated] = new_updated&.as_json
-      @data[:response][model.table_name.to_sym][:deleted] = deleted&.as_json
-      
-      max_list
+    end
+
+    def query(model)
+      scope = base_scope(model)
+        .where("version_created > ? OR version > ?", 
+               @last_pulled_version, @last_pulled_version)
+
+      scope = scope.where("push_id != ? OR push_id IS NULL", @push_id) if @push_id.present?
+
+      created = scope
+        .where(deleted_at_server: nil)
+        .where("version_created > ?", @last_pulled_version)
+
+      updated = scope
+        .where(deleted_at_server: nil)
+        .where("version > ? AND version_created <= ?", 
+               @last_pulled_version, @last_pulled_version)
+
+      deleted = deleted_scope(model)
+        .where("version > ?", @last_pulled_version)
+        .pluck(:id)
+
+      table = model.table_name.to_sym
+
+      @data[:response][table][:created] = created.as_json
+      @data[:response][table][:updated] = updated.as_json
+      @data[:response][table][:deleted] = deleted
+
+      scope.pluck(:version, :version_created)
     end
 
     def build_default_response
-      default = Hash.new { |hash, key| hash[key] = {} }
-      @models.each do |model|
-        default[eval(model).table_name.to_sym][:created] = {}
-        default[eval(model).table_name.to_sym][:deleted] = {}
-        default[eval(model).table_name.to_sym][:updated] = {}
+      default = {}
+
+      @models.each do |model_name|
+        table = model_name.constantize.table_name.to_sym
+        default[table] = {
+          created: [],
+          updated: [],
+          deleted: []
+        }
       end
+
       default
     end
-
   end
 end

data/lib/watermelon_db_sync/sync_push.rb

@@ -1,110 +1,112 @@
 module WatermelonDbSync
   class SyncPush < Sync
-
     attr_accessor :models, :data, :params
 
     def initialize(params)
       @models = WatermelonDbSync.configuration.sync_models
       @params = params
-      @data = {last_global_seqs:0}
+      @data = { last_global_seqs: 0 }
       @push_id = rand(1..1_000_000_000)
     end
 
     def push
-      begin
-          if has_conflict_version?
-            @data[:error_code] = "WDBS2"
-            raise StandardError.new("the data has a conflict version, please pull first")
-          else
-            ActiveRecord::Base.transaction do
-              @models.each do |model|
-                self.submit_records!(model) if @params.keys.include? eval(model).table_name
-              end
-                @data[:success] = true
-                sync_pull = SyncPull.new(last_pulled_version: @params["last_pulled_version"], push_id: @push_id)
-                sync_pull.pull
-                @data[:response] = sync_pull.data[:response]
-                @data[:last_global_seqs] = sync_pull.data[:last_global_seqs]
-            end
-          end
-      rescue StandardError => e
+      if has_conflict_version?
         @data[:success] = false
-        @data[:message] = e.message
+        @data[:error_code] = "WDBS2"
+        @data[:message] = "Conflict version detected. Please pull first."
+        return
       end
-    end
 
+      ActiveRecord::Base.transaction do
+        @models.each do |model_name|
+          model = model_name.constantize
+          next unless @params.key?(model.table_name)
 
-    def submit_records!(model)
-      table = @params[model.tableize]
-      table["created"]&.each do |data|
-        data = except_data(data)
-        data["push_id"] = @push_id
-
-        find_or_new = eval(model).find(data["id"]) rescue nil
-        if find_or_new.blank?
-          find_or_new = eval(model).new(data)
-          find_or_new.id = data["id"]
-          find_or_new.created_at = data["created_at"]
-          find_or_new.updated_at = data["updated_at"]
-          find_or_new.save!
-        else
-          find_or_new.update!(data)
+          submit_records!(model)
         end
+
+        sync_pull = SyncPull.new(
+          last_pulled_version: @params["last_pulled_version"],
+          push_id: @push_id
+        )
+
+        sync_pull.pull
+
+        @data[:success] = true
+        @data[:response] = sync_pull.data[:response]
+        @data[:last_global_seqs] = sync_pull.data[:last_global_seqs]
       end
+    rescue => e
+      @data[:success] = false
+      @data[:message] = e.message
+    end
 
-      table["updated"]&.each do |data|
-        data = except_data(data)
-        data["push_id"] = @push_id
+    private
 
-        find_record = eval(model).find(data["id"]) rescue nil
+    def base_scope(model)
+      model.respond_to?(:with_deleted) ? model.with_deleted : model.all
+    end
 
-        if find_record.nil? && eval(model).only_deleted.find(data["id"])
-          @data[:error_code] = "WDBS1"
-          raise StandardError.new("id=#{data["id"]} of the #{model} was deleted, please pull first")
-        end
-        find_record.update!(data.except("id"))
+    def submit_records!(model)
+      table = @params[model.table_name]
+
+      table["created"]&.each do |record|
+        record = sanitize(record)
+        record["push_id"] = @push_id
+
+        obj = model.find_by(id: record["id"]) || model.new
+        obj.assign_attributes(record)
+        obj.save!
       end
 
-      table["deleted"]&.each do |data|
-        find_record = eval(model).find(data) rescue nil
+      table["updated"]&.each do |record|
+        record = sanitize(record)
+        record["push_id"] = @push_id
 
-        if find_record.present?
-          find_record.update_column(:push_id, @push_id)
-          find_record.destroy
-        end
+        obj = model.find(record["id"])
+        obj.update!(record.except("id"))
+      end
+
+      table["deleted"]&.each do |id|
+        obj = model.find_by(id: id)
+        next unless obj
+
+        obj.update_column(:push_id, @push_id)
+        obj.destroy
       end
-      
     end
 
-    def except_data(data)
-      data.except("version", "version_created", "created_at_server", "updated_at_server", "deleted_at_server", "push_id", "_status", "_changed")
+    def sanitize(data)
+      data.except(
+        "version",
+        "version_created",
+        "created_at_server",
+        "updated_at_server",
+        "deleted_at_server",
+        "push_id",
+        "_status",
+        "_changed"
+      )
     end
 
     def has_conflict_version?
-        conflict = false
-        @models.each do |model|
-        
-        #keep original object @params
-        params = Marshal.load(Marshal.dump(@params))
-        table = params[model.tableize]
-        if (params.keys.include? eval(model).table_name)
-          collect_ids = table["created"]
-
-          if table["updated"].present?
-            updated = table["updated"]
-            collect_ids.concat(updated)
-          end
-
-          collect_ids = collect_ids&.map{|d|d["id"]}
-          collect_ids.concat(table["deleted"]) if table["deleted"].present? 
-          conflict = eval(model).with_deleted
-                              .where(id: collect_ids)
-                              .where("version_created > #{@params["last_pulled_version"]} OR version > #{@params["last_pulled_version"]}").exists?
-        end
-          break if conflict
-        end
-        return conflict
+      @models.any? do |model_name|
+        model = model_name.constantize
+        table = @params[model.table_name]
+        next false unless table
+
+        ids = []
+        ids += table["created"]&.map { |d| d["id"] } || []
+        ids += table["updated"]&.map { |d| d["id"] } || []
+        ids += table["deleted"] || []
+
+        base_scope(model)
+          .where(id: ids)
+          .where("version_created > ? OR version > ?", 
+                 @params["last_pulled_version"].to_i,
+                 @params["last_pulled_version"].to_i)
+          .exists?
+      end
     end
-
   end
 end

data/lib/watermelon_db_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WatermelonDbSync
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: watermelon_db_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yasfi
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -104,13 +103,13 @@ files:
 - lib/watermelon_db_sync/sync_push.rb
 - lib/watermelon_db_sync/version.rb
 - sig/watermelon_db_sync.rbs
+- watermelon_db_sync-0.1.0.gem
 homepage: https://github.com/aapiw/watermelon_db_sync
 licenses: []
 metadata:
   homepage_uri: https://github.com/aapiw/watermelon_db_sync
   source_code_uri: https://github.com/aapiw/watermelon_db_sync
   changelog_uri: https://github.com/aapiw/watermelon_db_sync
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -125,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 4.0.7
 specification_version: 4
 summary: Make synchronize pull & push easier & faster.
 test_files: []