vault-rails 0.0.8 → 0.0.9

data/lib/vault-rails/version.rb

@@ -1,5 +1,5 @@
 module Vault
   module Rails
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/vendor/assets/javascripts/vault.js.coffee

@@ -3,8 +3,11 @@ class Vault
     # Setup some internal variables.
     @objects = []
     @dirty_object_count = 0
-    @errors = []
     @save_error_count = 0
+    @messages =
+      notices: []
+      warnings: []
+      errors: []
 
     # This property is used to temporarily lock the vault during mutation methods.
     @locked = false
@@ -38,36 +41,63 @@ class Vault
         if @load()
           if @dirty_object_count > 0
             # Offline data loaded and modifications found; keep existing data.
-            
+            @messages.notices.push "Found and using dirty offline data."
+
             # Detach the callback to after_load so that the call to the
             # vault constructor can complete/return, allowing any post-load code
             # to use the newly instantiated vault object as required.
             window.setTimeout @options.after_load, 100
           else
             # No modifications in offline data; reload fresh data.
+            @messages.notices.push "No modifications found in offline data. Reloading..."
+
             if @urls.list?
               @reload(@options.after_load)
             else
-              # Can't reload without a list url; use the offline data.
-              @options.after_load()
+              # Can't reload without a list url; use the offline data we've loaded.
+              @messages.notices.push "List url not configured; using offline data instead."
+            
+              # Detach the callback to after_load so that the call to the
+              # vault constructor can complete/return, allowing any post-load code
+              # to use the newly instantiated vault object as required.
+              window.setTimeout @options.after_load, 100
         else
           if navigator.onLine
             # Load failed, but we're connected; reload fresh data.
+            @messages.warnings.push "Offline data load failed. Reloading..."
+            
             if @urls.list?
               @reload(@options.after_load)
             else
               # Can't reload without a list url; use an empty dataset.
-              @options.after_load()
+              @messages.warnings.push "List url not configured; using empty dataset instead."
+            
+              # Detach the callback to after_load so that the call to the
+              # vault constructor can complete/return, allowing any post-load code
+              # to use the newly instantiated vault object as required.
+              window.setTimeout @options.after_load, 100
           else
-            # Load failed and we're offline; log an error.
-            @errors.push "Offline data failed to load. Could not load live data as browser is offline."
+            # Load failed and we're offline; use an empty dataset.
+            @messages.warnings.push "Browser is offline and cannot reload; using empty dataset instead."
+            
+            # Detach the callback to after_load so that the call to the
+            # vault constructor can complete/return, allowing any post-load code
+            # to use the newly instantiated vault object as required.
+            window.setTimeout @options.after_load, 100
       else
         # Not using offline data; reload fresh data.
+        @messages.notices.push "Not configured for offline data. Reloading..."
+
         if @urls.list?
           @reload(@options.after_load)
         else
           # Can't reload without a list url; use an empty dataset.
-          @options.after_load()
+          @messages.notices.push "List url not configured; using empty dataset instead."
+            
+          # Detach the callback to after_load so that the call to the
+          # vault constructor can complete/return, allowing any post-load code
+          # to use the newly instantiated vault object as required.
+          window.setTimeout @options.after_load, 100
     
     # Create convenience attributes for sub-collections.
     for sub_collection in @options.sub_collections
@@ -93,7 +123,7 @@ class Vault
   add: (object) ->
     # Don't bother if the vault is locked.
     if @locked
-      @errors.push 'Cannot add, vault is locked.'
+      @messages.errors.push 'Cannot add, vault is locked.'
       return false
 
     # If the object has no id, generate a temporary one and add it to the object.
@@ -128,7 +158,7 @@ class Vault
   update: (attributes, id) ->
     # Don't bother if the vault is locked.
     if @locked
-      @errors.push 'Cannot update, vault is locked.'
+      @messages.errors.push 'Cannot update, vault is locked.'
       return false
             
     # Get the id of the object from the attributes if it's not explicitly defined.
@@ -137,7 +167,7 @@ class Vault
     # Get the object; return if it's undefined.
     object = @find(id)
     unless object?
-      @errors.push 'Cannot update, object not found.'
+      @messages.errors.push 'Cannot update, object not found.'
       return false
 
     # Flag it as dirty.
@@ -162,7 +192,7 @@ class Vault
   delete: (id) ->
     # Don't bother if the vault is locked.
     if @locked
-      @errors.push 'Cannot delete, vault is locked.'
+      @messages.errors.push 'Cannot delete, vault is locked.'
       return false
 
     for object, index in @objects
@@ -192,7 +222,7 @@ class Vault
   destroy: (id) ->
     # Don't bother if the vault is locked.
     if @locked
-      @errors.push 'Cannot delete, vault is locked.'
+      @messages.errors.push 'Cannot delete, vault is locked.'
       return false
 
     for object, index in @objects
