salesforce-orm 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb0dde57d9050992b024e0d2f99cf4fe2cddc00e
-  data.tar.gz: 0d4222f8240e6946145638fe9e2c1243c193217b
+  metadata.gz: 6eb419aebf2a6276cbc5ad7d63b682801b8c266f
+  data.tar.gz: a7a8b85a244d6ebdd9b7ece1eceb0589cdb2900e
 SHA512:
-  metadata.gz: 391a7ad141a6d1327facc4d295cb81ad7024fc405132ec474cbfbf0d539fe1f554c67e8bd48596b52dd6f52c326dd2716d56c22333eb6af76df5e83279bc871b
-  data.tar.gz: 83c41aa9e670584e21549f6d9dd7d4d3131a39da5aebe0b7e4b17fdee7c3f681f1f0bc44433a8e77c96bf6adf6ff09d0d3e6ac7216b3b9e3efb44299db81d4a0
+  metadata.gz: 8cb29f0422b63d345733f975508121cffbfbc63db140772216941451c2669cccb19b480bd9b400656cc8c384c875918ef439c52b4cfc5b0035cdbaaeb4149a72
+  data.tar.gz: 0a441080b12414e381aa2f8cf6bd2c1e91c21f49bd6f467177615a5d551de1d55eb155e6cc77d6d0db5ad7af2e598384d7e00690b2c548d6f317dd8e0b62fe8f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    salesforce-orm (1.1.1)
+    salesforce-orm (1.2.0)
       activerecord (~> 3)
       activerecord-nulldb-adapter (~> 0)
       restforce (~> 2.5)

data/lib/salesforce-orm/awesome_print.rb

@@ -0,0 +1,20 @@
+module SalesforceOrm
+  module AwesomePrint
+    def self.included(base)
+      base.send :alias_method, :cast_without_salesforce_orm_base, :cast
+      base.send :alias_method, :cast, :cast_with_salesforce_orm_base
+    end
+
+    def cast_with_salesforce_orm_base(object, type)
+      cast = cast_without_salesforce_orm_base(object, type)
+      if (defined?(Base)) && (object.is_a?(Base))
+        cast = :array
+      end
+      cast
+    end
+  end
+
+  if defined?(::AwesomePrint::Formatter)
+    ::AwesomePrint::Formatter.send(:include, AwesomePrint)
+  end
+end

data/lib/salesforce-orm/base.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'time'
 require_relative 'sql_to_soql'
 
 module SalesforceOrm
@@ -7,7 +8,13 @@ module SalesforceOrm
     include Enumerable, SqlToSoql
     extend Forwardable
 
-    def_delegators :make_query, *([:each] + Enumerable.instance_methods)
+    def_delegators :make_query, *([
+      :each,
+      :empty?,
+      :size,
+      :map,
+      :inspect
+    ] + Enumerable.instance_methods)
 
     attr_reader :builder, :client, :klass
 
@@ -69,6 +76,7 @@ module SalesforceOrm
 
     # Handling select differently because we select all the fields by default
     def select(*args)
+      @results = nil
       except(:select)
       @builder = builder.select(*args)
       self
@@ -85,6 +93,7 @@ module SalesforceOrm
       :reorder
     ].each do |method_name|
       define_method(method_name) do |*args|
+        @results = nil
         @builder = builder.send(method_name, *args)
         self
       end
@@ -107,7 +116,8 @@ module SalesforceOrm
     end
 
     def make_query
-      begin
+      return @results if @results
+      @results = begin
         soql = to_soql
         client.query(to_soql).find_all.map do |object|
           build(object)
@@ -169,7 +179,11 @@ module SalesforceOrm
         value.to_i
       when :date_time
         return nil if value.blank?
-        Time.zone.parse(value)
+        if Time.respond_to?(:zone) && Time.zone
+          Time.zone.parse(value)
+        else
+          Time.parse(value)
+        end
       when :array
         return [] if value.blank?
         value.split(';')

data/lib/salesforce-orm/object_base.rb

@@ -64,5 +64,13 @@ module SalesforceOrm
         self.class.orm.send(method_name, *([self] + args))
       end
     end
+
+    def to_hash
+      to_h
+    end
+
+    def inspect
+      to_h
+    end
   end
 end

data/lib/salesforce-orm/sql_to_soql.rb

@@ -4,19 +4,13 @@ module SalesforceOrm
       keyword =~ /^(AVG|COUNT|COUNT|COUNT_DISTINCT|MIN|MAX|SUM)\(/i
     end
 
-    def convert_aliased_fields(sql_str, split_by = Regexp.new('\s+'), join_by = ' ')
-      spcial_char_regex = /[=<>!,]+/
-      sql_str.split(split_by, -1).map do |keyword|
-        if aggregate_function?(keyword)
-          aggregate_data = keyword.match(/^(.*)\((.*)(\).*)/i).captures
-          raise Error::CommonError, 'Invalid aggregate function' unless aggregate_data[1]
-          "#{aggregate_data[0]}(#{convert_aliased_fields(aggregate_data[1])}#{aggregate_data[2]}"
-        elsif keyword =~ spcial_char_regex
-          convert_aliased_fields(keyword, spcial_char_regex, keyword.gsub(spcial_char_regex).first)
-        else
-          klass.field_map[keyword.to_sym] || keyword
-        end
-      end.join(join_by)
+    def convert_aliased_fields(sql_str)
+      result = sql_str.clone
+      klass.field_map.keys.each do |k|
+        regex = Regexp.new("([\(\)=<>!,%'\s\t]+)#{k.to_s}([\(\)=<>!,%'\s\t]+|$)")
+        result.gsub!(regex, "\\1#{klass.field_map[k].to_s}\\2")
+      end
+      result.gsub!(/\s+/, ' ')
     end
 
     def boolean_data_type_conversion(sql)

data/lib/salesforce-orm/version.rb

@@ -1,3 +1,3 @@
 module SalesforceOrm
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-orm
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Vishal Vijay
@@ -128,6 +128,7 @@ files:
 - Rakefile
 - build.sh
 - lib/salesforce-orm.rb
+- lib/salesforce-orm/awesome_print.rb
 - lib/salesforce-orm/base.rb
 - lib/salesforce-orm/configuration.rb
 - lib/salesforce-orm/error.rb