restforce-db 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d8819030ad19f9cf66c0f4f0e8a8f619a75a207
-  data.tar.gz: 239e7983d8a2f382f02616635d2d96882eae3a44
+  metadata.gz: e92a8e2216150a27646cdd8525a951100055ad99
+  data.tar.gz: 07ade758ff323cd721daede50850a724562df0b1
 SHA512:
-  metadata.gz: dac325298c30890ac75800f246863b3e831c25e2c66c108f3835f091271f49cd2c69ddc9fa165620c8c650f507d22db44346435c3c062deac0fd251728918c64
-  data.tar.gz: 0d95128ded0b74be19e399e2350d9a0f34889c1a0fd0f69703dd5dc475f2f1684e32ff1be9b4f030c8d1ed41385b9e487e40cc4d8d5a14f96e20bd5df2fec80c
+  metadata.gz: be4a146095c1555becbb048bd0944b56d37fe8c14231cc2e27355f30c372526ced00f8767ed486d14117af61dc47c8b4d55c28d95b99d74723a4f6ec83993c4e
+  data.tar.gz: d5a0929ca903969593e9037961a9ba2874329fa9f3f30e58fee67fa993c1b6d3bdc9bec2a84b06ccd0dee6c0a210261b95b2a9ff0212b80e6f65dc472068c8ca

data/README.md

@@ -44,12 +44,16 @@ class Restaurant < ActiveRecord::Base
 
   module StyleAdapter
 
-    def self.to_salesforce(value)
-      "#{value} in Salesforce"
+    def self.to_database(attributes)
+      attributes.each_with_object({}) do |(key, value), final|
+        final[key] = value.chomp(" in Salesforce")
+      end
     end
 
-    def self.to_database(value)
-      value.chomp(" in Salesforce")
+    def self.from_database(attributes)
+      attributes.each_with_object({}) do |(key, value), final|
+        final[key] = "#{value} in Salesforce"
+      end
     end
 
   end
@@ -59,14 +63,12 @@ class Restaurant < ActiveRecord::Base
     has_many :dishes, through: "Restaurant__c"
     belongs_to :chef, through: %w(Chef__c Cuisine__c)
 
+    converts_with StyleAdapter
+
     maps(
       name:  "Name",
       style: "Style__c",
     )
-
-    converts(
-      style: StyleAdapter,
-    )
   end
 
 end
@@ -135,9 +137,17 @@ Individual conditions supplied to `where` will be appended together with `AND` c
 
 `maps` defines a set of direct field-to-field mappings. It takes a Hash as an argument; the keys should line up with your ActiveRecord attribute names, while the values should line up with the matching field names in Salesforce.
 
+Your ActiveRecord class _must_ expose readers for each attribute in the mapping, and generally _should_ expose matching writers, though you can use an adapter object (see "Field Conversions" below) to obviate the need for the latter.
+
 #### Field Conversions
 
-`converts` defines a set of value adapters. It takes a Hash as an argument; the keys should line up with the ActiveRecord attribute names defined in your `maps` clause, while the values should be the corresponding adapter objects. The only requirement for an adapter is that it respond to the methods `#to_database` and `#to_salesforce`.
+`converts_with` defines a mapping conversion adapter. The only requirement for an adapter is that it respond to the methods `#to_database` and `#from_database`. 
+
+- `#to_database` will be handed a "normalized" Hash, with the standard Symbol mapped attributes as keys, and the values as they are stored in Salesforce. It should return a modified version of the Hash which can be passed to `assign_attributes` for a record.
+
+- `#from_database` will be handed a Hash with the standard Symbol mapped attributes as keys, and the values for those attributes as they are returned by the ActiveRecord object. It should return a modified version of the Hash with values suitable for storage in Salesforce.
+
+By default, `Restforce::DB::Adapter` will be used, which simply converts times into String ISO-8601 timestamps before passing them off to Salesforce.
 
 #### Associations
 

data/circle.yml

