active_force 0.6.1 → 0.7.0

data/lib/active_force/association/relation_model_builder.rb

@@ -0,0 +1,70 @@
+module ActiveForce
+  module Association
+    class RelationModelBuilder
+      class << self
+        def build(association, value)
+          new(association, value).build_relation_model
+        end
+      end
+
+      def initialize(association, value)
+        @association = association
+        @value = value
+      end
+
+      def build_relation_model
+        klass = resolve_class
+        klass.new(@association, @value).call
+      end
+
+      private
+
+      def resolve_class
+        association_builder = @value.class.name.gsub('::', '_')
+        ActiveForce::Association.const_get "BuildFrom#{association_builder}"
+      rescue NameError
+        raise "Don't know how to build relation from #{@value.class.name}"
+      end
+    end
+
+    class AbstractBuildFrom
+      attr_reader :association, :value
+
+      def initialize(association, value)
+        @association = association
+        @value = value
+      end
+
+      def call
+        raise "Must implement #{self.class.name}#call"
+      end
+    end
+
+    class BuildFromHash < AbstractBuildFrom
+      def call
+        association.build value
+      end
+    end
+
+    class BuildFromArray < AbstractBuildFrom
+      def call
+        value.map { |mash| association.build mash }
+      end
+    end
+
+    class BuildFromNilClass < AbstractBuildFrom
+      def call
+        association.is_a?(BelongsToAssociation) ? nil : []
+      end
+    end
+
+    class BuildFromRestforce_SObject < BuildFromHash
+    end
+
+    class BuildFromRestforce_Mash < BuildFromHash
+    end
+
+    class BuildFromRestforce_Collection < BuildFromArray
+    end
+  end
+end

data/lib/active_force/attribute.rb

@@ -0,0 +1,30 @@
+module ActiveForce
+  class Attribute
+
+    attr_accessor :local_name, :sfdc_name, :as
+
+    def initialize name, options = {}
+      self.local_name = name
+      self.sfdc_name  = options[:sfdc_name] || options[:from] || default_api_name
+      self.as         = options[:as]        || :string
+    end
+
+    def value_for_hash value
+      case as
+      when :multi_picklist
+        value.reject(&:empty?).join(';')
+      else
+        value
+      end
+    end
+
+    private
+
+    ###
+    # Transforms +attribute+ to the conventional Salesforce API name.
+    #
+    def default_api_name
+      local_name.to_s.split('_').map(&:capitalize).join('_') << '__c'
+    end
+  end
+end

data/lib/active_force/mapping.rb

@@ -0,0 +1,78 @@
+require 'active_force/attribute'
+require 'active_force/table'
+require 'forwardable'
+
+module ActiveForce
+  class Mapping
+    extend Forwardable
+
+    STRINGLIKE_TYPES = [
+      nil, :string, :base64, :byte, :ID, :reference, :currency, :textarea,
+      :phone, :url, :email, :combobox, :picklist, :multipicklist, :anyType,
+      :location
+    ]
+
+    def_delegators :table, :custom_table?, :table_name
+
+    def initialize model
+      @model = model
+    end
+
+    def mappings
+      Hash[fields.map { |field, attr| [field, attr.sfdc_name] }]
+    end
+
+    def sfdc_names
+      mappings.values
+    end
+
+    def field name, options
+      fields.merge!({ name => ActiveForce::Attribute.new(name, options) })
+    end
+
+    def table
+      @table ||= ActiveForce::Table.new @model
+    end
+
+    def translate_to_sf attributes
+      attrs = attributes.map do |attribute, value|
+        attr = fields[attribute.to_sym]
+        [attr.sfdc_name, attr.value_for_hash(value)]
+      end
+      Hash[attrs]
+    end
+
+    def translate_value value, field_name
+      return value unless !!field_name
+      typecast_value value.to_s, fields[field_name].as
+    end
+
+
+    private
+
+    def fields
+      @fields ||= {}
+    end
+
+    # Handles Salesforce FieldTypes as described here:
+    # http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_describesobjects_describesobjectresult.htm#i1427700
+    def typecast_value value, type
+      case type
+      when *STRINGLIKE_TYPES
+        value
+      when :boolean
+        !['false','0','f'].include? value.downcase
+      when :int
+        value.to_i
+      when :double, :percent
+        value.to_f
+      when :date
+        Date.parse value
+      when :datetime
+        DateTime.parse value
+      else
+        value
+      end
+    end
+  end
+end

data/lib/active_force/query.rb

@@ -86,19 +86,13 @@ module ActiveForce
       self
     end
 
-    def options args
-      where args[:where]
-      limit args[:limit]
-      order args[:order]
-    end
-
     protected
       def build_select
-        @query_fields.uniq.join(', ')
+        @query_fields.compact.uniq.join(', ')
       end
 
       def build_where
-        "WHERE #{ @conditions.join(' AND ') }" unless @conditions.empty?
+        "WHERE (#{ @conditions.join(') AND (') })" unless @conditions.empty?
       end
 
       def build_limit

data/lib/active_force/sobject.rb

@@ -3,17 +3,19 @@ require 'active_attr'
 require 'active_attr/dirty'
 require 'active_force/active_query'
 require 'active_force/association'
-require 'active_force/table'
+require 'active_force/mapping'
 require 'yaml'
 require 'forwardable'
 require 'logger'
 require 'restforce'
 
 module ActiveForce
+  class RecordInvalid < StandardError;end
+
   class SObject
     include ActiveAttr::Model
     include ActiveAttr::Dirty
-    include ActiveForce::Association
+    extend ActiveForce::Association
     extend ActiveModel::Callbacks
 
     define_model_callbacks :save, :create, :update
