sf_connect 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ecbcbb39d5d19bc52e64d354e3b39422af68cb8040e3bb1a9b5823542109753
-  data.tar.gz: 81e4fc211891bfe2908d077f6263939a220774843a2547ba9e1beba0690a2a53
+  metadata.gz: 6bbd8b629514161ddfce2d6e3b7339dec55eec9f83239fa35900e455afcf8c74
+  data.tar.gz: 34254fdbe07ce3b7a5d57ae7147f6237293880900470ee06f78188c7ecaeb5a8
 SHA512:
-  metadata.gz: 2d35cdf68b3ffc6f3364e1090b62ed2602e281ead52bf87aef0f322f164b1ad35ebaff28e138055184db5528fb6bd2440d3df78599688e73202a80efa0891edf
-  data.tar.gz: 8fa8a2f9619a323b6aa162fe594c66d23348ed25bcffc022d13b68eae47c92cc0158e45caa5ea2b2e0dce9d5f15d697bf3aea2d43b42ede45b3db8479c9001a7
+  metadata.gz: 91e4bc66a5470b3b0cd4fc46652f7b7d0d7f862cf74d411541de0b20b261599641472e2a37e48a26cf1c2750cbaf959506b466946a065b998dcf5ce712f677e1
+  data.tar.gz: 760587c3c70be8694c11e90470efef931c9730d9d2cbbe361f3455a0a640797536ab463ee78a91da9f0ca2ec8e2d4bb6452c02cef09347c9af0c99bbacf503cf

data/lib/sf_connect/downloader.rb

@@ -29,15 +29,15 @@ module SfConnect
       end
 
       def download_salesforce_record(salesforce_object_id)
-        result = fetch(salesforce_object_id)
-        record = find_or_initialize_from_salesforce(result.binding_attributes)
-        record.update(result.binding_attributes)
+        payload = fetch(salesforce_object_id)
+        record = find_or_initialize_from_salesforce(payload.for_download)
+        record.update(payload.for_download)
         record
       end
 
       def download_salesforce_records(batch_size = 1000)
         fetch_all.each_slice(batch_size) do |records|
-          upsert_all records.map(&:binding_attributes)
+          upsert_all records.map(&:for_download)
         end
       end
     end

data/lib/sf_connect/fields.rb

@@ -3,7 +3,7 @@ module SfConnect
   # salesforce fields <=> object attributes
   #
   class Fields
-    attr_reader :salesforce_object_name, :query, :fields, :result_class
+    attr_reader :salesforce_object_name
 
     def initialize(salesforce_object_name:, where:, fields:, block:)
       @fields = fields
@@ -11,20 +11,38 @@ module SfConnect
       @query = "select #{fields.keys.join(",")} from #{salesforce_object_name}"
       @query = "#{@query} where #{where}" if where
 
-      @result_class = Class.new(SfConnect::Result)
-      @result_class.include(Module.new(&block)) if block
+      @payload = Class.new(SfConnect::Payload)
+      @payload.include(Module.new(&block)) if block
     end
 
     def fetch(id, field = nil)
-      result(SfConnect.find(salesforce_object_name, id, field))
+      payload_for_download(SfConnect.find(salesforce_object_name, id, field))
     end
 
     def fetch_all(query_option)
-      SfConnect.query(query + query_option).each do |sobject|
-        yield result(sobject)
+      SfConnect.query(@query + query_option).each do |sobject|
+        yield payload_for_download(sobject)
       end
     end
 
+    def payload_for_upload_from_hash(record)
+      @payload.new(record:, for_upload: convert_to_salesforce_from_hash(record)).for_upload
+    end
+
+    def payload_for_upload(record)
+      @payload.new(record:, for_upload: convert_to_salesforce(record)).for_upload
+    end
+
+    def payload_for_download(record)
+      @payload.new(record:, for_download: convert_from_salesforce(record))
+    end
+
+    private
+
+    def convert(&)
+      @fields.compact.filter_map(&).to_h
+    end
+
     def convert_to_salesforce_from_hash(target)
       convert do |saeslforce_field_name, object_field_name|
         [
@@ -51,15 +69,5 @@ module SfConnect
         ]
       end
     end
-
-    private
-
-    def result(record)
-      result_class.new(record:, binding_attributes: convert_from_salesforce(record))
-    end
-
-    def convert(&)
-      @fields.compact.filter_map(&).to_h
-    end
   end
 end

data/lib/sf_connect/payload.rb

@@ -0,0 +1,12 @@
+module SfConnect
+  # payload for salesforce
+  class Payload
+    attr_reader :record, :for_upload, :for_download
+
+    def initialize(record:, for_upload: nil, for_download: nil)
+      @record = record
+      @for_upload = for_upload
+      @for_download = for_download
+    end
+  end
+end

data/lib/sf_connect/uploader.rb

@@ -10,13 +10,13 @@ module SfConnect
     end
 
     def upload_payload_for_salesforce
-      self.class.salesforce_fields.convert_to_salesforce(self)
+      self.class.salesforce_fields.payload_for_upload(self)
     end
 
     class_methods do
       def upload_salesforce_record(**attributes)
         create_salesforce_record(
-          salesforce_fields.convert_to_salesforce_from_hash(attributes)
+          salesforce_fields.payload_for_upload_from_hash(attributes)
         )
       end
 

data/lib/sf_connect/version.rb

@@ -1,3 +1,3 @@
 module SfConnect
-  VERSION = "0.1.1".freeze
+  VERSION = "0.2.1".freeze
 end

data/lib/sf_connect.rb

@@ -7,13 +7,11 @@ require "active_support/all"
 module SfConnect
   extend ActiveSupport::Autoload
   autoload :Define
+  autoload :Payload
   autoload :Fields
   autoload :Uploader
   autoload :Downloader
 
-  # fetch salseforce result
-  Result = Struct.new(:record, :binding_attributes, keyword_init: true)
-
   class << self
     def define(salesforce_object_name, where: nil, **fields, &)
       SfConnect::Define.new(salesforce_object_name, where:, fields:, &).call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sf_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Masa (Aileron inc)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restforce
@@ -56,6 +56,7 @@ files:
 - lib/sf_connect/define.rb
 - lib/sf_connect/downloader.rb
 - lib/sf_connect/fields.rb
+- lib/sf_connect/payload.rb
 - lib/sf_connect/uploader.rb
 - lib/sf_connect/version.rb
 - sig/sf_connect.rbs