active_force 0.7.0 → 0.15.0

data/spec/active_force/sobject_spec.rb

@@ -5,7 +5,7 @@ describe ActiveForce::SObject do
   let(:client) { double 'Client' }
 
   before do
-    allow(ActiveForce::SObject).to receive(:sfdc_client).and_return client
+    ActiveForce.sfdc_client = client
   end
 
   describe ".new" do
@@ -25,10 +25,10 @@ describe ActiveForce::SObject do
       expect(sobject.boolean).to be_an_instance_of TrueClass
       expect(sobject.checkbox).to be_an_instance_of FalseClass
       expect(sobject.date).to be_an_instance_of Date
-      expect(sobject.datetime).to be_an_instance_of DateTime
+      expect(sobject.datetime).to be_an_instance_of Time
       expect(sobject.percent).to be_an_instance_of Float
       expect(sobject.text).to be_an_instance_of String
-      expect(sobject.picklist_multiselect).to be_an_instance_of String
+      expect(sobject.picklist_multiselect).to be_an_instance_of Array
     end
   end
 
@@ -65,15 +65,60 @@ describe ActiveForce::SObject do
       end
     end
 
-    context 'as: :multi_picklist' do
+    describe 'having a default value' do
+      subject { Bangwhiz }
+
+      context 'when using the default value' do
+        let(:instantiation_attributes) { {name: 'some name'} }
+        let(:percent) { 50.0 }
+
+        it 'sends percent to salesforce' do
+          expect(client).to receive(:create!)
+                        .with(anything, hash_including('Percent_Label' => percent))
+          subject.create(**instantiation_attributes)
+        end
+
+        it 'sets percent field upon object instantiation' do
+          expect(subject.new(**instantiation_attributes)[:percent]).to eq(percent)
+        end
+      end
+
+      context 'when overriding a default value' do
+        let(:instantiation_attributes) { {name: 'some name', percent: percent} }
+        let(:percent) { 25.0 }
+
+        it 'sends percent to salesforce' do
+          expect(client).to receive(:create!)
+                        .with(anything, hash_including('Percent_Label' => percent))
+          subject.create(**instantiation_attributes)
+        end
+
+        it 'sets percent field upon object instantiation' do
+          expect(subject.new(**instantiation_attributes)[:percent]).to eq(percent)
+        end
+      end
+    end
+
+    context 'as: :multipicklist' do
       before do
         class IceCream < ActiveForce::SObject
-          field :flavors, as: :multi_picklist
+          field :flavors, as: :multipicklist
         end
-        sundae.changed_attributes.clear
+        sundae.clear_changes_information
         sundae.flavors = %w(chocolate vanilla strawberry)
       end
 
+      context 'mutation of multipicklist' do
+        let(:sundae) { IceCream.new }
+
+        before { sundae.clear_changes_information }
+
+        it 'detects mutation' do
+          sundae.flavors.delete('chocolate')
+          expect(sundae.flavors_changed?).to be true
+        end
+      end
+
       context 'on create' do
         let(:sundae) { IceCream.new }
         it 'formats the picklist values' do
@@ -93,6 +138,25 @@ describe ActiveForce::SObject do
     end
   end
 
+  describe '.describe' do
+    subject { Whizbang.describe }
+
+    let(:describe_response) { { 'fields' => [] } }
+
+    before do
+      allow(client).to receive(:describe).and_return(describe_response)
+    end
+
+    it 'passes table_name to sfdc_client.describe' do
+      subject
+      expect(client).to have_received(:describe).with(Whizbang.table_name)
+    end
+
+    it 'returns response from describe' do
+      expect(subject).to eq(describe_response)
+    end
+  end
+
   describe "CRUD" do
     let(:instance){ Whizbang.new(id: '1') }
 
@@ -140,12 +204,12 @@ describe ActiveForce::SObject do
         end
 
         describe 'and with a ClientError' do
-          let(:faraday_error){ Faraday::Error::ClientError.new('Some String') }
+          let(:faraday_error){ Faraday::ClientError.new('Some String') }
 
           before{ expect(client).to receive(:update!).and_raise(faraday_error) }
 
           it 'raises an error' do
-            expect{ instance.update!( text: 'some text', boolean: false ) }.to raise_error(Faraday::Error::ClientError)
+            expect{ instance.update!( text: 'some text', boolean: false ) }.to raise_error(Faraday::ClientError)
           end
         end
       end
@@ -198,12 +262,12 @@ describe ActiveForce::SObject do
         end
 
         describe 'and with a ClientError' do
-          let(:faraday_error){ Faraday::Error::ClientError.new('Some String') }
+          let(:faraday_error){ Faraday::ClientError.new('Some String') }
 
           before{ expect(client).to receive(:create!).and_raise(faraday_error) }
 
           it 'raises an error' do
-            expect{ instance.create! }.to raise_error(Faraday::Error::ClientError)
+            expect{ instance.create! }.to raise_error(Faraday::ClientError)
           end
         end
       end
@@ -226,7 +290,9 @@ describe ActiveForce::SObject do
 
     describe 'self.create' do
       before do
-        expect(client).to receive(:create!).with(Whizbang.table_name, 'Text_Label' => 'some text', 'Updated_From__c'=>'Rails').and_return('id')
+        expect(client).to receive(:create!)
+          .with(Whizbang.table_name, { 'Text_Label' => 'some text', 'Updated_From__c' => 'Rails' })
+          .and_return('id')
       end
 
       it 'should create a new instance' do
@@ -256,6 +322,103 @@ describe ActiveForce::SObject do
     end
   end
 
+  describe "#find_by!" do
+    it "queries the client, with the SFDC field names and correctly enclosed values" do
+      expect(client).to receive(:query).with("SELECT #{Whizbang.fields.join ', '} FROM Whizbang__c WHERE (Id = 123) AND (Text_Label = 'foo') LIMIT 1").and_return([Restforce::Mash.new(Id: 123, text: 'foo')])
+      Whizbang.find_by! id: 123, text: "foo"
+    end
+    it "raises if nothing found" do
+      expect(client).to receive(:query).with("SELECT #{Whizbang.fields.join ', '} FROM Whizbang__c WHERE (Id = 123) AND (Text_Label = 'foo') LIMIT 1")
+      expect { Whizbang.find_by! id: 123, text: "foo" }.to raise_error(ActiveForce::RecordNotFound)
+    end
+  end
+
+  describe '.find!' do
+    let(:id) { 'abc123' }
+
+    before do
+      allow(client).to receive(:query)
+    end
+
+    it 'returns found record' do
+      query = "SELECT #{Whizbang.fields.join ', '} FROM Whizbang__c WHERE (Id = '#{id}') LIMIT 1"
+      expected = Restforce::Mash.new(Id: id)
+      allow(client).to receive(:query).with(query).and_return([expected])
+      actual = Whizbang.find!(id)
+      expect(actual.id).to eq(expected.Id)
+    end
+
+    it 'raises RecordNotFound if nothing found' do
+      expect { Whizbang.find!(id) }
+        .to raise_error(ActiveForce::RecordNotFound, "Couldn't find #{Whizbang.table_name} with id #{id}")
+    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')])
@@ -264,7 +427,7 @@ describe ActiveForce::SObject do
     let(:territory){ Territory.new(id: '1', quota_id: '1') }
 
     before do
-      allow(ActiveForce::SObject).to receive(:sfdc_client).and_return client
+      ActiveForce.sfdc_client = client
     end
 
     it 'clears cached associations' do
@@ -314,7 +477,7 @@ describe ActiveForce::SObject do
     let(:instance){ Whizbang.new }
 
     before do
-      allow(instance).to receive(:create!).and_raise(Faraday::Error::ClientError.new(double))
+      allow(instance).to receive(:create!).and_raise(Faraday::ClientError.new(double))
     end
 
     it 'catches and logs the error' do
@@ -323,6 +486,22 @@ describe ActiveForce::SObject do
     end
   end
 
+  describe 'to_json' do
+    let(:instance) { Whizbang.new }
+
+    it 'responds to' do
+      expect(instance).to respond_to(:to_json)
+    end
+  end
+
+  describe 'as_json' do
+    let(:instance) { Whizbang.new }
+
+    it 'responds to' do
+      expect(instance).to respond_to(:as_json)
+    end
+  end
+
   describe ".save!" do
     let(:instance){ Whizbang.new }
 
@@ -335,12 +514,12 @@ describe ActiveForce::SObject do
       end
 
       describe 'and with a ClientError' do
-        let(:faraday_error){ Faraday::Error::ClientError.new('Some String') }
+        let(:faraday_error){ Faraday::ClientError.new('Some String') }
 
         before{ expect(client).to receive(:create!).and_raise(faraday_error) }
 
         it 'raises an error' do
-          expect{ instance.save! }.to raise_error(Faraday::Error::ClientError)
+          expect{ instance.save! }.to raise_error(Faraday::ClientError)
         end
       end
     end
@@ -354,6 +533,34 @@ describe ActiveForce::SObject do
     end
   end
 
+  describe '#[]' do
+    let(:sobject){ Whizbang.build sobject_hash }
+
+    it 'allows accessing the attribute values as if the Sobject were a Hash' do
+      expect(sobject[:boolean]).to eq sobject.boolean
+      expect(sobject[:checkbox]).to eq sobject.checkbox
+      expect(sobject[:date]).to eq sobject.date
+      expect(sobject[:datetime]).to eq sobject.datetime
+      expect(sobject[:percent]).to eq sobject.percent
+      expect(sobject[:text]).to eq sobject.text
+      expect(sobject[:picklist_multiselect]).to eq sobject.picklist_multiselect
+    end
+  end
+
+  describe '#[]=' do
+    let(:sobject){ Whizbang.new }
+
+    it 'allows modifying the attribute values as if the Sobject were a Hash' do
+      expect(sobject[:boolean]=false).to eq sobject.boolean
+      expect(sobject[:checkbox]=true).to eq sobject.checkbox
+      expect(sobject[:datetime]=Time.now).to eq sobject.datetime
+      expect(sobject[:percent]=50).to eq sobject.percent
+      expect(sobject[:text]='foo-bar').to eq sobject.text
+      sobject[:picklist_multiselect]='a;b'
+      expect(sobject.picklist_multiselect).to eq ['a', 'b']
+    end
+  end
+
   describe ".save" do
     let(:instance){ Whizbang.new }
 
@@ -366,7 +573,7 @@ describe ActiveForce::SObject do
       end
 
       describe 'and with a ClientError' do
-        let(:faraday_error){ Faraday::Error::ClientError.new('Some String') }
+        let(:faraday_error){ Faraday::ClientError.new('Some String') }
         before{ expect(client).to receive(:create!).and_raise(faraday_error) }
         it 'returns false' do
           expect(instance.save).to eq(false)

data/spec/fixtures/sobject/single_sobject_hash.yml

@@ -6,7 +6,7 @@ Text_Label: 'Hi there!'
 Date_Label: '2010-01-01'
 DateTime_Label: '2011-07-07T00:37:00.000+0000'
 Picklist_Multiselect_Label: 'four;six'
-Percent_Label: 20
+Percent_Label: 21
 Boolean_Label: true
 
 ParentWhizbang__r:

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/vendor'
+  add_filter '/spec'
+end
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'active_force'

data/spec/support/bangwhiz.rb

@@ -0,0 +1,7 @@
+class Bangwhiz < ActiveForce::SObject
+
+  field :id,                   from: 'Id'
+  field :name,                 from: 'Name'
+  field :percent,              from: 'Percent_Label',  as: :percent, default: -> { 50.0 }
+
+end

data/spec/support/restforce_factories.rb

@@ -1,5 +1,5 @@
 module RestforceFactories
-  def build_restforce_collection(array)
+  def build_restforce_collection(array=[])
     Restforce::Collection.new({ 'records' => array }, nil)
   end
 

data/spec/support/sobjects.rb

@@ -15,6 +15,8 @@ class Post < ActiveForce::SObject
   has_many :reply_comments, model: Comment, scoped_as: ->(post){ where(body: "RE: #{post.title}").order('CreationDate DESC') }
   has_many :ugly_comments, { model: Comment }
   has_many :poster_comments, { foreign_key: :poster_id, model: Comment }
+  has_one :last_comment, model: Comment, scoped_as: -> { where.not(body: nil).order('CreatedDate DESC') }
+  has_one :repeat_comment, model: Comment, scoped_as: ->(post) { where(body: post.title) }
 end
 class Territory < ActiveForce::SObject
   field :quota_id, from: "Quota__c"
@@ -47,6 +49,17 @@ class EnforcedTableName < ActiveForce::SObject
   self.table_name = 'Forced__c'
 end
 
+class HasOneChild < ActiveForce::SObject
+  field :has_one_parent_id, from: 'has_one_parent_id__c'
+  field :fancy_parent_id, from: 'FancyParentId'
+  belongs_to :has_one_parent, foreign_key: :has_one_parent_id
+end
+
+class HasOneParent < ActiveForce::SObject
+  field :comment
+  has_one :has_one_child, model: HasOneChild
+end
+
 module Foo
   class Bar < ActiveForce::SObject; end
   class Opportunity < ActiveForce::SObject
@@ -57,7 +70,10 @@ module Foo
     has_many :opportunities, model: Foo::Opportunity
     has_many :partner_opportunities, foreign_key: :partner_account_id, model: Foo::Opportunity
   end
-  class Lead < ActiveForce::SObject; end
+  class Lead < ActiveForce::SObject
+    has_one :attachment, model: 'Foo::Attachment'
+    has_one :fancy_attachment, model: 'Foo::Attachment', foreign_key: :fancy_lead_id
+  end
   class Attachment < ActiveForce::SObject
     field :lead_id, from: 'Lead_Id__c'
     field :fancy_lead_id, from: 'LeadId'

data/spec/support/whizbang.rb

@@ -9,7 +9,7 @@ class Whizbang < ActiveForce::SObject
   field :boolean,              from: 'Boolean_Label',  as: :boolean
   field :percent,              from: 'Percent_Label',  as: :percent
   field :estimated_close_date, as: :datetime
-  field :updated_from,         as: :datetime
+  field :updated_from,         as: :string
   field :dirty_attribute,      as: :boolean
 
   before_save :set_as_updated_from_rails
@@ -27,4 +27,4 @@ class Whizbang < ActiveForce::SObject
     self.dirty_attribute = true
   end
 
-end
+end

metadata

@@ -1,60 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: active_force
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Eloy Espinaco
 - Pablo Oldani
 - Armando Andini
 - José Piccioni
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: active_attr
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: restforce
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: restforce
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -97,22 +111,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use SalesForce as an ActiveModel
 email: eloyesp@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
+- ".mailmap"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
+- CODEOWNERS
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - active_force.gemspec
-- lib/active_attr/dirty.rb
 - lib/active_force.rb
 - lib/active_force/active_query.rb
 - lib/active_force/association.rb
@@ -120,22 +152,25 @@ files:
 - lib/active_force/association/belongs_to_association.rb
 - lib/active_force/association/eager_load_projection_builder.rb
 - lib/active_force/association/has_many_association.rb
+- lib/active_force/association/has_one_association.rb
 - lib/active_force/association/relation_model_builder.rb
-- lib/active_force/attribute.rb
+- lib/active_force/field.rb
 - lib/active_force/mapping.rb
 - lib/active_force/query.rb
 - lib/active_force/sobject.rb
 - lib/active_force/standard_types.rb
 - lib/active_force/table.rb
 - lib/active_force/version.rb
+- lib/active_model/type/salesforce/multipicklist.rb
+- lib/active_model/type/salesforce/percent.rb
 - lib/generators/active_force/model/USAGE
 - lib/generators/active_force/model/model_generator.rb
 - lib/generators/active_force/model/templates/model.rb.erb
 - spec/active_force/active_query_spec.rb
 - spec/active_force/association/relation_model_builder_spec.rb
 - spec/active_force/association_spec.rb
-- spec/active_force/attribute_spec.rb
 - spec/active_force/callbacks_spec.rb
+- spec/active_force/field_spec.rb
 - spec/active_force/mapping_spec.rb
 - spec/active_force/query_spec.rb
 - spec/active_force/sobject/includes_spec.rb
@@ -145,15 +180,19 @@ files:
 - spec/active_force_spec.rb
 - spec/fixtures/sobject/single_sobject_hash.yml
 - spec/spec_helper.rb
+- spec/support/bangwhiz.rb
 - spec/support/fixture_helpers.rb
 - spec/support/restforce_factories.rb
 - spec/support/sobjects.rb
 - spec/support/whizbang.rb
-homepage: https://github.com/ionia-corporation/active_force
+homepage: https://github.com/Beyond-Finance/active_force#readme
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/Beyond-Finance/active_force/issues
+  changelog_uri: https://github.com/Beyond-Finance/active_force/blob/main/CHANGELOG.md
+  source_code_uri: https://github.com/Beyond-Finance/active_force
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,17 +207,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: Help you implement models persisting on Sales Force within Rails using RESTForce
 test_files:
 - spec/active_force/active_query_spec.rb
 - spec/active_force/association/relation_model_builder_spec.rb
 - spec/active_force/association_spec.rb
-- spec/active_force/attribute_spec.rb
 - spec/active_force/callbacks_spec.rb
+- spec/active_force/field_spec.rb
 - spec/active_force/mapping_spec.rb
 - spec/active_force/query_spec.rb
 - spec/active_force/sobject/includes_spec.rb
@@ -188,6 +226,7 @@ test_files:
 - spec/active_force_spec.rb
 - spec/fixtures/sobject/single_sobject_hash.yml
 - spec/spec_helper.rb
+- spec/support/bangwhiz.rb
 - spec/support/fixture_helpers.rb
 - spec/support/restforce_factories.rb
 - spec/support/sobjects.rb

data/lib/active_attr/dirty.rb

@@ -1,24 +0,0 @@
-require 'active_support'
-require 'active_model/dirty'
-require 'active_attr'
-
-module ActiveAttr
-  module Dirty
-    extend ActiveSupport::Concern
-    include ActiveModel::Dirty
-
-    module ClassMethods
-      def attribute!(name, options={})
-        super(name, options)
-        define_method("#{name}=") do |value|
-          send("#{name}_will_change!") unless value == read_attribute(name)
-          super(value)
-        end
-      end
-    end
-
-    def attributes_and_changes
-      attributes.select{ |attr, key| changed.include? attr }
-    end
-  end
-end