slender_data 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2a4d6640c1c899ed463efac094b63e324ad259
-  data.tar.gz: 13e669428df267a50b7a7c0a0c04f455ebf62997
+  metadata.gz: edfb448b592349bc27147d420b9e7e793ba2c48f
+  data.tar.gz: 3da1858b7dbf70899e60d5dd1f5a7d250eaa9fd7
 SHA512:
-  metadata.gz: ddd326499a608b42c30345e0f054b71b9ee263e965bf5c545da0ea82eb94b0cee901d845ba9a525c432522bd6ce232a9d45cae45d8907d18683fd22926940485
-  data.tar.gz: 17578f5f46ca6f2e56c69e56bf98c4402df15f01c09da3bee5218b8ff6982b4a0fcdfea2f5dec1727284fc9a61f1169b3e90b5015e6b611258df55f33f4ea8b7
+  metadata.gz: 200eed1ae5f04053007f93dbb3362ea3e12044529f1cee0a2fd26d12bfd751abf1254a30054039a45c94a65d423225cb255192d4c26887be43ec364f373899f1
+  data.tar.gz: dd510f888dd8b05d7b0ff21d8cc24e6b50e0544bd547eacd06cc7588987257e3d88ee5bbc2c4a51e022f29b5bebfaa850273a0a93e4dad01d186bdfce3207c04

data/app/assets/javascripts/slender_data/brest_loader.coffee

@@ -59,9 +59,8 @@ class slender_data.BrestLoader extends slender_data.Parameterizable
     data = {}
     data[@ids_name] = multi_query.ids()
     jQuery.ajax
-      url: @entries_url()
+      url: @entries_url(data)
       type: 'DELETE'
-      data: data
       success: callback
 
 
@@ -72,8 +71,9 @@ class slender_data.BrestLoader extends slender_data.Parameterizable
 
 
   # Returns the url to access the collection of entries.
-  entries_url: ->
-    @_entries_url_result or= "#{@base_url}/#{@entries_name}.json"
+  entries_url: (params) ->
+    data = if params then "?#{@url_data_encode params}" else ""
+    "#{@base_url}/#{@entries_name}.json#{data}"
 
 
   # Merges the entries described by the given ids
@@ -137,3 +137,13 @@ class slender_data.BrestLoader extends slender_data.Parameterizable
       data: data
       success: callback
 
+
+  # URL-encodes the given JSON data.
+  url_data_encode: (params) ->
+    data = []
+    for own key, value of params
+      if _.isArray(value)
+        value = value.join '+'
+      data.push "#{key}=#{value}"
+    data = data.join '&'
+

data/app/assets/javascripts/slender_data/loading_tracker.coffee

@@ -18,13 +18,13 @@ class slender_data.LoadingTracker extends slender_data.Parameterizable
   # is currently loading.
   is_loading: (query) ->
     query = @_querify_single query
-    console.log "LoadingTracker.is_loading: entry #{query.id()} loading status: #{@loading_entries[query.id()]?}"
+    console.log "LoadingTracker.is_loading: entry #{query.id()} loading status: #{@loading_entries[query.id()]?}" if window.JS_TRACING
     @loading_entries[query.id()]?
 
 
   # Notifies this LoadingTracker that the given entry has arrived.
   entry_arrived: (entry) ->
-    console.log "LoadingTracker: received entry #{entry.id}"
+    console.log "LoadingTracker: received entry #{entry.id}" if window.JS_TRACING
 
     # Call the callbacks registered for the loaded entry.
     if (callbacks = @loading_entries[entry[@id_name]])
@@ -36,7 +36,7 @@ class slender_data.LoadingTracker extends slender_data.Parameterizable
 
   # Notifies this LoadingTracker that the given entries have arrived.
   entries_arrived: (entries) ->
-    console.log "LoadingTracker: received entries #{(s.id for s in entries).join '+'}"
+    console.log "LoadingTracker: received entries #{(s.id for s in entries).join '+'}" if window.JS_TRACING
     @entry_arrived(entry) for entry in entries
     return
 
@@ -44,14 +44,14 @@ class slender_data.LoadingTracker extends slender_data.Parameterizable
   # Registers the given entry as currently loading from the server.
   start_loading: (query) ->
     query = @_querify_single query
-    console.log "LoadingTracker: starting to load #{query.id()}"
+    console.log "LoadingTracker: starting to load #{query.id()}" if window.JS_TRACING
     @loading_entries[query.id()] ?= []
 
 
   # Registers the given entries as currently loading from the server.
   start_loadings: (multi_query) ->
     multi_query = @_querify_multi multi_query
-    console.log "LoadingTracker: starting to load multiple #{multi_query.ids()}"
+    console.log "LoadingTracker: starting to load multiple #{multi_query.ids()}" if window.JS_TRACING
     @start_loading(query) for query in multi_query.transpose()
     return
 
@@ -63,11 +63,11 @@ class slender_data.LoadingTracker extends slender_data.Parameterizable
     query = @_querify_single query
 
     if @is_loading(query)
-      console.log "LoadingTracker.wait_for_entry_loaded: entry #{query.id()} is loading, waiting for it"
+      console.log "LoadingTracker.wait_for_entry_loaded: entry #{query.id()} is loading, waiting for it" if window.JS_TRACING
       @loading_entries[query.id()].push callback
       return undefined
     else
-      console.log "LoadingTracker.wait_for_entry_loaded: entry #{query.id()} is not loading"
+      console.log "LoadingTracker.wait_for_entry_loaded: entry #{query.id()} is not loading" if window.JS_TRACING
       return query
 
 

data/app/assets/javascripts/slender_data/persistence_manager.coffee

@@ -109,11 +109,11 @@ class slender_data.PersistenceManager extends slender_data.Parameterizable
   # Loads all described entries from any available data source.
   load_many: (multi_query, callback) ->
     multi_query = @_querify_multi multi_query
-    console.log "PersistenceManager.load_many: loading #{multi_query.ids().join '+'}"
+    console.log "PersistenceManager.load_many: loading #{multi_query.ids().join '+'}" if window.JS_TRACING
     result = []
 
     cache_result = @get_many multi_query
-    console.log "PersistenceManager.load_many: found #{(entry.id for entry in cache_result.found).join '+'} in cache."
+    console.log "PersistenceManager.load_many: found #{(entry.id for entry in cache_result.found).join '+'} in cache." if window.JS_TRACING
     result = _(result).union cache_result.found
     if cache_result.missing.empty()
       # All requested entries found in cache --> return them immediately.

data/lib/slender_data/version.rb

@@ -1,3 +1,3 @@
 module SlenderData
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/spec/dummy/config/initializers/konacha.rb

@@ -0,0 +1,4 @@
+Konacha.configure do |config|
+  require 'capybara/poltergeist'
+  config.driver = :poltergeist
+end if defined?(Konacha)