sugarcrm 0.8.1 → 0.8.2

data/README.rdoc

@@ -76,6 +76,13 @@ e.g. SugarCRM::Contacts.find_by_title("VP of Sales") will work, but SugarCRM::Co
   
   # Use the HTTP Connection and SugarCRM API to load the Admin user
   SugarCRM.connection.get_entry("Users", 1)
+  
+  # Retrieve the first 10 Accounts with a zip code between 10000 and 10500
+  SugarCRM::Account.all({
+    :conditions => { :billing_address_postalcode => ["> '10000'", "<= '10500'" ] },
+    :limit => '10',
+    :order_by => 'billing_address_postalcode'
+  })
 
   # Retrieve all Accounts by user name (direct API method)
   SugarCRM.connection.get_entry_list(

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/sugarcrm/attribute_methods.rb

@@ -54,9 +54,9 @@ module SugarCRM; module AttributeMethods
       case attr_type_for(attribute)
       when "bool"
         case @attributes[attribute]
-        when TrueClass:
+        when TrueClass
           next
-        when FalseClass:
+        when FalseClass
           next
         else
           @errors.add "#{attribute} must be true or false"

data/lib/sugarcrm/base.rb

@@ -129,8 +129,23 @@ module SugarCRM; class Base
       # If we dont have conditions, just return an empty query
       return "" unless options[:conditions]
       conditions = []
-      options[:conditions].each_pair do |column, value| 
-        conditions << "#{self._module.table_name}.#{column} = \'#{value}\'"
+      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]
+          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 customer attribute, don't add model table name (or query breaks)
+          end
+          conditions << "#{condition_attribute} #{operator} \'#{value}\'"
+        }
       end
       conditions.join(" AND ")
     end
@@ -270,7 +285,7 @@ module SugarCRM; class Base
     end
     
     VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset,
-                           :order, :select, :readonly, :group, :having, :from, :lock ]
+                           :order_by, :select, :readonly, :group, :having, :from, :lock ]
 
     def validate_find_options(options) #:nodoc:
       options.assert_valid_keys(VALID_FIND_OPTIONS)

data/test/test_sugarcrm.rb

@@ -74,6 +74,16 @@ class TestSugarCRM < Test::Unit::TestCase
       #SugarCRM.connection.debug = false
     end
     
+    should "support searching based on conditions" do
+      accounts = SugarCRM::Account.all({
+        :conditions => { :billing_address_postalcode => ["> '70000'", "< '72000'" ] },
+        :limit => '10',
+       	:order_by => 'billing_address_postalcode'
+      })
+      assert_instance_of Array, 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

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sugarcrm
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Carl Hicks
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -08:00
+date: 2010-12-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency