active_force 0.3.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb33c1d8bd10a5fe69b7afba5930afdce4fdbb6e
-  data.tar.gz: 57968d2bb5ba4bcc75e266952167c99fa26735da
+  metadata.gz: 2db05b88b32eacda2b94f3dcbc47a72288b1f4e4
+  data.tar.gz: 4c57fa4fa03fcb50d8378854b99377d6403206e2
 SHA512:
-  metadata.gz: 175aea8d469a6515b942e09a151f683eeeaa9cd9e4dab41858398d8d8f9f07dcde337808cdb3e7d73330494eb6ac71877fe7346717c95f511babd65c942d8c55
-  data.tar.gz: 3abb42f544529ac5d460f157cb8ae00f5706f57e01004d34d22e41f64ddfd7f8888deb0b6421b7498c609ead4a0b0d7c3241e610e65cf4d81a6bd3d3d2414661
+  metadata.gz: 7629ee051094c5e4dbe73ee6c3c06fb31bbb1fa9cf5aea5705f661d5201dffa8eb9cc6d5fcc263e7ea90084f4bf30731749d206f2a8996a9c356cd876e4415ba
+  data.tar.gz: 21db5698eb4a8f6db16041cc70cd32a8d24520dc1655c7c6eb6bb3d2d1fa7d3b5e44c99e5ffbe93860c9bff2a19872edd5ceff8a20cdb8ee9d1512d103133223

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.1
-  - rbx-2
 matrix:
   allow_failures:
     - rvm: rbx-2

data/README.md

@@ -23,7 +23,7 @@ And then execute:
 Or install it yourself as:
 
     $ gem install active_force
-    
+
 Rails:
 
 ```ruby
@@ -38,22 +38,33 @@ Restforce.log = true if Rails.env.development?
 
 ```ruby
 class Page < ActiveForce::SObject
-  
+
 end
 ```
 
 ### Add Attributes
 ```ruby
 class Page < ActiveForce::SObject
-  #field, attribute name. from: 'Name in Salesforce database'
+  #field, :attribute_name, from: 'Name_In_Salesforce_Database'
   field :id,                from: 'Id'
