active_force 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db05b88b32eacda2b94f3dcbc47a72288b1f4e4
-  data.tar.gz: 4c57fa4fa03fcb50d8378854b99377d6403206e2
+  metadata.gz: 5fc8bc2425de35aa52c303eb28a9165a2601c5f5
+  data.tar.gz: b397002aa1906d23b92d4d20ff08745d349c6cb4
 SHA512:
-  metadata.gz: 7629ee051094c5e4dbe73ee6c3c06fb31bbb1fa9cf5aea5705f661d5201dffa8eb9cc6d5fcc263e7ea90084f4bf30731749d206f2a8996a9c356cd876e4415ba
-  data.tar.gz: 21db5698eb4a8f6db16041cc70cd32a8d24520dc1655c7c6eb6bb3d2d1fa7d3b5e44c99e5ffbe93860c9bff2a19872edd5ceff8a20cdb8ee9d1512d103133223
+  metadata.gz: ef355901a29bd4ff95bf593400f3a52e32e53cd4bec886b5d057984a31092f832b0ce0cf4608462f6379652ad91120d4437100177d4f3912e0051a85abbfa9fb
+  data.tar.gz: 8ce4758557b84eef8662c8f53ff3e301ecdc077d1f824ef2850cb17636d6dde5cab9ed564ca57d3b02ed9a600a188b6e133ebb6eefa8f536803d3a767abcf672

data/CHANGELOG.md

@@ -1,11 +1,70 @@
-# 0.0.7.alfa #
+# Changelog
 
-* Use simpler error messages.
-* Implement .all and .create methods (copying ActiveRecord Interface)
-* Add SObject.all method.
-* Add basic support for multi-picklists.
+## Not released
 