@@ -0,0 +1,20 @@
+checkout:
+  post:
+    - mkdir -p test/config
+    - cp lib/generators/templates/config.yml test/config/secrets.yml
+machine:
+  ruby:
+    version: 2.2.2
+dependencies:
+  pre:
+    # Get the most recent bundler
+    - gem install bundler
+database:
+  override:
+    # Do nothing; we don't need any database setup.
+    - echo "SKIPPING"
+test:
+  override:
+    - bundle exec rubocop
+    - bundle exec rake test
+

data/lib/restforce/db/accumulator.rb

@@ -31,19 +31,16 @@ module Restforce
         end
       end
 
-      # Public: Get a Hash representing the changes that would need to be
-      # applied to make a passed Hash a subset of this Accumulator's derived
-      # attributes Hash.
+      # Public: Get a Hash representing the current values for the items in the
+      # passed Hash, as a subset of this Accumulator's attributes Hash.
       #
       # comparison - A Hash mapping of attributes to values.
       #
       # Returns a Hash.
-      def diff(comparison)
-        attributes.each_with_object({}) do |(attribute, value), diff|
+      def current(comparison)
+        attributes.each_with_object({}) do |(attribute, value), final|
           next unless comparison.key?(attribute)
-          next if comparison[attribute] == value
-
-          diff[attribute] = value
+          final[attribute] = value
         end
       end
 

data/lib/restforce/db/adapter.rb

@@ -0,0 +1,39 @@
+module Restforce
+
+  module DB
+
+    # Restforce::DB::Adapter defines the default data conversions between
+    # database and Salesforce formats. It translates Dates and Times to ISO-8601
+    # format for storage in Salesforce.
+    class Adapter
+
+      # Public: Convert the passed attribute hash to a format consumable by
+      # the ActiveRecord model. By default, performs no conversions.
+      #
+      # attributes - A Hash of attributes, with keys corresponding to a Mapping.
+      #
+      # Returns a Hash.
+      def to_database(attributes)
+        attributes.dup
+      end
+
+      # Public: Convert the passed attribute hash to a format consumable by
+      # Salesforce.
+      #
+      # attributes - A Hash of attributes, with keys corresponding to a Mapping.
+      #
+      # Returns a Hash.
+      def from_database(attributes)
+        attributes.each_with_object({}) do |(key, value), final|
+          value = value.utc if value.respond_to?(:utc)
+          value = value.iso8601 if value.respond_to?(:iso8601)
+
+          final[key] = value
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/restforce/db/attribute_map.rb

@@ -4,40 +4,25 @@ module Restforce
 
     # Restforce::DB::AttributeMap encapsulates the logic for converting between
     # various representations of attribute hashes.
+    #
+    # For the purposes of our mappings, a "normalized" attribute Hash maps the
+    # Salesforce field names to Salesforce-compatible values. Value conversion
+    # into and out of the database occurs through a lightweight Adapter object.
     class AttributeMap
 
-      # DefaultAdapter defines the default data conversions between database and
-      # Salesforce formats. It translates Dates and Times to ISO-8601 format for
-      # storage in Salesforce.
-      module DefaultAdapter
-
-        # :nodoc:
-        def self.to_database(value)
-          value
-        end
-
-        # :nodoc:
-        def self.to_salesforce(value)
-          value = value.respond_to?(:utc) ? value.utc : value
-          value.respond_to?(:iso8601) ? value.iso8601 : value
-        end
-
-      end
-
       # Public: Initialize a Restforce::DB::AttributeMap.
       #
       # database_model   - A Class compatible with ActiveRecord::Base.
       # salesforce_model - A String name of an object type in Salesforce.
       # fields           - A Hash of mappings between database columns and
       #                    fields in Salesforce.
-      # conversions      - A Hash of mappings between database columns and the
-      #                    corresponding adapter objects which should be used to
-      #                    convert between data formats.
-      def initialize(database_model, salesforce_model, fields = {}, conversions = {})
+      # adapter          - An adapter object which should be used to convert
+      #                    between data formats.
+      def initialize(database_model, salesforce_model, fields = {}, adapter = Adapter.new)
         @database_model = database_model
         @salesforce_model = salesforce_model
         @fields = fields
-        @conversions = conversions
+        @adapter = adapter
 
         @types = {
           database_model   => :database,
@@ -47,7 +32,7 @@ module Restforce
 
       # Public: Build a normalized Hash of attributes from the appropriate set
       # of mappings. The keys of the resulting mapping Hash will correspond to
-      # the database column names.
+      # the Salesforce field names.
       #
       # from_format - A String or Class reflecting the record type from which
       #               the attribute Hash is being compiled.
@@ -57,13 +42,18 @@ module Restforce
       def attributes(from_format)
         case @types[from_format]
         when :salesforce
-          @fields.each_with_object({}) do |(attribute, mapping), values|
-            values[attribute] = adapter(attribute).to_database(yield(mapping))
+          @fields.values.each_with_object({}) do |mapping, values|
+            values[mapping] = yield(mapping)
           end
         when :database
-          @fields.keys.each_with_object({}) do |attribute, values|
+          attributes = @fields.keys.each_with_object({}) do |attribute, values|
             values[attribute] = yield(attribute)
           end
+          attributes = @adapter.from_database(attributes)
+
+          @fields.each_with_object({}) do |(attribute, mapping), final|
+            final[mapping] = attributes[attribute]
+          end
         else
           raise ArgumentError
         end
@@ -85,65 +75,22 @@ module Restforce
       #     some_key: "SomeField__c",
       #   )
       #
-      #   mapping.convert("Object__c", some_key: "some value")
-      #   # => { "Some_Field__c" => "some value" }
+      #   mapping.convert(MyClass, "Some_Field__c" => "some value")
+      #   # => { some_key: "some value" }
       #
-      #   mapping.convert(MyClass, some_key: "some other value")
-      #   # => { some_key: "some other value" }
+      #   mapping.convert("Object__c", "Some_Field__c" => "some other value")
+      #   # => { "Some_Field__c" => "some other value" }
       #
       # Returns a Hash.
       def convert(to_format, attributes)
         case @types[to_format]
         when :database
-          attributes.dup
-        when :salesforce
-          @fields.each_with_object({}) do |(attribute, mapping), converted|
-            next unless attributes.key?(attribute)
-            value = adapter(attribute).to_salesforce(attributes[attribute])
-            converted[mapping] = value
-          end
-        else
-          raise ArgumentError
-        end
-      end
-
-      # Public: Convert a Hash of Salesforce attributes to a format compatible
-      # with a specific platform.
-      #
-      # to_format  - A String or Class reflecting the record type for which the
-      #              attribute Hash is being compiled.
-      # attributes - A Hash of attributes, with keys corresponding to the
-      #              Salesforce attribute names.
-      #
-      # Examples
-      #
-      #   map = AttributeMap.new(
-      #     MyClass,
-      #     "Object__c",
-      #     some_key: "SomeField__c",
-      #   )
-      #
-      #   map.convert_from_salesforce(
-      #     "Object__c",
-      #     "Some_Field__c" => "some value",
-      #   )
-      #   # => { "Some_Field__c" => "some value" }
-      #
-      #   map.convert_from_salesforce(
-      #     MyClass,
-      #     "Some_Field__c" => "some other value",
-      #   )
-      #   # => { some_key: "some other value" }
-      #
-      # Returns a Hash.
-      def convert_from_salesforce(to_format, attributes)
-        case @types[to_format]
-        when :database
-          @fields.each_with_object({}) do |(attribute, mapping), converted|
+          attributes = @fields.each_with_object({}) do |(attribute, mapping), converted|
             next unless attributes.key?(mapping)
-            value = adapter(attribute).to_database(attributes[mapping])
-            converted[attribute] = value
+            converted[attribute] = attributes[mapping]
           end
+
+          @adapter.to_database(attributes)
         when :salesforce
           attributes.dup
         else
@@ -151,15 +98,6 @@ module Restforce
         end
       end
 
-      # Internal: Get the data format adapter for the passed attribute. Defaults
-      # to DefaultAdapter if no adapter has been explicitly assigned for the
-      # attribute.
-      #
-      # Returns an Object.
-      def adapter(attribute)
-        @conversions[attribute] || DefaultAdapter
-      end
-
     end
 
   end

data/lib/restforce/db/collector.rb

@@ -47,27 +47,27 @@ module Restforce
         @accumulated_changes ||= Hash.new { |h, k| h[k] = {} }
       end
 
-      # Internal: Append the passed record's attributes to its accumulated list
+      # Internal: Append the passed instance's attributes to its accumulated list
       # of changesets.
       #
-      # record - A Restforce::DB::Instances::Base.
+      # instance - A Restforce::DB::Instances::Base.
       #
       # Returns nothing.
-      def accumulate(record)
-        accumulated_changes[key_for(record)].store(
-          record.last_update,
-          @mapping.convert(@mapping.salesforce_model, record.attributes),
+      def accumulate(instance)
+        accumulated_changes[key_for(instance)].store(
+          instance.last_update,
+          instance.attributes,
         )
       end
 
       # Internal: Get a unique key with enough information to look up the passed
-      # record in Salesforce.
+      # instance in Salesforce.
       #
-      # record - A Restforce::DB::Instances::Base.
+      # instance - A Restforce::DB::Instances::Base.
       #
       # Returns an Object.
-      def key_for(record)
-        [record.id, record.mapping.salesforce_model]
+      def key_for(instance)
+        [instance.id, instance.mapping.salesforce_model]
       end
 
     end

data/lib/restforce/db/dsl.rb

@@ -97,17 +97,17 @@ module Restforce
       # Public: Define a set of adapters which should be used to translate data
       # between the database and Salesforce.
       #
-      # fields - A Hash, with keys corresponding to attributes of the database
-      #          record, and adapter objects as values.
+      # adapter - An adapter object, which converts an attribute Hash between
+      #           normalized and database-ready formats.
       #
-      # Raises ArgumentError if any adapter object has an incomplete interface.
+      # Raises ArgumentError if the adapter object has an incomplete interface.
       # Returns nothing.
-      def converts(conversions)
-        unless conversions.values.all? { |c| c.respond_to?(:to_database) && c.respond_to?(:to_salesforce) }
-          raise ArgumentError, "All adapters must implement `to_database` and `to_salesforce` methods"
+      def converts_with(adapter)
+        unless adapter.respond_to?(:to_database) && adapter.respond_to?(:from_database)
+          raise ArgumentError, "Your adapter must implement `to_database` and `from_database` methods"
         end
 
-        @mapping.conversions = conversions
+        @mapping.adapter = adapter
       end
 
     end

data/lib/restforce/db/mapping.rb

@@ -14,7 +14,6 @@ module Restforce
         :attribute_map,
         :attributes,
         :convert,
-        :convert_from_salesforce,
       )
 
       attr_reader(
@@ -25,8 +24,8 @@ module Restforce
       )
 
       attr_accessor(
+        :adapter,
         :fields,
-        :conversions,
         :associations,
         :conditions,
         :strategy,
@@ -44,8 +43,8 @@ module Restforce
         @database_record_type = RecordTypes::ActiveRecord.new(database_model, self)
         @salesforce_record_type = RecordTypes::Salesforce.new(salesforce_model, self)
 
+        self.adapter = Adapter.new
         self.fields = {}
-        self.conversions = {}
         self.associations = []
         self.conditions = []
         self.strategy = strategy
@@ -109,7 +108,7 @@ module Restforce
       #
       # Returns a Restforce::DB::AttributeMap.
       def attribute_map
-        @attribute_map ||= AttributeMap.new(database_model, salesforce_model, fields, conversions)
+        @attribute_map ||= AttributeMap.new(database_model, salesforce_model, fields, adapter)
       end
 
     end

data/lib/restforce/db/synchronizer.rb

@@ -49,8 +49,8 @@ module Restforce
       #
       # Returns nothing.
       def update(instance, accumulator)
-        diff = accumulator.diff(@mapping.convert(@mapping.salesforce_model, instance.attributes))
-        attributes = @mapping.convert_from_salesforce(instance.record_type, diff)
+        current_attributes = accumulator.current(instance.attributes)
+        attributes = @mapping.convert(instance.record_type, current_attributes)
 
         return if attributes.empty?
         instance.update!(attributes)

data/lib/restforce/db/version.rb

@@ -3,7 +3,7 @@ module Restforce
   # :nodoc:
   module DB
 
-    VERSION = "1.3.0"
+    VERSION = "2.0.0"
 
   end
 

data/lib/restforce/db.rb

@@ -32,6 +32,7 @@ require "restforce/db/runner_cache"
 require "restforce/db/runner"
 
 require "restforce/db/accumulator"
+require "restforce/db/adapter"
 require "restforce/db/associator"
 require "restforce/db/attribute_map"
 require "restforce/db/cleaner"

data/restforce-db.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "daemons"
   spec.add_dependency "restforce"
 
-  spec.add_development_dependency "bundler", "~> 1.8"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "minitest", "5.5.1"
   spec.add_development_dependency "minitest-spec-expect"

data/test/lib/restforce/db/accumulator_test.rb

@@ -65,22 +65,19 @@ describe Restforce::DB::Accumulator do
     end
   end
 
-  describe "#diff" do
+  describe "#current" do
     let(:attributes) { { wocket: "Pocket", jertain: "Curtain", zelf: "Shelf" } }
 
     before do
       accumulator.store(Time.now, attributes)
     end
 
-    it "returns the differences from the attributes hash" do
-      expect(accumulator.diff(wocket: "Locket", zelf: "Belfrey")).to_equal(
-        wocket: "Pocket",
+    it "returns the current values for all attributes in the passed hash" do
+      expect(accumulator.current(wocket: "Locket")).to_equal(wocket: "Pocket")
+      expect(accumulator.current(jertain: "Curtain", zelf: "Belfrey")).to_equal(
+        jertain: "Curtain",
         zelf: "Shelf",
       )
     end
-
-    it "ignores attributes not set in the Accumulator" do
-      expect(accumulator.diff(yottle: "Bottle")).to_be :empty?
-    end
   end
 end

data/test/lib/restforce/db/adapter_test.rb

@@ -0,0 +1,29 @@
+require_relative "../../../test_helper"
+
+describe Restforce::DB::Adapter do
+
+  configure!
+
+  let(:adapter) { Restforce::DB::Adapter.new }
+  let(:attributes) { { where: "Here", when: Time.now } }
+
+  describe "#to_database" do
+    let(:results) { adapter.to_database(attributes) }
+
+    it "returns the passed attributes, unchanged" do
+      expect(results).to_equal attributes
+    end
+  end
+
+  describe "#from_database" do
+    let(:results) { adapter.from_database(attributes) }
+
+    it "converts times to ISO-8601 timestamps" do
+      expect(results[:when]).to_equal attributes[:when].utc.iso8601
+    end
+
+    it "leaves other attributes unchanged" do
+      expect(results[:where]).to_equal attributes[:where]
+    end
+  end
+end

data/test/lib/restforce/db/attribute_map_test.rb

@@ -12,8 +12,8 @@ describe Restforce::DB::AttributeMap do
       column_two: "SF_Field_Two__c",
     }
   end
-  let(:conversions) { {} }
-  let(:attribute_map) { Restforce::DB::AttributeMap.new(database_model, salesforce_model, fields, conversions) }
+  let(:adapter) { Restforce::DB::Adapter.new }
+  let(:attribute_map) { Restforce::DB::AttributeMap.new(database_model, salesforce_model, fields, adapter) }
 
   describe "#attributes" do
     let(:mapping) do
@@ -28,7 +28,7 @@ describe Restforce::DB::AttributeMap do
         attribute
       end
 
-      expect(attributes.keys).to_equal(mapping.database_fields)
+      expect(attributes.keys).to_equal(mapping.salesforce_fields)
       expect(attributes.values).to_equal(mapping.database_fields)
     end
 
@@ -38,82 +38,32 @@ describe Restforce::DB::AttributeMap do
         attribute
       end
 
-      expect(attributes.keys).to_equal(mapping.database_fields)
+      expect(attributes.keys).to_equal(mapping.salesforce_fields)
       expect(attributes.values).to_equal(mapping.salesforce_fields)
     end
-
-    describe "when an adapter has been defined for an attribute" do
-      let(:conversions) { { column_one: boolean_adapter } }
-
-      it "uses the adapter to convert the value returned by the block" do
-        attributes = attribute_map.attributes(salesforce_model) { |_| "Yes" }
-        expect(attributes).to_equal(
-          column_one: true,
-          column_two: "Yes",
-        )
-      end
-    end
   end
 
   describe "#convert" do
-    let(:attributes) { { column_one: "some value" } }
+    let(:attributes) { { "SF_Field_One__c" => "some value" } }
 
     it "converts an attribute Hash to a Salesforce-compatible form" do
-      expect(attribute_map.convert(salesforce_model, attributes)).to_equal(
-        fields[attributes.keys.first] => attributes.values.first,
-      )
-    end
-
-    it "performs no special conversion for database columns" do
-      expect(attribute_map.convert(database_model, attributes)).to_equal(attributes)
-    end
-
-    describe "when one of the attributes is a Date or Time" do
-      let(:timestamp) { Time.now }
-      let(:attributes) { { column_one: timestamp } }
-
-      it "converts the attribute to an ISO-8601 string for Salesforce" do
-        expect(attribute_map.convert(salesforce_model, attributes)).to_equal(
-          fields[attributes.keys.first] => timestamp.iso8601,
-        )
-      end
+      expect(attribute_map.convert(salesforce_model, attributes)).to_equal(attributes)
     end
 
-    describe "when an adapter has been defined for an attribute" do
-      let(:conversions) { { column_one: boolean_adapter } }
-
-      it "uses the adapter to convert that attribute to a Salesforce-compatible form" do
-        expect(attribute_map.convert(salesforce_model, column_one: true)).to_equal(
-          "SF_Field_One__c" => "Yes",
-        )
-        expect(attribute_map.convert(salesforce_model, column_one: false)).to_equal(
-          "SF_Field_One__c" => "No",
-        )
-      end
-    end
-  end
-
-  describe "#convert_from_salesforce" do
-    let(:attributes) { { "SF_Field_One__c" => "some value" } }
-
     it "converts an attribute Hash to a database-compatible form" do
-      expect(attribute_map.convert_from_salesforce(database_model, attributes)).to_equal(
+      expect(attribute_map.convert(database_model, attributes)).to_equal(
         fields.key(attributes.keys.first) => attributes.values.first,
       )
     end
 
-    it "performs no special conversion for Salesforce fields" do
-      expect(attribute_map.convert_from_salesforce(salesforce_model, attributes)).to_equal(attributes)
-    end
-
-    describe "when an adapter has been defined for an attribute" do
-      let(:conversions) { { column_one: boolean_adapter } }
+    describe "when an adapter has been specified" do
+      let(:adapter) { boolean_adapter }
 
-      it "uses the adapter to convert that attribute to a database-compatible form" do
-        expect(attribute_map.convert_from_salesforce(database_model, "SF_Field_One__c" => "Yes")).to_equal(
+      it "uses the adapter to convert attributes to a database-compatible form" do
+        expect(attribute_map.convert(database_model, "SF_Field_One__c" => "Yes")).to_equal(
           column_one: true,
         )
-        expect(attribute_map.convert_from_salesforce(database_model, "SF_Field_One__c" => "No")).to_equal(
+        expect(attribute_map.convert(database_model, "SF_Field_One__c" => "No")).to_equal(
           column_one: false,
         )
       end

data/test/lib/restforce/db/dsl_test.rb

@@ -99,20 +99,19 @@ describe Restforce::DB::DSL do
     end
   end
 
-  describe "#converts" do
+  describe "#converts_with" do
     let(:adapter) { boolean_adapter }
-    let(:conversions) { { some: adapter } }
 
     it "sets the conversions for the created mapping" do
-      dsl.converts conversions
-      expect(mapping.conversions).to_equal conversions
+      dsl.converts_with adapter
+      expect(mapping.adapter).to_equal adapter
     end
 
     describe "when the adapter does not define the expected methods" do
       let(:adapter) { Object.new }
 
       it "raises an ArgumentError" do
-        expect(-> { dsl.converts conversions }).to_raise ArgumentError
+        expect(-> { dsl.converts_with adapter }).to_raise ArgumentError
       end
     end
   end

data/test/lib/restforce/db/record_types/active_record_test.rb

@@ -11,8 +11,8 @@ describe Restforce::DB::RecordTypes::ActiveRecord do
   describe "#create!" do
     let(:attributes) do
       {
-        name:    "Some name",
-        example: "Some text",
+        "Name"             => "Some name",
+        "Example_Field__c" => "Some text",
       }
     end
     let(:record) { nil }
@@ -32,8 +32,8 @@ describe Restforce::DB::RecordTypes::ActiveRecord do
 
     it "creates a record in the database from the passed Salesforce record's attributes" do
       expect(instance.salesforce_id).to_equal salesforce_id
-      expect(instance.name).to_equal attributes[:name]
-      expect(instance.example).to_equal attributes[:example]
+      expect(instance.name).to_equal attributes["Name"]
+      expect(instance.example).to_equal attributes["Example_Field__c"]
       expect(instance.synchronized_at).to_not_be_nil
     end
 
@@ -64,7 +64,7 @@ describe Restforce::DB::RecordTypes::ActiveRecord do
             id,
             Time.now,
             Restforce::DB::Registry[User].first,
-            email: "somebody@example.com",
+            "Email" => "somebody@example.com",
           )
         end
       end

data/test/lib/restforce/db/synchronizer_test.rb

@@ -10,20 +10,15 @@ describe Restforce::DB::Synchronizer do
   describe "#run", vcr: { match_requests_on: [:method, VCR.request_matchers.uri_without_param(:q)] } do
     let(:attributes) do
       {
-        name:    "Custom object",
-        example: "Some sample text",
+        "Name"             => "Custom object",
+        "Example_Field__c" => "Some sample text",
       }
     end
-    let(:salesforce_id) do
-      Salesforce.create!(
-        salesforce_model,
-        mapping.convert(salesforce_model, attributes),
-      )
-    end
+    let(:salesforce_id) { Salesforce.create!(salesforce_model, attributes) }
     let(:changes) { { [salesforce_id, salesforce_model] => accumulator } }
     let(:new_attributes) do
       {
-        "Name" => "Some new name",
+        "Name"             => "Some new name",
         "Example_Field__c" => "New sample text",
       }
     end

data/test/support/utilities.rb

@@ -31,12 +31,16 @@ end
 def boolean_adapter
   Object.new.tap do |object|
 
-    def object.to_database(value)
-      value == "Yes"
+    def object.to_database(attributes)
+      attributes.each_with_object({}) do |(k, v), final|
+        final[k] = (v == "Yes")
+      end
     end
 
-    def object.to_salesforce(value)
-      value ? "Yes" : "No"
+    def object.from_database(attributes)
+      attributes.each_with_object({}) do |(k, v), final|
+        final[k] = v ? "Yes" : "No"
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restforce-db
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- circle.yml
 - lib/file_daemon.rb
 - lib/generators/restforce/install_generator.rb
 - lib/generators/restforce/migration_generator.rb
@@ -208,6 +209,7 @@ files:
 - lib/generators/templates/script
 - lib/restforce/db.rb
 - lib/restforce/db/accumulator.rb
+- lib/restforce/db/adapter.rb
 - lib/restforce/db/association_cache.rb
 - lib/restforce/db/associations/base.rb
 - lib/restforce/db/associations/belongs_to.rb
@@ -302,6 +304,7 @@ files:
 - test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_an_associated_database_record/updates_the_salesforce_record.yml
 - test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_no_associated_database_record/does_nothing_for_this_specific_mapping.yml
 - test/lib/restforce/db/accumulator_test.rb
+- test/lib/restforce/db/adapter_test.rb
 - test/lib/restforce/db/association_cache_test.rb
 - test/lib/restforce/db/associations/belongs_to_test.rb
 - test/lib/restforce/db/associations/has_many_test.rb