assignable_values 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 400d27572075ed4ae3361303c97ccb7acf0afb00e63cfdc8e3a667d8da73b874
-  data.tar.gz: 20e2628282f45a9265d036a0b3ca1078a5bb5532cf06654d05c79bd67c878d96
+  metadata.gz: fcf4880911a30c8f39fe52bb5b018226a899b7ea1b6fa0f4b232d54e198abf83
+  data.tar.gz: cb52c389c399947480293f65a69d29a2ca6f7ac02de1d743d52a68a1593ba6c2
 SHA512:
-  metadata.gz: 0d8d5c406b2829863c62fe04851341667ce4f49cc2e6f3c29e6e58cc4710fe70d123ac7cbc315f56f8fdd1734dcab7c5b9693186bd9b12033db3df03fd686261
-  data.tar.gz: d0e460d55fa4ce7d26207a239778177f56a4c1dcd73a8f7ee7aa6167094b55b75af84a0a8a9cc9e9e3a371c693b4fb813df16978057e545b4dbaa50415926668
+  metadata.gz: c68e65b8fd131d928af7e0ebe32999ade79163cc44059718c8032d17ca2331abfbf1d0c1babe35378f0816edd22ba67e5c6c7ad296348e0608ea492ed7d72383
+  data.tar.gz: '08479bf3b543772e9a8810c4cdec60d72979fa152bc445c4e4f7029e5c4909b02c1484f8a40d0044b091e0ece3f068859ebb026ae797912d0d829da9fd682ded'

data/CHANGELOG.md

@@ -8,18 +8,27 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Compatible changes
 
+## 0.16.4 - 2020-10-15
+
+### Compatible changes
+
+- No longer crashes value blocks return `nil`.
+
+
 ## 0.16.3 - 2020-10-15
 
 ### Compatible changes
 
 - No longer crashes when assigning `nil` to an attribute with assignable values that are provided as a scope.
 
+
 ## 0.16.2 - 2020-10-06
 
 ### Compatible changes
 
 - when given a scope, do not load all records to memory during validation
 
+
 ## 0.16.1 - 2019-05-14
 
 ### Compatible changes

data/Gemfile.2.3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.3)
+    assignable_values (0.16.4)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.3.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.3)
+    assignable_values (0.16.4)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.4.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.3)
+    assignable_values (0.16.4)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.5.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.3)
+    assignable_values (0.16.4)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.5.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.3)
+    assignable_values (0.16.4)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.5.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.3)
+    assignable_values (0.16.4)
       activerecord (>= 2.3)
 
 GEM

data/Gemfile.6.0.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assignable_values (0.16.3)
+    assignable_values (0.16.4)
       activerecord (>= 2.3)
 
 GEM

data/lib/assignable_values/active_record/restriction/base.rb

@@ -236,11 +236,17 @@ module AssignableValues
         end
 
         def assignable_values_from_record_or_delegate(record)
-          if delegate?
+          assignable_values = if delegate?
             assignable_values_from_delegate(record)
           else
             record.instance_exec(&@values)
           end
+
+          if is_scope?(assignable_values)
+            assignable_values
+          else
+            Array(assignable_values)
+          end
         end
 
         def delegate(record)

data/lib/assignable_values/version.rb

@@ -1,3 +1,3 @@
 module AssignableValues
-  VERSION = '0.16.3'
+  VERSION = '0.16.4'
 end

data/spec/assignable_values/active_record_spec.rb

@@ -808,6 +808,26 @@ describe AssignableValues::ActiveRecord do
         klass.new.assignable_genres.should == %w[pop rock]
       end
 
+      it 'returns an array when the value block returns a single value' do
+        klass = Song.disposable_copy do
+          assignable_values_for :genre do
+            'techno'
+          end
+        end
+
+        klass.new.assignable_genres.should == ['techno']
+      end
+
+      it 'returns an empty array when the value block returns nothing' do
+        klass = Song.disposable_copy do
+          assignable_values_for :genre do
+            nil
+          end
+        end
+
+        klass.new.assignable_genres.should == []
+      end
+
       it 'should prepend a previously saved value to the top of the list, even if is no longer allowed' do
         klass = Song.disposable_copy do
           assignable_values_for :genre do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assignable_values
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Henning Koch