@@ -219,13 +249,13 @@ class Vault
   save: (id, after_save = ->) ->
     # Don't bother if the vault is locked, we're offline or there's nothing to sync.
     if @locked
-      @errors.push 'Cannot save, vault is locked.'
+      @messages.errors.push 'Cannot save, vault is locked.'
       return after_save()
     else if not navigator.onLine
-      @errors.push 'Cannot save, navigator is offline.'
+      @messages.errors.push 'Cannot save, navigator is offline.'
       return after_save()
     else if @dirty_object_count is 0
-      @errors.push 'Nothing to save.'
+      @messages.errors.push 'Nothing to save.'
       return after_save()
 
     # Lock the vault until the save is complete.
@@ -253,7 +283,7 @@ class Vault
                 @objects.splice(index, 1)
                 @dirty_object_count--
           error: =>
-            @errors.push 'Failed to delete.'
+            @messages.errors.push 'Failed to delete.'
           complete: =>
             # Store the collection, unlock the vault, and execute the callback method.
             @store
@@ -281,7 +311,7 @@ class Vault
             object.status = "clean"
             @dirty_object_count--
           error: =>
-            @errors.push 'Failed to create.'
+            @messages.errors.push 'Failed to create.'
           complete: =>
             # Store the collection, unlock the vault, and execute the callback method.
             @store
@@ -299,7 +329,7 @@ class Vault
             object.status = "clean"
             @dirty_object_count--
           error: =>
-            @errors.push 'Failed to update.'
+            @messages.errors.push 'Failed to update.'
           complete: =>
             # Store the collection, unlock the vault, and execute the callback method.
             @store
@@ -311,13 +341,13 @@ class Vault
   reload: (after_load = ->) ->
     # Don't bother if the vault is locked or we're offline.
     if @locked
-      @errors.push 'Cannot reload, vault is locked.'
+      @messages.errors.push 'Cannot reload, vault is locked.'
       return after_load()
     else if not navigator.onLine
-      @errors.push 'Cannot reload, navigator is offline.'
+      @messages.errors.push 'Cannot reload, navigator is offline.'
       return after_load()
     else if not @urls.list?
-      @errors.push 'Cannot reload, list url is not configured.'
+      @messages.errors.push 'Cannot reload, list url is not configured.'
       return after_load()
 
     # Lock the vault until the reload is complete.
@@ -343,7 +373,7 @@ class Vault
         # Call the callback function as the reload is complete.
         after_load()
       error: =>
-        @errors.push 'Failed to list.'
+        @messages.errors.push 'Failed to list.'
 
         # Call the callback function as the reload is complete (albeit unsuccessful).
         after_load()
@@ -355,12 +385,12 @@ class Vault
   synchronize: (after_sync = ->) ->
     # Don't bother if we're offline.
     unless navigator.onLine
-      @errors.push 'Cannot synchronize, navigator is offline.'
+      @messages.errors.push 'Cannot synchronize, navigator is offline.'
       return after_sync()
 
     @save =>
       # Only reload the collection if there were no save errors.
-      if @errors.length is 0
+      if @messages.errors.length is 0
         @reload(after_sync)
       else
         after_sync()
@@ -439,7 +469,7 @@ class Vault
           object[sub_collection].add = (sub_object) =>
             # Don't bother if the vault is locked.
             if @locked
-              @errors.push 'Cannot add sub-object, vault is locked.'
+              @messages.errors.push 'Cannot add sub-object, vault is locked.'
               return false
             
             # Set a status on the object.
@@ -474,7 +504,7 @@ class Vault
           object[sub_collection].delete = (id) =>
             # Don't bother if the vault is locked.
             if @locked
-              @errors.push 'Cannot delete sub-object, vault is locked.'
+              @messages.errors.push 'Cannot delete sub-object, vault is locked.'
               return false
             
             # Remove the sub-object from its collection.
@@ -499,7 +529,7 @@ class Vault
           object[sub_collection].update = (attributes, id) =>
             # Don't bother if the vault is locked.
             if @locked
-              @errors.push 'Cannot update sub-object, vault is locked.'
+              @messages.errors.push 'Cannot update sub-object, vault is locked.'
               return false
             
             # Get the id of the sub-object from the attributes if it's not explicitly defined.
@@ -508,7 +538,7 @@ class Vault
             # Get the sub-object; return if it's undefined.
             sub_object = object[sub_collection].find(id)
             unless sub_object?
-              @errors.push 'Cannot update, sub-object not found.'
+              @messages.errors.push 'Cannot update, sub-object not found.'
               return false
 
             # If the root object was clean, flag it and increase the count of dirty objects.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000Z
+date: 2011-12-02 00:00:00.000000000Z
 dependencies: []
 description: Store and manage collections of objects without a connection.
 email: