sugarcrm 0.9.3 → 0.9.4

data/README.rdoc

@@ -115,6 +115,11 @@ Instead of SugarCRM.connection.get_entry("Users", "1") you could use SugarCRM::U
     :conditions => { :billing_address_postalcode => "<> NULL" }
   })
   
+  # Retrieve all Accounts with 'Fund' in their name
+  SugarCRM::Account.all({
+    :conditions => { :name => "LIKE '%Fund%'" } # note that SQL operators must be uppercase
+  })
+  
   # Look up the fields for a given module
   SugarCRM::Module.find("Accounts").fields
   

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/sugarcrm/attributes/attribute_methods.rb

@@ -17,6 +17,29 @@ module SugarCRM; module AttributeMethods
       end
       table_name
     end
+    # Takes a condition like: [:zip, ["> 75000", "< 80000"]]
+    # and flattens it to: ["accounts.zip > 75000", "accounts.zip < 80000"]
+    def flatten_conditions_for(condition)
+      conditions = []
+      attribute, attribute_conditions = condition
+      # Make sure we wrap the attribute condition in an array for EZ handling...
+      Array.wrap(attribute_conditions).each do |attribute_condition| 
+        # parse operator in cases where: 
+        #   :attribute => '>= some_value', 
+        #   :attribute => "LIKE '%value%'", 
+        # fallback to '=' operator as default]
+        operator = attribute_condition.to_s[/^([!<>=]*(LIKE|IS|NOT|\s)*)(.*)$/,1].strip!
+        # Default to = if we can't resolve the condition.
+        operator ||= '=' 
+        # Extract value from query
+        value = $3 
+        # TODO: Write a test for sending invalid attribute names.  
+        # strip single quotes
+        value = value.strip[/'?([^']*)'?/,1] 
+        conditions << "#{table_name_for(attribute)}.#{attribute} #{operator} \'#{value}\'"
+      end
+      conditions
+    end
   end
     
   # Determines if attributes or associations have been changed

data/lib/sugarcrm/base.rb

@@ -152,23 +152,14 @@ module SugarCRM; class Base
       query = query_from_options(options)
       SugarCRM.connection.get_entry_list(self._module.name, query, options)
     end
-    
+
     def query_from_options(options)
       # If we dont have conditions, just return an empty query
       return "" unless options[:conditions]
       conditions = []
-      options[:conditions].each_pair do |column, v| 
-        v = [] << v unless v.class == Array
-        
-        v.each{|value|
-          # parse operator in cases where (e.g.) :attribute => '>= some_value', fallback to '=' operator as default
-          operator = value.to_s[/^([<>=]*)(.*)$/,1]
-          operator = '=' if operator.nil? || operator.strip == ''
-          
-          value = $2 # strip the operator from value passed to query
-          value = value.strip[/'?([^']*)'?/,1]
-          conditions << "#{table_name_for(column)}.#{column} #{operator} \'#{value}\'"
-        }
+      options[:conditions].each do |condition|
+        # Merge the result into the conditions array
+        conditions |= flatten_conditions_for(condition)
       end
       conditions.join(" AND ")
     end

data/lib/sugarcrm/module.rb

@@ -15,7 +15,17 @@ module SugarCRM
       @name   = name
       @klass  = name.classify
       @table_name = name.tableize
-      @custom_table_name = @table_name + "_cstm"
+      
+      # set table name for custom attibutes
+      # 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
+        @custom_table_name = @table_name + "_cstm"
+      else
+        @custom_table_name = name + "_cstm"
+      end
+      
       @fields = {}
       @link_fields = {}
       @fields_registered = false

data/test/test_sugarcrm.rb

@@ -97,6 +97,14 @@ class TestSugarCRM < Test::Unit::TestCase
       assert_instance_of SugarCRM::Account, accounts.first
     end
     
+    should "support searching based on SQL operators" do
+      accounts = SugarCRM::Account.all({
+        :conditions => { :name => "LIKE '%Inc%'" }
+      })
+      assert accounts
+      assert_instance_of SugarCRM::Account, accounts.first
+    end
+    
     should "return an an instance of itself when sent #find(id)" do
       assert_instance_of SugarCRM::User, SugarCRM::User.find(1)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Carl Hicks
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 -08:00
+date: 2011-01-07 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: -1102479478873110582
+      hash: -2099227492656529688
       segments: 
       - 0
       version: "0"