sugarcrm 0.9.2 → 0.9.3

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/sugarcrm/associations/association_collection.rb

@@ -56,12 +56,13 @@ module SugarCRM
       @original - @collection
     end
     
-    # Removes an record from the collection, uses the id of the record as a test for inclusion.
+    # Removes a record from the collection, uses the id of the record as a test for inclusion.
     def delete(record)
       load
       raise InvalidRecord, "#{record.class} does not have a valid :id!" if record.id.empty?
       @collection.delete record
     end
+    alias :remove :delete
 
     # Checks if a record is included in the current collection.  Uses id's as comparison
     def include?(record)

data/lib/sugarcrm/attributes/attribute_methods.rb

@@ -9,6 +9,14 @@ module SugarCRM; module AttributeMethods
       end
       fields
     end
+    # Returns the table name for a given attribute
+    def table_name_for(attribute)
+      table_name = self._module.table_name
+      if attribute.to_s =~ /_c$/
+        table_name = self._module.custom_table_name
+      end
+      table_name
+    end
   end
     
   # Determines if attributes or associations have been changed

data/lib/sugarcrm/base.rb

@@ -167,12 +167,7 @@ module SugarCRM; class Base
           
           value = $2 # strip the operator from value passed to query
           value = value.strip[/'?([^']*)'?/,1]
-          unless column =~ /_c$/ # attribute name ending with _c implies a custom attribute
-            condition_attribute = "#{self._module.table_name}.#{column}"
-          else
-            condition_attribute = column # if setting a condition on a custom attribute (i.e. created by user in Studio), don't add model table name (or query breaks)
-          end
-          conditions << "#{condition_attribute} #{operator} \'#{value}\'"
+          conditions << "#{table_name_for(column)}.#{column} #{operator} \'#{value}\'"
         }
       end
       conditions.join(" AND ")

data/lib/sugarcrm/connection/connection.rb

@@ -121,8 +121,12 @@ module SugarCRM; class Connection
     raise SugarCRM::EmptyResponse unless @response.body
     # Some methods are dumb and don't return a JSON Response
     return @response.body if RESPONSE_IS_NOT_JSON.include? @request.method
-    # Push it through the old meat grinder.
-    response_json = ActiveSupport::JSON.decode(@response.body)
+    begin
+      # Push it through the old meat grinder.
+      response_json = ActiveSupport::JSON.decode(@response.body)
+    rescue StandardError => e
+      raise UnhandledResponse, @response.body
+    end
     # Empty result.  Is this wise?
     return false if response_json["result_count"] == 0
     # Filter debugging on REALLY BIG responses

data/lib/sugarcrm/module.rb

@@ -1,11 +1,12 @@
 module SugarCRM
   # A class for handling SugarCRM Modules
   class Module
-    attr :name, false
-    attr :table_name, false
-    attr :klass, false
-    attr :fields, false
-    attr :link_fields, false
+    attr :name, true
+    attr :table_name, true
+    attr :custom_table_name, true
+    attr :klass, true
+    attr :fields, true
+    attr :link_fields, true
 
     # Dynamically register objects based on Module name
     # I.e. a SugarCRM Module named Users will generate
@@ -14,6 +15,7 @@ module SugarCRM
       @name   = name
       @klass  = name.classify
       @table_name = name.tableize
+      @custom_table_name = @table_name + "_cstm"
       @fields = {}
       @link_fields = {}
       @fields_registered = false

data/test/test_module.rb

@@ -14,5 +14,9 @@ class TestModule < Test::Unit::TestCase
     should "return required fields when #required_fields" do
       assert SugarCRM::User._module.required_fields.include? :user_name
     end
+    
+    should "return the custom table name when #custom_table_name" do
+      assert_equal "accounts_cstm", SugarCRM::Account._module.custom_table_name
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Carl Hicks
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -08:00
+date: 2011-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2866682332345860933
+      hash: -1102479478873110582
       segments: 
       - 0
       version: "0"