sugarcrm 0.9.16 → 0.9.17

data/Gemfile.lock

@@ -1,15 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.10)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
     git (1.2.5)
     i18n (0.6.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    json (1.5.3)
-    rake (0.9.2)
+    json (1.6.1)
+    multi_json (1.0.3)
+    rake (0.9.2.2)
     shoulda (2.11.3)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.9.16
+0.9.17

data/lib/sugarcrm/attributes/attribute_methods.rb

@@ -164,9 +164,12 @@ module SugarCRM; module AttributeMethods
   
   # Wrapper for invoking save on modified_attributes
   # sets the id if it's a new record
-  def save_modified_attributes!
-    # Complain if we aren't valid
-    raise InvalidRecord, @errors.full_messages.join(", ") unless valid?
+  def save_modified_attributes!(opts={})
+    options = { :validate => true }.merge(opts)
+    if options[:validate]
+      # Complain if we aren't valid
+      raise InvalidRecord, @errors.full_messages.join(", ") unless valid?
+    end
     # Send the save request
     response = self.class.session.connection.set_entry(self.class._module.name, serialize_modified_attributes)
     # Complain if we don't get a parseable response back

data/lib/sugarcrm/base.rb

@@ -36,8 +36,13 @@ module SugarCRM; class Base
         sort_criteria = 'date_entered'
       elsif self.method_defined? :date_created
         sort_criteria = 'date_created'
+      # Added date_modified because TeamSets doesn't have a date_created or date_entered field.  
+      # There's no test for this because it's Pro and above only.
+      # Hope this doesn't break anything!
+      elsif self.method_defined? :date_modified
+        sort_criteria = 'date_modified'
       else
-        raise InvalidAttribute, "Unable to determine record creation date for sorting criteria: expected date_entered or date_created attribute to be present"
+        raise InvalidAttribute, "Unable to determine record creation date for sorting criteria: expected date_entered, date_created, or date_modified attribute to be present"
       end
       options = {:order_by => sort_criteria}.merge(options)
       validate_find_options(options)
@@ -152,11 +157,14 @@ module SugarCRM; class Base
 
   # Saves the current object, checks that required fields are present.
   # returns true or false
-  def save
+  def save(opts={})
+    options = { :validate => true }.merge(opts)
     return false if !(new_record? || changed?)
-    return false if !valid?
+    if options[:validate]
+      return false if !valid?
+    end
     begin
-      save!
+      save!(options)
     rescue
       return false
     end
@@ -165,8 +173,8 @@ module SugarCRM; class Base
   
   # Saves the current object, and any modified associations. 
   # Raises an exceptions if save fails for any reason.
-  def save!
-    save_modified_attributes!
+  def save!(opts={})
+    save_modified_attributes!(opts)
     save_modified_associations!
     true
   end
@@ -190,6 +198,11 @@ module SugarCRM; class Base
     self.attributes = self.class.find(self.id).attributes
   end
   
+  def blank?
+    @attributes.empty?
+  end
+  alias :empty? :blank?
+  
   # Returns true if +comparison_object+ is the same exact object, or +comparison_object+ 
   # is of the same type and +self+ has an ID and it is equal to +comparison_object.id+.
   #
@@ -238,7 +251,7 @@ module SugarCRM; class Base
   
   # Returns the URL (in string format) where the module instance is available in CRM
   def url
-    "#{SugarCRM.session.config[:base_url]}/index.php?module=#{self.class._module}&action=DetailView&record=#{self.id}"
+    "#{SugarCRM.session.config[:base_url]}/index.php?module=#{self.class._module.name}&action=DetailView&record=#{self.id}"
   end
     
   # Delegates to id in order to allow two records of the same type and id to work with something like:

data/lib/sugarcrm/connection/helper.rb

@@ -46,5 +46,5 @@ module SugarCRM; class Connection
   def b64_decode(file)
     Base64.decode64(file)
   end
-  
+    
 end; end

data/lib/sugarcrm/connection/request.rb

@@ -8,7 +8,7 @@ module SugarCRM; class Request
   def initialize(url, method, json, debug=false)
     @url      = url
     @method   = method
-    @json     = CGI.escape(json)
+    @json     = escape(json)
     @request  = 'method=' << @method.to_s
     @request << '&input_type=JSON'
     @request << '&response_type=JSON'
@@ -21,6 +21,20 @@ module SugarCRM; class Request
     self
   end
   
+  def escape(json)
+    # BUG: SugarCRM doesn't properly handle '&quot;' inside of JSON for some reason.  Let's unescape any html elements.
+    j = convert_reserved_characters(json)
+    # Now we escape the resulting string.
+    j = CGI.escape(j)
+    j
+  end
+  
+  # TODO: Fix this so that it JSON.parse will consume it.
+  def unescape
+    j = CGI.unescape(@json)
+    j.gsub!(/\n/, '')
+  end
+  
   def bytesize
     self.to_s.bytesize
   end
@@ -32,4 +46,15 @@ module SugarCRM; class Request
   def to_s
     @request
   end
+  
+  # A tiny helper for converting reserved characters for html encoding
+  def convert_reserved_characters(string)
+    string.gsub!(/&quot;/, '\"')
+    string.gsub!(/&apos;/, '\'')
+    string.gsub!(/&amp;/,  '\&')
+    string.gsub!(/&lt;/,   '\<')
+    string.gsub!(/&lt;/,   '\>')
+    string
+  end
+  
 end; end

data/lib/sugarcrm/extensions/README.txt

@@ -2,7 +2,7 @@
 
 SugarCRM::Contact.class_eval do
   def self.ten_oldest
-    self.find(:order_by => 'date_entered', :limit => 10)
+    self.all(:order_by => 'date_entered', :limit => 10)
   end
   
   def vip?

data/lib/sugarcrm/module.rb

@@ -122,7 +122,7 @@ module SugarCRM
     end  
       
     def to_s
-      @name
+      @klass
     end
     
     def to_class

data/sugarcrm.gemspec

@@ -4,14 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{sugarcrm}
-  s.version = "0.9.16"
+  s.name = "sugarcrm"
+  s.version = "0.9.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carl Hicks", "David Sulc"]
-  s.date = %q{2011-08-26}
-  s.default_executable = %q{sugarcrm}
-  s.email = %q{carl.hicks@gmail.com}
+  s.date = "2011-11-26"
+  s.email = "carl.hicks@gmail.com"
   s.executables = ["sugarcrm"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -83,10 +82,10 @@ Gem::Specification.new do |s|
     "./sugarcrm.gemspec",
     "./sugarcrm.tmproj"
   ]
-  s.homepage = %q{http://github.com/chicks/sugarcrm}
+  s.homepage = "http://github.com/chicks/sugarcrm"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A less clunky way to interact with SugarCRM via REST.}
+  s.rubygems_version = "1.8.11"
+  s.summary = "A less clunky way to interact with SugarCRM via REST."
   s.test_files = [
     "test/connection/test_get_available_modules.rb",
     "test/connection/test_get_entries.rb",
@@ -100,6 +99,7 @@ Gem::Specification.new do |s|
     "test/connection/test_login.rb",
     "test/connection/test_logout.rb",
     "test/connection/test_set_document_revision.rb",
+    "test/connection/test_set_entry.rb",
     "test/connection/test_set_note_attachment.rb",
     "test/connection/test_set_relationship.rb",
     "test/extensions_test/patch.rb",
@@ -110,6 +110,7 @@ Gem::Specification.new do |s|
     "test/test_connection_pool.rb",
     "test/test_finders.rb",
     "test/test_module.rb",
+    "test/test_request.rb",
     "test/test_response.rb",
     "test/test_session.rb",
     "test/test_sugarcrm.rb"

data/test/connection/test_set_entry.rb

@@ -0,0 +1,15 @@
+require 'helper'
+
+class TestSetEntry < ActiveSupport::TestCase
+  context "A SugarCRM.connection" do
+    should "set values on an Bean with #set_entry" do
+      
+      name_value_list = { 
+        "name"        => { "name" => "name",        "value" => "A Test Meeting" },
+        "date_start"  => { "name" => "date_start",  "value" => "2011-11-23 12:03:16" },
+        "description" => { "name" => "description", "value" => "RT @bumblebeenie &quot;It's Childish Gambino, home girl drop it like the Nasdaq&quot; Are you serious bro?" }
+      }
+      meeting = SugarCRM.connection.set_entry("Meetings", name_value_list)
+    end
+  end
+end

data/test/test_module.rb

@@ -7,7 +7,7 @@ class TestModule < ActiveSupport::TestCase
     end
     
     should "return required fields when #required_fields" do
-      assert SugarCRM::User._module.required_fields.include? :user_name
+      assert SugarCRM::Account._module.required_fields.include? :name
     end
     
     # TODO: Figure out a way to test this.

data/test/test_request.rb

@@ -0,0 +1,35 @@
+require 'helper'
+
+class TestRequest < ActiveSupport::TestCase
+  context "A SugarCRM::Request instance" do
+    setup do
+      @url    = "http://localhost/sugarcrm"
+      @method = "get_entry"
+      @json   =  <<-EOF 
+      {
+        "session": "an invalid session",
+        "module_name": "Accounts",
+        "name_value_list": { 
+          "name": { 
+            "name":  "name",        
+            "value": "A Test Meeting" },
+          "date_start": { 
+            "name":  "date_start",  
+            "value": "2011-11-23 12:03:16" },
+          "description": { 
+            "name":  "description", 
+            "value": "&quot;OMG HAI!&quot;" }
+        }
+      }
+      EOF
+      @json.gsub!(/^\s{6}/, '')
+      @request = SugarCRM::Request.new(@url, @method, @json, false)
+    end
+      
+    should "properly escape JSON" do
+      assert_equal "%7B%22hello%22%3A+%22%5C%22OMG+HAI%21%5C%22%22%7D", @request.escape('{"hello": "&quot;OMG HAI!&quot;"}')
+    end
+      
+  end
+end
+

data/test/test_sugarcrm.rb

@@ -187,8 +187,20 @@ class TestSugarCRM < ActiveSupport::TestCase
       user = SugarCRM::User.first
       assert_equal "#{SugarCRM.session.config[:base_url]}/index.php?module=Users&action=DetailView&record=#{user.id}", user.url
     end
+    
+    should "respond to #blank?" do
+      assert !SugarCRM::User.first.blank?
+    end
+    
+    should "bypass validation when #save(:validate => false)" do
+      u = SugarCRM::User.new
+      u.last_name = "doe"
+      assert u.save({:validate => false})
+      assert u.delete
+    end
   end
-  
+
+  # TODO: Fix this test so it creates the Note properly before asserting.
   context  "A SugarCRM::Note instance" do
     should "return the correct parent record with the `parent` method" do
       note = SugarCRM::Note.first
@@ -197,4 +209,5 @@ class TestSugarCRM < ActiveSupport::TestCase
       assert_equal note.parent_type.singularize, parent.class.to_s.split('::').last
     end
   end
+  
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sugarcrm
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 16
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors: 
 - Carl Hicks
@@ -16,98 +11,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 -07:00
-default_executable: sugarcrm
+date: 2011-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 3
-        - 10
         version: 2.3.10
-  name: activesupport
+  type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: i18n
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: i18n
+  type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: json
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: json
+  type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
+  name: shoulda
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: shoulda
+  type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
+  name: bundler
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  name: bundler
+  type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
+  name: jeweler
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
-  name: jeweler
+  type: :development
+  prerelease: false
   version_requirements: *id006
 description: 
 email: carl.hicks@gmail.com
@@ -197,6 +167,7 @@ files:
 - test/connection/test_login.rb
 - test/connection/test_logout.rb
 - test/connection/test_set_document_revision.rb
+- test/connection/test_set_entry.rb
 - test/connection/test_set_note_attachment.rb
 - test/connection/test_set_relationship.rb
 - test/extensions_test/patch.rb
@@ -207,11 +178,11 @@ files:
 - test/test_connection_pool.rb
 - test/test_finders.rb
 - test/test_module.rb
+- test/test_request.rb
 - test/test_response.rb
 - test/test_session.rb
 - test/test_sugarcrm.rb
 - bin/sugarcrm
-has_rdoc: true
 homepage: http://github.com/chicks/sugarcrm
 licenses: []
 
@@ -225,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3914223844168854610
       segments: 
       - 0
       version: "0"
@@ -234,14 +205,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A less clunky way to interact with SugarCRM via REST.
@@ -258,6 +226,7 @@ test_files:
 - test/connection/test_login.rb
 - test/connection/test_logout.rb
 - test/connection/test_set_document_revision.rb
+- test/connection/test_set_entry.rb
 - test/connection/test_set_note_attachment.rb
 - test/connection/test_set_relationship.rb
 - test/extensions_test/patch.rb
@@ -268,6 +237,7 @@ test_files:
 - test/test_connection_pool.rb
 - test/test_finders.rb
 - test/test_module.rb
+- test/test_request.rb
 - test/test_response.rb
 - test/test_session.rb
 - test/test_sugarcrm.rb