active_force 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661e75020c19d46986c8556c2e39799831468741b96909bab00f40d3ffb1294c
-  data.tar.gz: c2549061250e05f2f145c3129c4f83c1d973b09097c77e03592b68b892f54e02
+  metadata.gz: c325fe186d67cce9500a1df17360184bd97c2fa26fed2819b327f3ea8331df7c
+  data.tar.gz: 482d5c2fabed72c3d12b646037dad7900f26e17260000a65e171d42ab41ce394
 SHA512:
-  metadata.gz: 2bb66f6e4278cc3552200adef1cf4bff72ee01681253b573aa28fb1f8f410bb09a836c043b0b9dc1f1df744167050a03c8ca538f0a1cbc025645ca6ebe90a6ef
-  data.tar.gz: e5e52a99e28c971a1fe7e4a7135031bfa15cbeeadb1c782a1252915ba593699bda99b0f1a6f832c673d129cdc10ed2527ecff391144c4db30783af87bd40090b
+  metadata.gz: 05a36678b1ba07b3e89b1a755e7526facd18cdef04cdfcb9dd1b08224f42bbcc779959c26e869a3ead38e5add649d710e4afc4f0c1f88cdbcd73287360da3f7a
+  data.tar.gz: 13724331bdafe67729dafd0ca31a863657e125c8bb458fb8a0316aa5a2fba9f466c0e3ff52bc6fbc80a9190639636e726ac8c9940cc92836260b774cc7024ec5

data/CHANGELOG.md

@@ -1,12 +1,17 @@
 # Changelog
 
 ## Not released
+
+## 0.15.1
+
+- Revert new `pluck` implementation due to compatibility issues (https://github.com/Beyond-Finance/active_force/pull/60)
+
 ## 0.15.0
+
 - Fix model defaults so data is persisted in Salesforce (https://github.com/Beyond-Finance/active_force/pull/55)
 - Add `pluck` query method (https://github.com/Beyond-Finance/active_force/pull/51)
 - Add `#order` method to active query that accepts arguments in several formats ( symbol, string that has raw soql) (https://github.com/Beyond-Finance/active_force/pull/58)
 
-
 ## 0.14.0
 
 - Add `scoped_as` option to `has_one` association (https://github.com/Beyond-Finance/active_force/pull/50)

data/lib/active_force/active_query.rb

@@ -51,15 +51,6 @@ module ActiveForce
       sfdc_client.query(to_s).first.expr0
     end
 
-    def pluck(*fields)
-      fields = mappings.keys if fields.blank?
-
-      sfdc_client.query(select(*fields).to_s).map do |record|
-        values = fields.map { |field| cast_value(field, record) }
-        values.length == 1 ? values.first : values
-      end
-    end
-
     def limit limit
       super
       limit == 1 ? to_a.first : self
@@ -217,12 +208,6 @@ module ActiveForce
       sfdc_client.query(self.to_s)
     end
 
-    def cast_value(field, object)
-      attribute_type = sobject.attribute_types[field.to_s]
-      value = object[mappings[field]]
-      attribute_type&.cast(value) || value
-    end
-
     def clone_self_and_clear_cache
       new_query = self.clone
       new_query.instance_variable_set(:@decorated_records, nil)

data/lib/active_force/sobject.rb

@@ -29,8 +29,7 @@ module ActiveForce
 
     class << self
       extend Forwardable
-      def_delegators :query, :not, :or, :where, :first, :last, :all, :find, :find!, :find_by, :find_by!, :sum, :count,
-                     :includes, :limit, :order, :select, :none, :pluck
+      def_delegators :query, :not, :or, :where, :first, :last, :all, :find, :find!, :find_by, :find_by!, :sum, :count, :includes, :limit, :order, :select, :none
       def_delegators :mapping, :table, :table_name, :custom_table?, :mappings
 
       private

data/lib/active_force/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveForce
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

data/spec/active_force/sobject_spec.rb

@@ -354,71 +354,6 @@ describe ActiveForce::SObject do
     end
   end
 
-  describe '#pluck' do
-    let(:record_attributes) { [] }
-
-    before do
-      collection = build_restforce_collection(record_attributes.map { |a| build_restforce_sobject(a) })
-      allow(client).to receive(:query).and_return(collection)
-    end
-
-    it 'returns empty array if no records returned from query' do
-      expect(Whizbang.pluck).to eq([])
-    end
-
-    it 'works with another query' do
-      expected = 'SELECT Id, Text_Label FROM Whizbang__c WHERE (Checkbox_Label = true)'
-      Whizbang.where(checkbox: true).pluck(:id, :text)
-      expect(client).to have_received(:query).with(expected)
-    end
-
-    context 'when given no fields' do
-      it 'queries for all fields' do
-        expected = "SELECT #{Whizbang.fields.join ', '} FROM Whizbang__c"
-        Whizbang.pluck
-        expect(client).to have_received(:query).with(expected)
-      end
-    end
-
-    context 'when given one field' do
-      let(:ids) { ['a', 'b', 1] }
-      let(:record_attributes) { ids.map { |v| { 'Id' => v } } }
-
-      it 'queries for only that field' do
-        expected = 'SELECT Id FROM Whizbang__c'
-        Whizbang.pluck(:id)
-        expect(client).to have_received(:query).with(expected)
-      end
-
-      it 'returns an array of casted values for that field' do
-        expect(Whizbang.pluck(:id)).to match_array(ids.map(&:to_s))
-      end
-    end
-
-    context 'when given more than one field' do
-      let(:record_attributes) do
-        [
-          { 'Text_Label' => 'test1', 'Date_Label' => '2023-01-01' },
-          { 'Text_Label' => 'test2', 'Date_Label' => '2023-01-02' }
-        ]
-      end
-
-      it 'queries for only those fields' do
-        expected = 'SELECT Text_Label, Date_Label FROM Whizbang__c'
-        Whizbang.pluck(:text, :date)
-        expect(client).to have_received(:query).with(expected)
-      end
-
-      it 'returns an array of arrays of casted values in the correct order' do
-        expected = [
-          ['test1', Date.new(2023, 1, 1)],
-          ['test2', Date.new(2023, 1, 2)]
-        ]
-        expect(Whizbang.pluck(:text, :date)).to match_array(expected)
-      end
-    end
-  end
-
   describe '#reload' do
     let(:client) do
       double("sfdc_client", query: [Restforce::Mash.new(Id: 1, Name: 'Jeff')])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_force
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Eloy Espinaco
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel