accounts_client 0.2.27 → 0.2.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a6317fe59bd0d8df3b71cc5a3565d54237731d
-  data.tar.gz: aa10d37d3b8608e637e5df9bd3b594ef813d0874
+  metadata.gz: e155d578c4af832b80e36763cc48c209e35c6b4b
+  data.tar.gz: 634f81f73e24a11e88606c0287efd9e0bc961c5a
 SHA512:
-  metadata.gz: e31f78e293f256da5d1fc4f1106471a6093c4edebf2a74f18020f2b1ee46e5f6c67a95b574a7eb03beec3876a80aaef5f93e91dd1477f64be39c6a4c0c1063ad
-  data.tar.gz: 7efdc47350c37c190bb311cfd4898cbc1fd14ed1b34f1346a198148b6b3eb096fcecf82f8a384f2f5ac2fbd0a365a2b47164094e9e660f84f9ba08d46d1002e0
+  metadata.gz: e13fdaac7c3ec88a11b465385c3e659113a4f314a2a9a657d1cd5740b707c8750ea174645072137a2d3a4c02b63ed7a43747718de2c5e70cd5dd8f5a6df19cfe
+  data.tar.gz: 144278a34bf14ae8a9b63d4c3d08ff7134ec4fbafff4c8bba68b494bc723581047ea3bb9293b9e83399fd85b1e443c23b1772c07506bf8ca30ebdf5423b3a188

data/app/models/padma_account.rb

@@ -72,6 +72,17 @@ class PadmaAccount < LogicalModel
 
     res
   end
+  
+  def self.find_with_rails_cache(account_name)
+    pa = Rails.cache.read([account_name,"padma_account"])
+    if pa.nil?
+      pa = PadmaAccount.find(account_name)
+      if pa
+        Rails.cache.write([account_name,"padma_account"], pa, :expires_in => 5.minutes)  
+      end
+    end
+    pa
+  end
 
   private
 

data/app/models/padma_user.rb

@@ -36,7 +36,7 @@ class PadmaUser < LogicalModel
   def current_account
     unless cached_current_account
       if self.current_account_name
-        self.cached_current_account= PadmaAccount.find(self.current_account_name)
+        self.cached_current_account= PadmaAccount.find_with_rails_cache(self.current_account_name)
       end
     end
     cached_current_account

data/lib/accounts/belongs_to_account.rb

@@ -22,7 +22,7 @@ module Accounts
     # @return [PadmaAccount / PadmaAccountDecorator]
     def account(options={})
       if self.padma_account.nil? || options[:force_service_call]
-        self.padma_account = get_account_from_padma(account_name)
+        self.padma_account = PadmaAccount.find_with_rails_cache(account_name)
       end
       ret = padma_account
       if options[:decorated] && padma_account
@@ -36,17 +36,6 @@ module Accounts
     end
 
     private
-    
-    def get_account_from_padma(account_name)
-      pa = Rails.cache.read([account_name,"padma_account"])
-      if pa.nil?
-        pa = PadmaAccount.find(account_name)
-        if pa
-          Rails.cache.write([account_name,"padma_account"], pa, :expires_in => 5.minutes)  
-        end
-      end
-      pa
-    end
 
     # If padma_account is setted with a PadmaAccount that doesn't match
     # account_id an exception will be raised

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: accounts_client
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.2.28
 platform: ruby
 authors:
 - Dwayne Macgowan