salesforce_fsdb 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 0.0.2
+- Use SObject types in filenames
+
 = 0.0.1
 - Initial release
 - Filesystem cache of Account, Contact, Opportunity and User sObjects.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/salesforce_fsdb/client.rb

@@ -9,31 +9,21 @@ module SalesforceFsdb
       @oSfRestClient  = SalesforceFsdb::RestClient.new(dParamsGeneral,dParamsToken)
       @sFsdbBaseDir   = dParamsGeneral[:data_dir] || '.'
       @iMaxAgeSec     = dParamsGeneral[:max_age]  || 3600*24*7
-      @dType3ToType   = {
-        'Account'     => 'act',
-        'Contact'     => 'con',
-        'Opportunity' => 'opp',
-        'User'        => 'usr'
-      }
     end
-    def getFileForSfidAndType(sSfid=nil,sType3=nil)
-      sType3 = @dType3ToType[sType3] || sType3
-      sFile  = %Q{sf_#{sType3}_#{sSfid}.json}
+    def getFileForSfidAndType(sSfid=nil,sType=nil)
+      sFile  = %Q{sf_#{sType}_#{sSfid}.json}
       return sFile
     end
-    def getDirForType(sType3=nil)
-      sType3 = @dType3ToType[sType3] || sType3
-      sDir   = File.join(@sFsdbBaseDir,sType3)
+    def getDirForType(sType=nil)
+      sDir   = File.join(@sFsdbBaseDir,sType)
       return sDir
     end
-    def getPathForSfidAndType(sSfid=nil,sType3=nil)
-      sType3 = @dType3ToType[sType3] || sType3
-      sPath  = File.join( self.getDirForType(sType3), self.getFileForSfidAndType(sSfid,sType3))
+    def getPathForSfidAndType(sSfid=nil,sType=nil)
+      sPath  = File.join( self.getDirForType(sType), self.getFileForSfidAndType(sSfid,sType))
       return sPath
     end
-    def getSobjectForSfidAndType(sSfid=nil,sType3=nil)
-      sType3    = @dType3ToType[sType3] || sType3
-      sPath     = self.getPathForSfidAndType(sSfid,sType3)
+    def getSobjectForSfidAndType(sSfid=nil,sType=nil)
+      sPath     = self.getPathForSfidAndType(sSfid,sType)
       dObj      = { :meta => { :iEpochRetrieved => -1, :iStatus => 404 } }
       iEpochNow = Time.now.to_i
       if File.exists?(sPath)
@@ -49,13 +39,13 @@ module SalesforceFsdb
           end
         end
       end
-      return self.getSobjectForSfidAndTypeFromRemote(sSfid,sType3)
+      return self.getSobjectForSfidAndTypeFromRemote(sSfid,sType)
     end
-    def getSobjectForSfidAndTypeFromRemote(sSfid=nil,sType3=nil)
-      dObj = @oSfRestClient.getSobjectForSfidAndType(sSfid,sType3)
+    def getSobjectForSfidAndTypeFromRemote(sSfid=nil,sType=nil)
+      dObj = @oSfRestClient.getSobjectForSfidAndType(sSfid,sType)
       if dObj.has_key?(:Id)
-        sDir        = self.getDirForType(sType3)
-        sPath       = self.getPathForSfidAndType(sSfid,sType3)
+        sDir        = self.getDirForType(sType)
+        sPath       = self.getPathForSfidAndType(sSfid,sType)
         FileUtils.mkdir_p(sDir) if ! Dir.exists?(sDir)
         File.open(sPath,'w') do |fTop|
           dTop      =  {

data/lib/salesforce_fsdb/rest_client.rb

@@ -12,12 +12,6 @@ module SalesforceFsdb
       @sApiFqdn     = dParamsGeneral.has_key?(:api_fqdn)    ? dParamsGeneral[:api_fqdn] : 'na5.salesforce.com'
       @sApiVersion  = dParamsGeneral.has_key?(:api_version) ? dParamsGeneral[:api_version] : '27.0'
       @dTokenRes    = {}
-      @dType3ToType = {
-        'act' => 'Account',
-        'con' => 'Contact',
-        'opp' => 'Opportunity',
-        'usr' => 'User'
-      }
       self.loadToken()
     end
     def loadToken()
@@ -35,19 +29,14 @@ module SalesforceFsdb
       return dHeaders
     end
     def getSoqlResults(sSoql=nil)
-      dQry = { :q => sSoql}
-      sUrl = "https://#{@sApiFqdn}/services/data/v#{@sApiVersion}/query"
-      oRes = Faraday.get(sUrl,dQry)
-      dRes = JSON.parse(oRes.body,:symbolize_names=>true)
+      dQry  = { :q => sSoql}
+      sUrl  = "https://#{@sApiFqdn}/services/data/v#{@sApiVersion}/query"
+      dHead = self.getHeaders()
+      oRes  = Faraday.get(sUrl,dQry,dHead)
+      dRes  = JSON.parse(oRes.body,:symbolize_names=>true)
       return dRes
     end
-    def getNormalizedType(sType=nil)
-      #sType = @dType3ToType[sType] if @dType3ToType.has_key?(sType)
-      sType = @dType3ToType[sType] || sType
-      return sType  
-    end
     def getSfUrlForSfidAndType(sSfid=nil,sType=nil)
-      sType = self.getNormalizedType(sType)
       sUrl  = "https://#{@sApiFqdn}/services/data/v#{@sApiVersion}/sobjects/#{sType}/#{sSfid}/"
       return sUrl
     end

data/salesforce_fsdb.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'salesforce_fsdb'
-  s.version     = '0.0.1'
-  s.date        = '2014-01-27'
+  s.version     = '0.0.2'
+  s.date        = '2014-01-28'
   s.summary     = 'Salesforce Filesystem DB'
   s.description = 'Filesystem cache manager for Salesforce sObjects'
   s.authors     = ['John Wang']

data/test/test_setup.rb

@@ -21,7 +21,7 @@ class SalesforceFsdbTest < Test::Unit::TestCase
     sfFsdbClient = SalesforceFsdb::Client.new(paramsGeneral,paramsToken)
     accountDir   = sfFsdbClient.getDirForType('Account')
 
-    assert_equal accountDir, File.join(paramsGeneral[:data_dir],'act')
+    assert_equal accountDir, File.join(paramsGeneral[:data_dir],'Account')
 
     tokenUrl     = 'https://login.salesforce.com/services/oauth2/token'
     assert_equal tokenUrl, sfFsdbClient.oSfRestClient.sSfTokenUrl

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_fsdb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - John Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies: []
 description: Filesystem cache manager for Salesforce sObjects
 email: johncwang@gmail.com
@@ -21,32 +22,33 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- salesforce_fsdb.gemspec
 - lib/salesforce_fsdb/client.rb
 - lib/salesforce_fsdb/rest_client.rb
-- salesforce_fsdb.gemspec
 - test/test_setup.rb
 homepage: http://johnwang.com/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Salesforce Filesystem DB
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: b9202234becb758cb247e79a0c299c33718f3cb5
-  data.tar.gz: 5e2049d2b4f535dc1841128c479040678e809466
-SHA512:
-  metadata.gz: a570ecbd949fb17204ea58681c5a4bb7100bbfc3113f40d46e7dd20bed05fde7e5d8640916e5661bc05e41e9d2077656783b7f37b5681c9a5ee274964f79d5c4
-  data.tar.gz: a5df11edcd11aa61c5dfa4965be04dbe69a3db18c9be6cdb48b923dba1dbba844b22269f899d62fe8c84c2158a07e53f63acb5d94b327b9ec895dae6038ae3e1