datasource 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23eea085a171b960e60cc14b7f7b23bb8d1841c1
-  data.tar.gz: 682ae5dfcec5ddb222e4be281d130a26aa92f6d9
+  metadata.gz: 107812940a2c8fc80ebec710b0ebd63c5f710fd4
+  data.tar.gz: b0d4b77a9cace8c1f559d39738065cfe69930c55
 SHA512:
-  metadata.gz: da326434c18cad2aab819d5cd7a79c187bf9d17353e820d0232e27d0e33cb3278e0d9ff91b054d42a0f603a996f239b1300f25ed1c639e49717cff4d5f6f191e
-  data.tar.gz: e165f247e0f7f52a9e0668b89a18d078d6b0ae603627743475d852d90f30a0d4ad1e0a8d1aeefa9d6f79fd85edd9bb931132961211e2bbf964326d34ee59b13e
+  metadata.gz: 960aa77805c5fe4e0a2c1ac658956bf0c2b4d8e81769c96850a012b5e95facac053ba6407f1b8d88ec65749b7ecc813fb6229502302ea4d070873b4483d8113f
+  data.tar.gz: 22dad36f267317cb360ffc30d035b8efd3074faa3ae801e26bbef76c3b9c9d358f417f8a0dee31cf37ea9a49c92e33afe472a753b2d86276e13319cf72b057e8

data/README.md

@@ -151,13 +151,13 @@ A loader will only be executed if a computed attribute depends on it. If an attr
 on multiple loaders, pass an array of loaders like so `computed :attr, loaders: [:loader1, :loader2]`.
 
 Be careful that if your hash does not contain a value for the object ID, the loaded value
-will be nil.
+will be nil. However you can use the `default` option for such cases (see below example).
 
 ```ruby
 class User < ActiveRecord::Base
   datasource_module do
     computed :post_count, loaders: :post_counts
-    loader :post_counts, array_to_hash: true do |user_ids|
+    loader :post_counts, array_to_hash: true, default: 0 do |user_ids|
       results = Post
         .where(user_id: user_ids)
         .group(:user_id)
@@ -171,7 +171,7 @@ class UserSerializer < ActiveModel::Serializer
 
   def post_count
     # Will automatically give you the value for this user's ID
-    object.loaded_values[:post_counts] || 0
+    object.loaded_values[:post_counts]
   end
 end
 ```

data/lib/datasource/adapters/sequel.rb

@@ -48,7 +48,7 @@ module Datasource
               scope = if respond_to?(:use_datasource_serializer)
                 self
               else
-                self.extend(ScopeExtensions).use_datasource(default_datasource)
+                self.extend(ScopeExtensions).use_datasource(Adapters::Sequel.scope_to_class(self).default_datasource)
               end
               scope.use_datasource_serializer(serializer || Datasource::Base.consumer_adapter.get_serializer_for(Adapters::Sequel.scope_to_class(scope)))
             end

data/lib/datasource/attributes/loader.rb

@@ -13,6 +13,10 @@ module Datasource
           self._options.merge!(hash)
         end
 
+        def default_value
+          self._options[:default]
+        end
+
         def load(*args, &block)
           args = args.slice(0, _load_proc.arity) if _load_proc.arity >= 0
           results = _load_proc.call(*args, &block)

data/lib/datasource/base.rb

@@ -177,7 +177,7 @@ module Datasource
                     end
                   end
                   rows.each do |row|
-                    row.loaded_values[name] = loaded_values[row.send(primary_key)]
+                    row.loaded_values[name] = loaded_values[row.send(primary_key)] || loader.default_value
                   end
                 end
               else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datasource
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jan Berdajs