-  field :name,              from: 'Medication__c'    
+  field :name,              from: 'Medication__c'
   self.fields     = mappings.values
   #set SalesForce table name.
   self.table_name = 'Patient_Medication__c'
 end
 ```
-### Relation ships
+### Validations
+You can use any validation that active record has (except for validates_associated), just by adding them to your class:
+
+```ruby
+validates :name, :login, :email, presence: true
+validates :text, length: { minimum: 2 }
+validates :text, format: { with: /\A[a-zA-Z]+\z/, message: "only allows letters" }
+validates :size, inclusion: { in: %w(small medium large),
+    message: "%{value} is not a valid size" }
+```
+
+### Relationships
 
 #### Has Many
 
@@ -73,7 +84,7 @@ you could send a option parameter in the declaration.
 class Account < ActiveForce::SObject
   has_many :medications,
     where: "(Date_Discontinued__c > #{ Date.today.strftime("%Y-%m-%d") } or Date_Discontinued__c = NULL)"
-    
+
   has_many :today_log_entrys,
     model: DailyLogEntry,
     where: "Date__c = #{ Time.now.in_time_zone.strftime("%Y-%m-%d") }"

data/active_force.gemspec

@@ -6,7 +6,7 @@ require 'active_force/version'
 Gem::Specification.new do |spec|
   spec.name          = "active_force"
   spec.version       = ActiveForce::VERSION
-  spec.authors       = ["Eloy Espinaco", "Pablo Oldani"]
+  spec.authors       = ["Eloy Espinaco", "Pablo Oldani", "Armando Andini", "José Piccioni"]
   spec.email         = "eloyesp@gmail.com"
   spec.description   = %q{Use SalesForce as an ActiveModel}
   spec.summary       = %q{Help you implement models persisting on Sales Force within Rails using RESTForce}

data/lib/active_force/active_query.rb

@@ -0,0 +1,62 @@
+require 'active_force/query'
+
+module ActiveForce
+  class ActiveQuery < Query
+
+    attr_reader :sobject
+
+    delegate :sfdc_client, :build, :table_name, :mappings, to: :sobject
+
+    def initialize sobject
+      @sobject = sobject
+      super table_name
+      fields sobject.fields
+    end
+
+    def to_a
+      result.to_a.map do |mash|
+        build mash
+      end
+    end
+
+    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
+    end
+
+    def where conditions
+      return super unless conditions.is_a? Hash
+      conditions.each do |key, value|
+        super "#{ mappings[key] } = #{ enclose_value value }"
+      end
+      self
+    end
+
+    def find_by conditions
+      where(conditions).limit 1
+    end
+
+    private
+
+    def enclose_value value
+      if value.is_a? String
+        "'#{value}'"
+      else
+        value.to_s
+      end
+    end
+
+    def result
+      sfdc_client.query(self.to_s)
+    end
+  end
+end

data/lib/active_force/association/has_many_association.rb

@@ -8,30 +8,14 @@ module ActiveForce
 
       private
 
-      def build
-        super
-        define_query_method
-      end
-
-      def define_query_method
+      def define_relation_method
         association = self
-        @parent.send :define_method, query_method_name do
+        @parent.send :define_method, @relation_name do
           query = association.relation_model.query
           query.options association.options
           query.where "#{ association.foreign_key } = '#{ self.id }'"
         end
       end
-
-      def define_relation_method
-        association = self
-        @parent.send :define_method, @relation_name do
-          association.relation_model.send_query send(association.query_method_name)
-        end
-      end
-
-      def query_method_name
-        "#{ @relation_name }_query"
-      end
     end
   end
 end

data/lib/active_force/query.rb

@@ -10,7 +10,7 @@ module ActiveForce
     end
 
     def fields fields_collection = []
-      @query_fields = @query_fields + fields_collection.to_a
+      @query_fields += fields_collection.to_a
     end
 
     def all
@@ -20,7 +20,7 @@ module ActiveForce
     def to_s
       <<-SOQL.gsub(/\s+/, " ").strip
         SELECT
-          #{ @query_fields.uniq.join(', ') }
+          #{ build_select }
         FROM
           #{ @table }
         #{ build_where }
@@ -88,6 +88,10 @@ module ActiveForce
     end
 
     protected
+      def build_select
+        @query_fields.uniq.join(', ')
+      end
+
       def build_where
         "WHERE #{ @conditions.join(' AND ') }" unless @conditions.empty?
       end

data/lib/active_force/sobject.rb

@@ -1,9 +1,8 @@
 require 'active_model'
 require 'active_attr'
 require 'active_attr/dirty'
-require 'active_force/query'
+require 'active_force/active_query'
 require 'active_force/association'
-require 'active_force/finders'
 require 'yaml'
 
 module ActiveForce
@@ -11,62 +10,33 @@ module ActiveForce
     include ActiveAttr::Model
     include ActiveAttr::Dirty
     include ActiveForce::Association
-    include ActiveForce::Finders
 
     STANDARD_TYPES = %w[ Account Contact Opportunity Campaign]
 
     class_attribute :mappings, :fields, :table_name
 
+    class << self
+      delegate :where, :first, :last, :all, :find, :find_by, :count, :to => :query
+    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 ||= if STANDARD_TYPES.include? self.name
-                        self.name
-                      else
-                        "#{self.name}__c"
-                      end
+      @table_name ||= custom_table_name || "#{ self.name }__c"
     end
 
-    def self.build sobject
-      return unless sobject
-      model = new
+    def self.build sf_table_description
+      return unless sf_table_description
+      sobject = new
       mappings.each do |attr, sf_field|
-        model[attr] = sobject[sf_field]
+        sobject[attr] = sf_table_description[sf_field]
       end
-      model.changed_attributes.clear
-      model
+      sobject.changed_attributes.clear
+      sobject
     end
 
     def self.query
-      query = ActiveForce::Query.new(table_name)
-      query.fields fields
-      query
-    end
-
-    def self.first
-      send_query(query.first).first
-    end
-
-    def self.last
-      send_query(query.last).first
-    end
-
-    def self.all
-      send_query query
-    end
-
-    def self.count
-      sfdc_client.query(query.count).first.expr0
-    end
-
-    def self.send_query query
-      sfdc_client.query(query.to_s).to_a.map do |mash|
-        build mash
-      end
-    end
-
-    def self.find id
-      send_query(query.find(id)).first
+      ActiveForce::ActiveQuery.new self
     end
 
     def update_attributes! attributes = {}
@@ -139,7 +109,13 @@ module ActiveForce
       @mappings ||= {}
     end
 
+
     private
+
+    def self.custom_table_name
+      self.name if STANDARD_TYPES.include? self.name
+    end
+
       def read_value field
         if self.class.attributes[field][:sf_type] == :multi_picklist
           attribute(field.to_s).reject(&:empty?).join(';')

data/lib/active_force/version.rb

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

data/spec/active_force/active_query_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+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 []
+    sobject
+  }
+
+  let(:client){
+    double("client")
+  }
+
+  before do
+    @active_query = ActiveForce::ActiveQuery.new(sobject)
+    @active_query.stub(:sfdc_client).and_return client
+    @active_query.stub(:build).and_return Object.new
+  end
+
+  describe "to_a" do
+    before do
+      expect(client).to receive(:query)
+    end
+
+    it "should return an array of objects" do
+      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
+      expect(result).to be_a Array
+    end
+
+  end
+end

data/spec/active_force/association_spec.rb

@@ -44,44 +44,46 @@ describe ActiveForce::SObject do
       expect(post).to respond_to(:comments)
     end
 
-    it "should return a Query object" do
-      post.comments_query.class.should be ActiveForce::Query
+    it "should return a ActiveQuery object" do
+      expect(post.comments).to be_a ActiveForce::ActiveQuery
     end
 
     describe 'to_s' do
       it "should retrun a OSQL statment" do
-       post.comments_query.to_s.should ==
+       post.comments.to_s.should ==
          "SELECT Id FROM Comment__c WHERE Post__c = '1'"
       end
     end
+
   end
 
   describe 'has_many(options)' do
 
     it 'should allow to send a different query table name' do
       Post.has_many :ugly_comments, { model: Comment }
-      post.comments_query.to_s.should ==
+      post.comments.to_s.should ==
         "SELECT Id FROM Comment__c WHERE Post__c = '1'"
     end
 
     it 'should allow to change the foreign key' do
       Post.has_many :comments, { foreign_key: 'Post' }
-      post.comments_query.to_s.should ==
+      post.comments.to_s.should ==
         "SELECT Id FROM Comment__c WHERE Post = '1'"
     end
 
     it 'should allow to add a where condition' do
       Post.has_many :comments, { where: '1 = 1' }
-      post.comments_query.to_s.should ==
+      post.comments.to_s.should ==
         "SELECT Id FROM Comment__c WHERE 1 = 1 AND Post__c = '1'"
     end
 
     it 'should use a convention name for the foreign key' do
       Comment.field :post_id, from: 'PostId'
       Post.has_many :comments
-      post.comments_query.to_s.should ==
+      post.comments.to_s.should ==
         "SELECT Id FROM Comment__c WHERE PostId = '1'"
     end
+
   end
 
   describe "belongs_to" do

data/spec/active_force/sobject_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe ActiveForce::SObject do
+  let(:sobject_hash) { YAML.load(fixture('sobject/single_sobject_hash')) }
 
   before do
     ::Client = double('Client')
@@ -18,7 +19,6 @@ describe ActiveForce::SObject do
   end
 
   describe ".build" do
-    let(:sobject_hash) { YAML.load(fixture('sobject/single_sobject_hash')) }
 
     it "build a valid sobject from a JSON" do
       expect(Whizbang.build sobject_hash).to be_an_instance_of Whizbang
@@ -72,19 +72,26 @@ describe ActiveForce::SObject do
     end
 
     it "sends the query to the client" do
-      Client.should_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'")
+      Client.should_receive(:query).with("SELECT Id FROM Whizbang__c WHERE Id = 123 AND Text_Label = 'foo' LIMIT 1")
       Whizbang.find_by id: 123, text: "foo"
     end
   end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: active_force
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.2
 platform: ruby
 authors:
 - Eloy Espinaco
 - Pablo Oldani
+- Armando Andini
+- José Piccioni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -112,22 +114,23 @@ files:
 - active_force.gemspec
 - lib/active_attr/dirty.rb
 - lib/active_force.rb
+- lib/active_force/active_query.rb
 - lib/active_force/association.rb
 - lib/active_force/association/association.rb
 - lib/active_force/association/belongs_to_association.rb
 - lib/active_force/association/has_many_association.rb
-- lib/active_force/finders.rb
 - lib/active_force/query.rb
 - lib/active_force/sobject.rb
 - lib/active_force/version.rb
 - lib/generators/active_force/active_force_model/USAGE
 - lib/generators/active_force/active_force_model/active_force_model_generator.rb
 - lib/generators/active_force/active_force_model/templates/model.rb.erb
+- spec/active_force/active_query_spec.rb
 - spec/active_force/association_spec.rb
+- spec/active_force/query_spec.rb
 - spec/active_force/sobject/table_name_spec.rb
 - spec/active_force/sobject_spec.rb
 - spec/active_force_spec.rb
-- spec/active_query/query_spec.rb
 - spec/fixtures/sobject/single_sobject_hash.yml
 - spec/spec_helper.rb
 - spec/support/fixture_helpers.rb
@@ -157,11 +160,12 @@ 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_spec.rb
+- spec/active_force/query_spec.rb
 - spec/active_force/sobject/table_name_spec.rb
 - spec/active_force/sobject_spec.rb
 - spec/active_force_spec.rb
-- spec/active_query/query_spec.rb
 - spec/fixtures/sobject/single_sobject_hash.yml
 - spec/spec_helper.rb
 - spec/support/fixture_helpers.rb

data/lib/active_force/finders.rb

@@ -1,37 +0,0 @@
-module ActiveForce
-  module Finders
-    module ClassMethods
-      def find_by conditions
-        query = self.query
-        query_conditions(conditions).each do |query_condition|
-          query = query.where query_condition
-        end
-        send_query(query).first
-      end
-
-      private
-
-      #maps a hash key => value to a string 'key = value'
-      def query_conditions conditions
-        conditions.map do |key, value|
-          "#{ mappings[key] } = #{ enclose_value value }"
-        end
-      end
-
-      # encloses the value in quotes if it's a string
-      def enclose_value value
-        if value.is_a? String
-          "'#{value}'"
-        else
-          value.to_s
-        end
-      end
-
-    end
-
-    def self.included mod
-      mod.extend ClassMethods
-    end
-
-  end
-end