@@ -22,21 +24,11 @@ module ActiveForce
 
     class << self
       extend Forwardable
-      def_delegators :query, :where, :first, :last, :all, :find, :find_by, :count
-      def_delegators :table, :custom_table_name?
+      def_delegators :query, :where, :first, :last, :all, :find, :find_by, :count, :includes, :limit, :order, :select
+      def_delegators :mapping, :table, :table_name, :custom_table?, :mappings
 
       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
-
       ###
       # Provide each subclass with a default id field. Can be overridden
       # in the subclass if needed
@@ -45,29 +37,23 @@ module ActiveForce
       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
-    end
-
-    def self.table
-      @table ||= ActiveForce::Table.new name
+    def self.mapping
+      @mapping ||= ActiveForce::Mapping.new name
     end
 
     def self.fields
-      mappings.values
+      mapping.sfdc_names
     end
 
     def self.query
       ActiveForce::ActiveQuery.new self
     end
 
-    def self.build sf_table_description
-      return unless sf_table_description
+    def self.build mash
+      return unless mash
       sobject = new
-      mappings.each do |attr, sf_field|
-        sobject[attr] = sf_table_description[sf_field]
+      mash.each do |column, sf_value|
+        sobject.write_value column, sf_value
       end
       sobject.changed_attributes.clear
       sobject
@@ -75,35 +61,42 @@ module ActiveForce
 
     def update_attributes! attributes = {}
       assign_attributes attributes
-      return false unless valid?
-      sfdc_client.update! table_name, attributes_for_sfdb
-      changed_attributes.clear
-      self
+      validate!
+      run_callbacks :save do
+        run_callbacks :update do
+          sfdc_client.update! table_name, attributes_for_sfdb
+          changed_attributes.clear
+        end
+      end
+      true
     end
 
+    alias_method :update!, :update_attributes!
+
     def update_attributes attributes = {}
-      run_callbacks :update do
-        update_attributes! attributes
-      end
-    rescue Faraday::Error::ClientError => error
-      logger_output __method__
+      update_attributes! attributes
+    rescue Faraday::Error::ClientError, RecordInvalid => error
+      handle_save_error error
     end
 
     alias_method :update, :update_attributes
 
     def create!
-      return false unless valid?
-      self.id = sfdc_client.create! table_name, attributes_for_sfdb
-      changed_attributes.clear
+      validate!
+      run_callbacks :save do
+        run_callbacks :create do
+          self.id = sfdc_client.create! table_name, attributes_for_sfdb
+          changed_attributes.clear
+        end
+      end
       self
     end
 
     def create
-      run_callbacks :create do
-        create!
-      end
-    rescue Faraday::Error::ClientError => error
-      logger_output __method__
+      create!
+    rescue Faraday::Error::ClientError, RecordInvalid => error
+      handle_save_error error
+      self
     end
 
     def destroy
@@ -111,27 +104,27 @@ module ActiveForce
     end
 
     def self.create args
-      new(args).save
+      new(args).create
     end
 
     def self.create! args
-      new(args).save!
+      new(args).create!
     end
 
-    def save
+    def save!
       run_callbacks :save do
         if persisted?
-          update
+          !!update!
         else
-          create
+          !!create!
         end
       end
     end
 
-    def save!
-      save
-    rescue Faraday::Error::ClientError => error
-      logger_output __method__
+    def save
+      save!
+    rescue Faraday::Error::ClientError, RecordInvalid => error
+      handle_save_error error
     end
 
     def to_param
@@ -143,14 +136,8 @@ module ActiveForce
     end
 
     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 ||= {}
+      mapping.field field_name, args
+      attribute field_name
     end
 
     def reload
@@ -161,50 +148,47 @@ module ActiveForce
       self
     end
 
-    private
-
-    def association_cache
-      @association_cache ||= {}
+    def write_value column, value
+      if association = self.class.find_association(column)
+        field = association.relation_name
+        value = Association::RelationModelBuilder.build(association, value)
+      else
+        field = mappings.invert[column]
+        value = self.class.mapping.translate_value value, field unless value.nil?
+      end
+      send "#{field}=", value if field
     end
 
-    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
+   private
 
-    def attributes_for_sfdb
-      if persisted?
-        attrs = changed_mappings.map do |attr, sf_field|
-          value = read_value(attr)
-          [sf_field, value]
-        end
-        attrs << ['Id', id]
-      else
-        attrs = mappings.map do |attr, sf_field|
-          value = read_value(attr)
-          [sf_field, value] unless value.nil?
-        end
+    def validate!
+      unless valid?
+        raise RecordInvalid.new(
+          "Validation failed: #{errors.full_messages.join(', ')}"
+        )
       end
-      Hash[attrs.compact]
     end
 
-    def changed_mappings
-      mappings.select { |attr, sf_field| changed.include? attr.to_s}
+    def handle_save_error error
+      return false if error.class == RecordInvalid
+      logger_output __method__, error, attributes
     end
 
-    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
+    def association_cache
+      @association_cache ||= {}
     end
 
-    def sf_field_type field
-      self.class.attributes[field][:sf_type]
+    def logger_output action, exception, params = {}
+      logger = Logger.new(STDOUT)
+      logger.info("[SFDC] [#{self.class.model_name}] [#{self.class.table_name}] Error while #{ action }, params: #{params}, error: #{exception.inspect}")
+      errors[:base] << exception.message
+      false
+    end
+
+    def attributes_for_sfdb
+      attrs = self.class.mapping.translate_to_sf(attributes_and_changes)
+      attrs.merge!({'Id' => id }) if persisted?
+      attrs
     end
 
     def self.picklist field