-# 0.0.6.alfa #
+## 0.5.0
+
+* Provide a default id field for all SObject subclassees ([Dan Olson][], [#30][])
+* Fix Ruby 2.0 compatibility issue ([Dan Olson][], [Pablo Oldani][], [#28][])
+* Normalize rspec syntax to remove deprecation warnings ([Dan Olson][], [#26][])
+* Remove namespace when inferring default SObject.table_name ([Dan Olson][], [#24][])
+* Add create! and save! methods. ([Pablo Oldani][], [#21][])
+* Refactor update and create methods. ([Pablo Oldani][], [#21][])
+* Add a generator. ([José Piccioni][], [#19][])
+* ActiveQuery now provides :each, :map and :inspect. ([Armando Andini][])
+* Add SObject.create class mehtod. ([Pablo Oldani][], [#10][])
+* SObject.field default mapping value follows SFDC API naming convention.
+  ([Dan Olson][], [#14][] [#15][])
+
+## 0.4.2
+
+* Use ActiveQuery instead of Query. ([Armando Andini][])
+* Add instructions to use validations ([José Piccioni][])
+* Lots of refactoring.
+
+## 0.3.2
+
+* Fixed gemspec.
+
+## 0.3.1
+
+* Create different classes for associations. ([#4][])
+* Big refactor on has_many association. ([Armando Andini][])
+* Add a lot of specs and refactors. ([Armando Andini][])
+* Add a Finders module. ([Armando Andini][])
+* Add fist and last method to SObject.
+
+## 0.2.0
+
+* Add belogns_to and has_many associations.
+* Changed when the SOQL query is sent to the client.
+* Add join method to query to use associtations.
+
+## 0.1.0
+
+* Add query builder object to chain conditions.
+* Update update and create methods.
+* Add Campaing standard table name.
+
+## 0.0.6.alfa
 
 * ActiveForce::SObject#table_name is auto populated using the class
   name. It adds "__c" to all non standard types.
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+
+[#4]: https://github.com/ionia-corporation/active_force/issues/4
+[#9]: https://github.com/ionia-corporation/active_force/issues/9
+[#10]: https://github.com/ionia-corporation/active_force/issues/10
+[#14]: https://github.com/ionia-corporation/active_force/issues/14
+[#15]: https://github.com/ionia-corporation/active_force/issues/15
+[#19]: https://github.com/ionia-corporation/active_force/issues/19
+[#21]: https://github.com/ionia-corporation/active_force/issues/21
+[#24]: https://github.com/ionia-corporation/active_force/issues/24
+[#26]: https://github.com/ionia-corporation/active_force/issues/26
+[#28]: https://github.com/ionia-corporation/active_force/issues/28
+[#30]: https://github.com/ionia-corporation/active_force/issues/30
+[Pablo Oldani]: https://github.com/olvap
+[Armando Andini]: https://github.com/antico5
+[José Piccioni]: https://github.com/lmhsjackson
+[Dan Olson]: https://github.com/DanOlson

data/README.md

@@ -7,8 +7,11 @@
 
 # ActiveForce
 
-A ruby gem to interact with SalesForce as if it were Active Record. It
-uses Restforce to interact with the API, so it is fast and stable.
+A ruby gem to interact with [SalesForce][1] as if it were Active Record. It
+uses [Restforce][2] to interact with the API, so it is fast and stable.
+
+ [1]: http://www.salesforce.com
+ [2]: https://github.com/ejholmes/restforce
 
 ## Installation
 
@@ -43,17 +46,19 @@ end
 ```
 
 ### Add Attributes
+
 ```ruby
 class Page < ActiveForce::SObject
   #field, :attribute_name, from: 'Name_In_Salesforce_Database'
   field :id,                from: 'Id'
   field :name,              from: 'Medication__c'
-  self.fields     = mappings.values
   #set SalesForce table name.
   self.table_name = 'Patient_Medication__c'
 end
 ```
+
 ### Validations
+
 You can use any validation that active record has (except for validates_associated), just by adding them to your class:
 
 ```ruby
@@ -96,6 +101,7 @@ end
 ```
 
 #### Belongs to
+
 ```ruby
 class Account < ActiveForce::SObject
 end
@@ -112,4 +118,6 @@ end
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request so we can talk about it.
+6. Once accepted, please add an entry in the CHANGELOG and rebase your changes
+   to squash typos or corrections.

data/lib/active_force/active_query.rb

@@ -1,11 +1,14 @@
 require 'active_force/query'
+require 'forwardable'
 
 module ActiveForce
   class ActiveQuery < Query
+    extend Forwardable
 
     attr_reader :sobject
 
-    delegate :sfdc_client, :build, :table_name, :mappings, to: :sobject
+    def_delegators :sobject, :sfdc_client, :build, :table_name, :mappings
+    def_delegators :to_a, :each, :map, :inspect
 
     def initialize sobject
       @sobject = sobject
@@ -14,20 +17,16 @@ module ActiveForce
     end
 
     def to_a
-      result.to_a.map do |mash|
-        build mash
-      end
+      result.to_a.map { |mash| build mash }
     end
 
+    alias_method :all, :to_a
+
     def count
       super
       sfdc_client.query(to_s).first.expr0
     end
 
-    def all
-      to_a
-    end
-
     def limit limit
       super
       limit == 1 ? to_a.first : self

data/lib/active_force/association/association.rb

@@ -15,15 +15,16 @@ module ActiveForce
         @options[:model] || @relation_name.to_s.singularize.camelcase.constantize
       end
 
+      def foreign_key
+        @options[:foreign_key] || default_foreign_key
+      end
+
       private
 
       def build
         define_relation_method
       end
 
-      def default_sfdc_foreign_key
-        relation_model.mappings["#{ @parent.name.downcase }_id".to_sym]
-      end
     end
 
   end

data/lib/active_force/association/belongs_to_association.rb

@@ -3,16 +3,16 @@ module ActiveForce
 
     class BelongsToAssociation < Association
 
-      def foreign_key
-        options[:foreign_key] || "#{ @relation_name }_id".to_sym
-      end
-
       private
 
+      def default_foreign_key
+        "#{ relation_model.name.downcase }_id".to_sym
+      end
+
       def define_relation_method
         association = self
         @parent.send :define_method, @relation_name do
-          association.relation_model.find(self.send association.foreign_key)
+          association.relation_model.find(send association.foreign_key)
         end
       end
     end

data/lib/active_force/association/has_many_association.rb

@@ -2,18 +2,18 @@ module ActiveForce
   module Association
     class HasManyAssociation < Association
 
-      def foreign_key
-        @options[:foreign_key] || default_sfdc_foreign_key || @parent.table_name
-      end
-
       private
 
+      def default_foreign_key
+        "#{ @parent.name.downcase }_id".to_sym
+      end
+
       def define_relation_method
         association = self
         @parent.send :define_method, @relation_name do
           query = association.relation_model.query
           query.options association.options
-          query.where "#{ association.foreign_key } = '#{ self.id }'"
+          query.where association.foreign_key => self.id
         end
       end
     end

data/lib/active_force/sobject.rb

@@ -4,25 +4,59 @@ require 'active_attr/dirty'
 require 'active_force/active_query'
 require 'active_force/association'
 require 'yaml'
+require 'forwardable'
+require 'logger'
+
 
 module ActiveForce
   class SObject
     include ActiveAttr::Model
     include ActiveAttr::Dirty
     include ActiveForce::Association
-
     STANDARD_TYPES = %w[ Account Contact Opportunity Campaign]
 
-    class_attribute :mappings, :fields, :table_name
+    class_attribute :mappings, :table_name
 
     class << self
-      delegate :where, :first, :last, :all, :find, :find_by, :count, :to => :query
+      extend Forwardable
+      def_delegators :query, :where, :first, :last, :all, :find, :find_by, :count
+
+      private
+
+      ###
+      # Transforms +attribute+ to the conventional Salesforce API name.
+      #
+      # Example:
+      #   > default_api_name :some_attribute
+      #   => "Some_Attribute__c"
+      def default_api_name(attribute)
+        String(attribute).split('_').map(&:capitalize).join('_') << '__c'
+      end
+
+      def custom_table_name
+        self.name if STANDARD_TYPES.include? self.name
+      end
+
+      ###
+      # Provide each subclass with a default id field. Can be overridden
+      # in the subclass if needed
+      def inherited(subclass)
+        subclass.field :id, from: 'Id'
+      end
     end
 
     # The table name to used to make queries.
     # It is derived from the class name adding the "__c" when needed.
     def self.table_name
-      @table_name ||= custom_table_name || "#{ self.name }__c"
+      @table_name ||= custom_table_name || "#{ self.name.split('::').last }__c"
+    end
+
+    def self.fields
+      mappings.values
+    end
+
+    def self.query
+      ActiveForce::ActiveQuery.new self
     end
 
     def self.build sf_table_description
@@ -35,53 +69,41 @@ module ActiveForce
       sobject
     end
 
-    def self.query
-      ActiveForce::ActiveQuery.new self
-    end
-
     def update_attributes! attributes = {}
       assign_attributes attributes
       return false unless valid?
-      sobject_hash = { 'Id' => id }
-      changed.each do |field|
-        sobject_hash[mappings[field.to_sym]] = read_attribute(field)
-      end
-      result = sfdc_client.update! table_name, sobject_hash
+      sfdc_client.update! table_name, attributes_for_sfdb_update
       changed_attributes.clear
-      result
+      self
     end
 
     def update_attributes attributes = {}
       update_attributes! attributes
     rescue Faraday::Error::ClientError => error
-      Rails.logger.info do
-        "[SFDC] [#{self.class.model_name}] [#{self.class.table_name}] Error while updating, params: #{hash}, error: #{error.inspect}"
-      end
-      errors[:base] << error.message
-      false
+      logger_output __method__
     end
 
     alias_method :update, :update_attributes
 
     def create!
       return false unless valid?
-      hash = {}
-      mappings.map do |field, name_in_sfdc|
-        value = read_value field
-        hash[name_in_sfdc] = value if value.present?
-      end
-      self.id = sfdc_client.create! table_name, hash
+      self.id = sfdc_client.create! table_name, attributes_for_sfdb_create
       changed_attributes.clear
+      self
     end
 
     def create
       create!
     rescue Faraday::Error::ClientError => error
-      Rails.logger.info do
-        "[SFDC] [#{self.class.model_name}] [#{self.class.table_name}] Error while creating, params: #{hash}, error: #{error.inspect}"
-      end
-      errors[:base] << error.message
-      false
+      logger_output __method__
+    end
+
+    def self.create args
+      new(args).save
+    end
+
+    def self.create! args
+      new(args).save!
     end
 
     def save
@@ -92,6 +114,14 @@ module ActiveForce
       end
     end
 
+    def save!
+      if persisted?
+        update_attributes!
+      else
+        create!
+      end
+    end
+
     def to_param
       id
     end
@@ -100,43 +130,72 @@ module ActiveForce
       id?
     end
 
-    def self.field field_name, from: field_name.camelize, as: :string
-      mappings[field_name] = from
-      attribute field_name, sf_type: as
+    def self.field field_name, args = {}
+      args[:from] ||= default_api_name(field_name)
+      args[:as]   ||= :string
+      mappings[field_name] = args[:from]
+      attribute field_name, sf_type: args[:as]
     end
 
     def self.mappings
       @mappings ||= {}
     end
 
-
     private
 
-    def self.custom_table_name
-      self.name if STANDARD_TYPES.include? self.name
+    def logger_output action
+      logger = Logger.new(STDOUT)
+      logger.info("[SFDC] [#{self.class.model_name}] [#{self.class.table_name}] Error while #{ action }, params: #{hash}, error: #{error.inspect}")
+      errors[:base] << error.message
+      false
     end
 
-      def read_value field
-        if self.class.attributes[field][:sf_type] == :multi_picklist
-          attribute(field.to_s).reject(&:empty?).join(';')
-        else
-          attribute(field.to_s)
-        end
+    def attributes_for_sfdb_create
+      attrs = mappings.map do |attr, sf_field|
+        value = read_attribute(attr)
+        [sf_field, value] if value
       end
+      Hash.new(attrs.compact)
+    end
+
 
-      def self.picklist field
-        picks = sfdc_client.picklist_values(table_name, mappings[field])
-        picks.map do |value|
-          [value[:label], value[:value]]
-        end
+    def attributes_for_sfdb_update
+      attrs = changed_mappings.map do |attr, sf_field|
+        [sf_field, read_attribute(attr)]
       end
+      Hash.new(attrs).merge('Id' => id)
+    end
+
+    def changed_mappings
+      mappings.select { |attr, sf_field| changed.include? attr.to_s}
+    end
 
-      def self.sfdc_client
-        Client
+    def read_value field
+      case sf_field_type field
+      when :multi_picklist
+        attribute(field.to_s).reject(&:empty?).join(';')
+      else
+        attribute(field.to_s)
       end
+    end
+
+    def sf_field_type field
+      self.class.attributes[field][:sf_tpye]
+    end
 
-      def sfdc_client
-        self.class.sfdc_client
+    def self.picklist field
+      picks = sfdc_client.picklist_values(table_name, mappings[field])
+      picks.map do |value|
+        [value[:label], value[:value]]
       end
+    end
+
+    def self.sfdc_client
+      @client ||= Restforce.new
+    end
+
+    def sfdc_client
+      self.class.sfdc_client
+    end
   end
 end

data/lib/active_force/version.rb

@@ -1,3 +1,3 @@
 module ActiveForce
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/lib/generators/active_force/active_force_model/active_force_model_generator.rb

@@ -1,22 +1,47 @@
-class ActiveForce::ActiveForceModelGenerator < Rails::Generators::NamedBase
+module ActiveForce
+  class ActiveForceModelGenerator < Rails::Generators::NamedBase
 
-  Attribute = Struct.new(:local_name, :remote_name)
+    source_root File.expand_path('../templates', __FILE__)
 
-  source_root File.expand_path('../templates', __FILE__)
-  argument :attributes, type: :array, default: [],
-    banner: "field[:sales_force_name] field[:sales_force_name]"
+    def create_model_file
 
-  def create_model_file
-    template "model.rb.erb", "app/models/#{file_name}.rb"
-  end
+      sf_field_names = list_field_names file_name.capitalize
+      @attributes = create_attributes sf_field_names
+
+      template "model.rb.erb", "app/models/#{file_name}.rb"
+    end
 
-  protected
+    protected
+
+    Attribute = Struct.new(:local_name, :remote_name)
+
+    def create_attributes sf_field_names
+      sf_field_names.map do |field|
+        Attribute.new( sf_name_to_symbol(field) ,field)
+      end
+    end
 
-  def parse_attributes! #:nodoc:
-    self.attributes = (attributes || []).map do |attr|
-      name, sales_force_name = attr.split ':', 2
-      remote_name = sales_force_name.presence || name
-      Attribute.new name, remote_name
+    def list_field_names table_name
+      Client.describe(table_name).fields.map do |field|
+        field.name
+      end
     end
+
+    def sf_name_to_symbol sf_name
+      sf_name = sf_name.underscore
+      sf_name = sf_name[0..-4] if sf_name.include? "__c"
+      sf_name.to_sym
+    end
+
+    class String
+      def underscore
+        self.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+      end
+    end
+
   end
-end
+end

data/lib/generators/active_force/active_force_model/templates/model.rb.erb

@@ -2,21 +2,10 @@ require 'active_force/sobject'
 
 class <%= class_name %> < ActiveForce::SObject
 
-  MAPPINGS = {
-<% attributes.each do |attribute| -%>
-    <%= attribute.local_name %>: '<%= attribute.remote_name %>',
+<% @attributes.each do |attribute| -%>
+    field :<%= attribute.local_name %>, from: '<%= attribute.remote_name %>',
 <% end -%>
-    id:               'Id'
-  }
-  FIELDS = MAPPINGS.values
-  RELATED_LIST_FIELDS = FIELDS
 
-  self.mappings   = MAPPINGS
-  self.fields     = FIELDS
   self.table_name = '<%= class_name %>'
 
-<% attributes.each do |attribute| -%>
-  attribute :<%= attribute.local_name %>
-<% end -%>
-
 end

data/spec/active_force/active_query_spec.rb

@@ -4,8 +4,9 @@ require 'active_force/active_query'
 describe ActiveForce::ActiveQuery do
   let(:sobject){
     sobject = double("sobject")
-    sobject.stub(:table_name).and_return "table_name"
-    sobject.stub(:fields).and_return []
+    allow(sobject).to receive(:table_name).and_return "table_name"
+    allow(sobject).to receive(:fields).and_return []
+    allow(sobject).to receive(:mappings).and_return({field: "Field__c"})
     sobject
   }
 
@@ -13,10 +14,11 @@ describe ActiveForce::ActiveQuery do
     double("client")
   }
 
+  let(:active_query){ ActiveForce::ActiveQuery.new(sobject) }
+
   before do
-    @active_query = ActiveForce::ActiveQuery.new(sobject)
-    @active_query.stub(:sfdc_client).and_return client
-    @active_query.stub(:build).and_return Object.new
+    allow(active_query).to receive(:sfdc_client).and_return client
+    allow(active_query).to receive(:build).and_return Object.new
   end
 
   describe "to_a" do
@@ -25,14 +27,47 @@ describe ActiveForce::ActiveQuery do
     end
 
     it "should return an array of objects" do
-      result = @active_query.where("Text_Label = 'foo'").to_a
+      result = active_query.where("Text_Label = 'foo'").to_a
       expect(result).to be_a Array
     end
 
     it "should allow to chain query methods" do
-      result = @active_query.where("Text_Label = 'foo'").where("Checkbox_Label = true").to_a
+      result = active_query.where("Text_Label = 'foo'").where("Checkbox_Label = true").to_a
       expect(result).to be_a Array
     end
+  end
+
+  describe "condition mapping" do
+    it "maps conditions for a .where" do
+      active_query.where(field: 123)
+      expect(active_query.to_s).to eq("SELECT Id FROM table_name WHERE Field__c = 123")
+    end
+
+    it "encloses the value in quotes if it's a string" do
+      active_query.where field: "hello"
+      expect(active_query.to_s).to end_with("Field__c = 'hello'")
+    end
+  end
+
+  describe "#find_by" do
+    it "should query the client, with the SFDC field names and correctly enclosed values" do
+      expect(client).to receive :query
+      active_query.find_by field: 123
+      expect(active_query.to_s).to eq "SELECT Id FROM table_name WHERE Field__c = 123 LIMIT 1"
+    end
+  end
+
+  describe "responding as an enumerable" do
+    before do
+      expect(active_query).to receive(:to_a).and_return([])
+    end
+
+    it "should call to_a when receiving each" do
+      active_query.each {}
+    end
 
+    it "should call to_a when receiving map" do
+      active_query.map {}
+    end
   end
 end

data/spec/active_force/association_spec.rb

@@ -5,14 +5,14 @@ describe ActiveForce::SObject do
 
   let :post do
     post = Post.new
-    post.stub(:id).and_return "1"
+    allow(post).to receive(:id).and_return "1"
     post
   end
 
   let :comment do
     comment = Comment.new
-    comment.stub(:id).and_return "1"
-    comment.stub(:post_id).and_return "1"
+    allow(comment).to receive(:id).and_return "1"
+    allow(comment).to receive(:post_id).and_return "1"
     comment
   end
 
@@ -26,10 +26,11 @@ describe ActiveForce::SObject do
     end
 
     class Comment < ActiveForce::SObject
+      field :post_id, from: "PostId"
       self.table_name = "Comment__c"
     end
 
-    ActiveForce::SObject.stub(:sfdc_client).and_return client
+    allow(ActiveForce::SObject).to receive(:sfdc_client).and_return client
   end
 
   describe "has_many_query" do
@@ -49,39 +50,41 @@ describe ActiveForce::SObject do
     end
 
     describe 'to_s' do
-      it "should retrun a OSQL statment" do
-       post.comments.to_s.should ==
-         "SELECT Id FROM Comment__c WHERE Post__c = '1'"
+      it "should retrun a SOQL statment" do
+        soql = "SELECT Id, PostId FROM Comment__c WHERE PostId = '1'"
+       expect(post.comments.to_s).to eq soql
       end
     end
 
   end
 
   describe 'has_many(options)' do
+    before do
+      Post.has_many :comments
+    end
 
     it 'should allow to send a different query table name' do
       Post.has_many :ugly_comments, { model: Comment }
-      post.comments.to_s.should ==
-        "SELECT Id FROM Comment__c WHERE Post__c = '1'"
+      soql = "SELECT Id, PostId FROM Comment__c WHERE PostId = '1'"
+      expect(post.ugly_comments.to_s).to eq soql
     end
 
     it 'should allow to change the foreign key' do
-      Post.has_many :comments, { foreign_key: 'Post' }
-      post.comments.to_s.should ==
-        "SELECT Id FROM Comment__c WHERE Post = '1'"
+      Post.has_many :comments, { foreign_key: :post }
+      Comment.field :post, from: 'PostId'
+      soql = "SELECT Id, PostId FROM Comment__c WHERE PostId = '1'"
+      expect(post.comments.to_s).to eq soql
     end
 
     it 'should allow to add a where condition' do
       Post.has_many :comments, { where: '1 = 1' }
-      post.comments.to_s.should ==
-        "SELECT Id FROM Comment__c WHERE 1 = 1 AND Post__c = '1'"
+      soql = "SELECT Id, PostId FROM Comment__c WHERE 1 = 1 AND PostId = '1'"
+      expect(post.comments.to_s).to eq soql
     end
 
     it 'should use a convention name for the foreign key' do
-      Comment.field :post_id, from: 'PostId'
-      Post.has_many :comments
-      post.comments.to_s.should ==
-        "SELECT Id FROM Comment__c WHERE PostId = '1'"
+      soql = "SELECT Id, PostId FROM Comment__c WHERE PostId = '1'"
+      expect(post.comments.to_s).to eq soql
     end
 
   end
@@ -89,18 +92,21 @@ describe ActiveForce::SObject do
   describe "belongs_to" do
 
     before do
-      Comment.belongs_to :post
-      client.stub(:query).and_return Restforce::Mash.new(id: 1)
+      allow(client).to receive(:query).and_return [Restforce::Mash.new(id: 1)]
     end
 
     it "should get the resource it belongs to" do
+      Comment.belongs_to :post
       expect(comment.post).to be_instance_of(Post)
     end
 
     it "should allow to pass a foreign key as options" do
-      Comment.belongs_to :post, foreign_key: :fancy_post_id
-      comment.stub(:fancy_post_id).and_return "1"
-      client.should_receive(:query).with("SELECT Id FROM Post__c WHERE Id = '1' LIMIT 1")
+      class Comment < ActiveForce::SObject
+      	field :fancy_post_id, from: 'PostId'
+      	belongs_to :post, foreign_key: :fancy_post_id
+      end
+      allow(comment).to receive(:fancy_post_id).and_return "2"
+      expect(client).to receive(:query).with("SELECT Id FROM Post__c WHERE Id = '2' LIMIT 1")
       comment.post
     end
 

data/spec/active_force/query_spec.rb

@@ -13,76 +13,74 @@ describe ActiveForce::Query do
 
   describe ".all" do
     it "table should return table name" do
-      @query.all.table.should be(@query.table)
+      expect(@query.all.table).to eq(@query.table)
     end
 
     it "fields should return fields" do
-      @query.all.fields.should == @query.fields
+      expect(@query.all.fields).to eq @query.fields
     end
   end
 
   describe ".all.to_s" do
     it "should return a query for all records" do
-      @query.all.to_s.should == "SELECT Id, name, etc FROM table_name"
+      expect(@query.all.to_s).to eq "SELECT Id, name, etc FROM table_name"
     end
 
     it "should ignore dupicated attributes in select statment" do
       @query.fields ['Id', 'name', 'etc']
-      @query.all.to_s.should == "SELECT Id, name, etc FROM table_name"
+      expect(@query.all.to_s).to eq "SELECT Id, name, etc FROM table_name"
     end
   end
 
   describe ".where" do
     it "should add a where condition to a query" do
-      @query.where("name like '%a%'").to_s.should == "SELECT Id, name, etc FROM table_name WHERE name like '%a%'"
+      expect(@query.where("name like '%a%'").to_s).to eq "SELECT Id, name, etc FROM table_name WHERE name like '%a%'"
     end
 
     it "should add multiples conditions to a query" do
-      @query.where("condition1 = 1").where("condition2 = 2").to_s.should ==
-        "SELECT Id, name, etc FROM table_name WHERE condition1 = 1 AND condition2 = 2"
+      expect(@query.where("condition1 = 1").where("condition2 = 2").to_s).to eq "SELECT Id, name, etc FROM table_name WHERE condition1 = 1 AND condition2 = 2"
     end
   end
 
   describe ".limit" do
     it "should add a limit to a query" do
-      @query.limit("25").to_s.should == "SELECT Id, name, etc FROM table_name LIMIT 25"
+      expect(@query.limit("25").to_s).to eq "SELECT Id, name, etc FROM table_name LIMIT 25"
     end
   end
 
   describe ".limit_value" do
     it "should return the limit value" do
       @query.limit(4)
-      @query.limit_value.should == 4
+      expect(@query.limit_value).to eq 4
     end
   end
 
   describe ".offset" do
     it "should add an offset to a query" do
-      @query.offset(4).to_s.should == "SELECT Id, name, etc FROM table_name OFFSET 4"
+      expect(@query.offset(4).to_s).to eq "SELECT Id, name, etc FROM table_name OFFSET 4"
     end
   end
 
   describe ".offset_value" do
     it "should return the offset value" do
       @query.offset(4)
-      @query.offset_value.should == 4
+      expect(@query.offset_value).to eq 4
     end
   end
 
   describe ".find.to_s" do
     it "should return a query for 1 record" do
-      @query.find(2).to_s.should == "SELECT Id, name, etc FROM table_name WHERE Id = '2' LIMIT 1"
+      expect(@query.find(2).to_s).to eq "SELECT Id, name, etc FROM table_name WHERE Id = '2' LIMIT 1"
     end
   end
 
   describe ".order" do
     it "should add a order condition in the statment" do
-      @query.order("name desc").to_s.should == "SELECT Id, name, etc FROM table_name ORDER BY name desc"
+      expect(@query.order("name desc").to_s).to eq "SELECT Id, name, etc FROM table_name ORDER BY name desc"
     end
 
     it "should add a order condition in the statment with WHERE and LIMIT" do
-      @query.where("condition1 = 1").order("name desc").limit(1).to_s.should ==
-        "SELECT Id, name, etc FROM table_name WHERE condition1 = 1 ORDER BY name desc LIMIT 1"
+      expect(@query.where("condition1 = 1").order("name desc").limit(1).to_s).to eq "SELECT Id, name, etc FROM table_name WHERE condition1 = 1 ORDER BY name desc LIMIT 1"
     end
   end
 
@@ -94,56 +92,47 @@ describe ActiveForce::Query do
     end
 
     it 'should add another select statment on the current select' do
-      @query.join(@join).to_s.should ==
-        'SELECT Id, name, etc, (SELECT Id, name, etc FROM join_table_name) FROM table_name'
+      expect(@query.join(@join).to_s).to eq 'SELECT Id, name, etc, (SELECT Id, name, etc FROM join_table_name) FROM table_name'
     end
   end
 
   describe '.first' do
     it 'should return the query for the first record' do
-      @query.first.to_s.should ==
-        'SELECT Id, name, etc FROM table_name LIMIT 1'
+      expect(@query.first.to_s).to eq 'SELECT Id, name, etc FROM table_name LIMIT 1'
     end
   end
 
   describe '.last' do
     it 'should return the query for the last record' do
-      @query.last.to_s.should ==
-        'SELECT Id, name, etc FROM table_name ORDER BY Id DESC LIMIT 1'
+      expect(@query.last.to_s).to eq 'SELECT Id, name, etc FROM table_name ORDER BY Id DESC LIMIT 1'
     end
   end
 
   describe ".count" do
     it "should return the query for getting the row count" do
-      @query.count.to_s.should ==
-        'SELECT count(Id) FROM table_name'
+      expect(@query.count.to_s).to eq 'SELECT count(Id) FROM table_name'
     end
 
     it "should work with a condition" do
-      @query.where("name = 'cool'").count.to_s.should ==
-        "SELECT count(Id) FROM table_name WHERE name = 'cool'"
+      expect(@query.where("name = 'cool'").count.to_s).to eq "SELECT count(Id) FROM table_name WHERE name = 'cool'"
     end
   end
 
   describe '.options' do
     it 'should add a where if the option has a where condition' do
-      @query.options(where: 'var = 1').to_s.should ==
-        "SELECT Id, name, etc FROM table_name WHERE var = 1"
+      expect(@query.options(where: 'var = 1').to_s).to eq "SELECT Id, name, etc FROM table_name WHERE var = 1"
     end
 
     it 'should add a limit if the option has a limit condition' do
-      @query.options(limit: 1).to_s.should ==
-        "SELECT Id, name, etc FROM table_name LIMIT 1"
+      expect(@query.options(limit: 1).to_s).to eq "SELECT Id, name, etc FROM table_name LIMIT 1"
     end
 
     it 'should add a order if the option has a order condition' do
-      @query.options(order: 'name desc').to_s.should ==
-        "SELECT Id, name, etc FROM table_name ORDER BY name desc"
+      expect(@query.options(order: 'name desc').to_s).to eq "SELECT Id, name, etc FROM table_name ORDER BY name desc"
     end
 
     it 'should work with multiples options' do
-      @query.options(where: 'var = 1', order: 'name desc', limit: 1).to_s.should ==
-        "SELECT Id, name, etc FROM table_name WHERE var = 1 ORDER BY name desc LIMIT 1"
+      expect(@query.options(where: 'var = 1', order: 'name desc', limit: 1).to_s).to eq "SELECT Id, name, etc FROM table_name WHERE var = 1 ORDER BY name desc LIMIT 1"
     end
   end
 end

data/spec/active_force/sobject/table_name_spec.rb

@@ -25,5 +25,13 @@ describe ActiveForce::SObject do
       expect(EnforcedTableName.table_name).to eq('Forced__c')
     end
 
+    it "doesn't include a namespace" do
+      module Foo
+        class Bar < ActiveForce::SObject
+        end
+      end
+
+      expect(Foo::Bar.table_name).to eq('Bar__c')
+    end
   end
 end

data/spec/active_force/sobject_spec.rb

@@ -2,20 +2,18 @@ require 'spec_helper'
 
 describe ActiveForce::SObject do
   let(:sobject_hash) { YAML.load(fixture('sobject/single_sobject_hash')) }
+  let(:client) { double 'Client' }
 
   before do
-    ::Client = double('Client')
-  end
-
-  after do
-    Object.send :remove_const, 'Client'
+    allow(ActiveForce::SObject).to receive(:sfdc_client).and_return client
   end
 
   describe ".new" do
-    it "create with valid values" do
-      @SObject = Whizbang.new
-      expect(@SObject).to be_an_instance_of Whizbang
+
+    it 'should assigns values when are passed by parameters' do
+      expect(Whizbang.new({ text: 'some text' }).text).to eq 'some text'
     end
+
   end
 
   describe ".build" do
@@ -41,6 +39,38 @@ describe ActiveForce::SObject do
         expect(Whizbang.attribute_names).to include(name)
       end
     end
+
+    it "uses Salesforce API naming conventions by default" do
+      expect(Whizbang.mappings[:estimated_close_date]).to eq 'Estimated_Close_Date__c'
+    end
+
+    describe 'having an id' do
+      it 'has one by default' do
+        expect(Territory.new).to respond_to(:id)
+        expect(Territory.mappings[:id]).to eq 'Id'
+      end
+
+      it 'can be overridden' do
+        expect(Quota.new).to respond_to(:id)
+        expect(Quota.mappings[:id]).to eq 'Bar_Id__c'
+      end
+    end
+  end
+
+  describe '#update' do
+
+    subject do
+      Whizbang.new
+    end
+
+    before do
+      expect(client).to receive(:update!).and_return('id')
+    end
+
+    it 'delegates to the Client with create!' do
+      expect(subject.update({ text: 'some text' })).to be_a Whizbang
+    end
+
   end
 
   describe '#create' do
@@ -50,7 +80,7 @@ describe ActiveForce::SObject do
     end
 
     before do
-      Client.should_receive(:create!).and_return('id')
+      expect(client).to receive(:create!).and_return('id')
     end
 
     it 'delegates to the Client with create!' do
@@ -64,36 +94,36 @@ describe ActiveForce::SObject do
 
   end
 
+  describe 'self.create' do
+
+    before do
+      expect(client).to receive(:create!).and_return('id')
+    end
+
+    it 'should create a new instance' do
+      expect(Whizbang.create({ text: 'some text' })).to be_a Whizbang
+    end
+
+  end
+
   describe "#count" do
     let(:count_response){ [Restforce::Mash.new(expr0: 1)] }
 
     it "responds to count" do
-      Whizbang.should respond_to(:count)
+      expect(Whizbang).to respond_to(:count)
     end
 
     it "sends the query to the client" do
-      expect(Client).to receive(:query).and_return(count_response)
+      expect(client).to receive(:query).and_return(count_response)
       expect(Whizbang.count).to eq(1)
     end
 
   end
 
-  # describe "first" do
-  #   it "should return the first value" do
-  #     binding.pry
-  #     expect(Whizbang.first).to eq(1)
-  #   end
-  # end
-
   describe "#find_by" do
-    it "responds to find_by" do
-      Whizbang.should respond_to(:find_by)
-    end
-
     it "should query the client, with the SFDC field names and correctly enclosed values" do
-      Client.should_receive(:query).with("SELECT Id FROM Whizbang__c WHERE Id = 123 AND Text_Label = 'foo' LIMIT 1")
+      expect(client).to receive(:query).with("SELECT #{Whizbang.fields.join ', '} FROM Whizbang__c WHERE Id = 123 AND Text_Label = 'foo' LIMIT 1")
       Whizbang.find_by id: 123, text: "foo"
     end
   end
-
 end

data/spec/active_force_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe ActiveForce do
   it 'should have a version number' do
-    ActiveForce::VERSION.should_not be_nil
+    expect(ActiveForce::VERSION).to_not be_nil
   end
 end

data/spec/spec_helper.rb

@@ -6,3 +6,8 @@ require 'restforce'
 require 'active_force'
 Dir["./spec/support/**/*"].sort.each { |f| require f }
 require 'pry'
+
+class Territory < ActiveForce::SObject; end
+class Quota < ActiveForce::SObject
+  field :id, from: 'Bar_Id__c'
+end

data/spec/support/whizbang.rb

@@ -6,5 +6,6 @@ class Whizbang < ActiveForce::SObject
   field :date,                 from: 'Date_Label'
   field :datetime,             from: 'DateTime_Label'
   field :picklist_multiselect, from: 'Picklist_Multiselect_Label'
+  field :estimated_close_date
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_force
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Eloy Espinaco
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -170,3 +170,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/fixture_helpers.rb
 - spec/support/whizbang.rb
+has_rdoc: