sugarcrm 0.9.6 → 0.9.7

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/lib/sugarcrm/associations/association_collection.rb

@@ -2,7 +2,6 @@ module SugarCRM
   # A class for handling association collections.  Basically just an extension of Array
   # doesn't actually load the records from Sugar until you invoke one of the public methods
   class AssociationCollection
-    include Enumerable
     
     # creates a new instance of an AssociationCollection
     # Owner is the parent object, and association is the target
@@ -32,18 +31,7 @@ module SugarCRM
     def reload
       load_associated_records
     end
-    
-    def each(&block)
-      load
-      @collection.each(&block)
-    end
-    
-    # we should probably delegate this
-    def length
-      load
-      @collection.length
-    end
-        
+     
     # return any added elements
     def added
       load
@@ -83,6 +71,13 @@ module SugarCRM
     end
     alias :add :<<
     
+    # delegate undefined methods to the @collection array
+    # E.g. contact.cases should behave like an array and allow `length`, `size`, `each`, etc.
+    def method_missing(method_name, *args, &block)
+      load
+      @collection.send(method_name.to_sym, *args, &block)
+    end
+    
     def save
       begin
         save!
@@ -123,14 +118,7 @@ module SugarCRM
     # user would be the owner, and EmailAddress.new() is the target
     def associate!(target, opts={})
       #target.save! if target.new?
-      response = SugarCRM.connection.set_relationship(
-        @owner.class._module.name, @owner.id, 
-        target.class._module.table_name, [target.id],
-        opts
-      )
-      raise AssociationFailed, 
-        "Couldn't associate #{@owner.class._module.name}: #{@owner.id} -> #{target.class._module.table_name}:#{target.id}!" if response["failed"] > 0
-      true
+      @owner.associate!(target, [target.id], opts)
     end
     
     # Removes a relationship between the current object and the target    

data/lib/sugarcrm/associations/association_methods.rb

@@ -20,6 +20,30 @@ module SugarCRM; module AssociationMethods
     false
   end
   
+  # Creates a relationship between the current object and the target
+  # The current instance and target records will have a relationship set
+  # i.e. account.associate!(contact) wyould link account and contact
+  # In contrast to using account.contacts << contact, this method doesn't load the relationships
+  # before setting the new relationship.
+  # This method is useful when certain modules have many links to other modules: not loading the
+  # relationships allows one ot avoid a Timeout::Error
+  def associate!(target, target_ids=[], opts={})
+    if self.class._module.custom_module? || target.class._module.custom_module?
+      link_field = get_link_field(target)
+    else
+      link_field = target.class._module.table_name
+    end
+    target_ids = [target.id] if target_ids.size < 1
+    response = SugarCRM.connection.set_relationship(
+      self.class._module.name, self.id, 
+      link_field, target_ids,
+      opts
+    )
+    raise AssociationFailed, 
+      "Couldn't associate #{self.class._module.name}: #{self.id} -> #{target.class._module.table_name}:#{target.id}!" if response["failed"] > 0
+    true
+  end
+  
   protected
   
   def save_modified_associations
@@ -70,5 +94,15 @@ module SugarCRM; module AssociationMethods
     @association_cache[association] = collection
     collection
   end
+  
+  # return the link field involving a relationship with a custom module
+  def get_link_field(other)
+    this_table_name = self.class._module.custom_module? ? self.class._module.name : self.class._module.table_name
+    that_table_name = other.class._module.custom_module? ? other.class._module.name : other.class._module.table_name
+    # the link field will contain the name of both modules
+    link_field = self.associations.detect{|a| a == [this_table_name, that_table_name].join('_') || a == [that_table_name, this_table_name].join('_')}
+    raise "Unable to determine link field between #{self.class._module.name}: #{self.id} and #{other.class._module.table_name}:#{other.id}" unless link_field
+    link_field
+  end
 
 end; end

data/lib/sugarcrm/base.rb

@@ -41,12 +41,7 @@ module SugarCRM; class Base
         when :first
           find_initial(options)
         when :all
-          results = find_every(options)
-          if results
-            Array.wrap(results)
-          else
-            []
-          end
+          Array.wrap(find_every(options)).compact
         else
           find_from_ids(args, options)
       end
@@ -158,7 +153,7 @@ module SugarCRM; class Base
         
     def find_by_sql(options)
       query = query_from_options(options)
-      SugarCRM.connection.get_entry_list(self._module.name, query, options)
+      SugarCRM.connection.get_entry_list(self._module.name, query, options) || nil # return nil instead of false if no results are found
     end
 
     def query_from_options(options)
@@ -342,6 +337,18 @@ module SugarCRM; class Base
   end
   alias :eql? :==
   
+  def update_attribute(name, value)
+    self.send("#{name}=".to_sym, value)
+    self.save
+  end
+  
+  def update_attributes(attributes)
+    attributes.each do |name, value|
+      self.send("#{name}=".to_sym, value)
+    end
+    self.save
+  end
+  
   # Delegates to id in order to allow two records of the same type and id to work with something like:
   #   [ Person.find(1), Person.find(2), Person.find(3) ] & [ Person.find(1), Person.find(4) ] # => [ Person.find(1) ]
   def hash

data/lib/sugarcrm/module.rb

@@ -20,7 +20,7 @@ module SugarCRM
       # custom attributes are contained in a table named after the module, with a '_cstm' suffix
       # the module's table name must be tableized for the modules that ship with SugarCRM
       # for custom modules (created in the Studio), table name don't need to be tableized: the name passed to the constructor is already tableized
-      unless name.downcase == name # this module is a custom module (custom module names are all lower_case, whereas SugarCRM modules are CamelCase
+      unless self.custom_module?
         @custom_table_name = @table_name + "_cstm"
       else
         @custom_table_name = name + "_cstm"
@@ -32,6 +32,12 @@ module SugarCRM
       self
     end
     
+    # return true if this module was created in the SugarCRM Studio (i.e. it is not part of the modules that
+    # ship in the dfault SugarCRM configuration
+    def custom_module?
+      name.downcase == name # custom module names are all lower_case, whereas SugarCRM modules are CamelCase
+    end
+    
     # Returns the fields associated with the module
     def fields
       return @fields if fields_registered?

data/test/test_associations.rb

@@ -4,6 +4,8 @@ class TestAssociations < Test::Unit::TestCase
   context "A SugarCRM::Base instance" do
     should "return an email address when sent #email_addresses" do
       u = SugarCRM::User.find("seed_sarah_id")
+      assert_instance_of SugarCRM::AssociationCollection, u.email_addresses
+      assert_instance_of SugarCRM::EmailAddress, u.email_addresses.first
       assert_equal "sarah@example.com", u.email_addresses.first.email_address
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sugarcrm
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Carl Hicks
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -08:00
+date: 2011-01-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency