duck_record 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d686747e67e2fd89839e277156b05e45bae20a
-  data.tar.gz: aedff996d41cc23adf9686041eb0817e2db29f65
+  metadata.gz: a40d7265442d33cb9b0523abc991f2425c3d87ff
+  data.tar.gz: 266ba229695849261a975fd2924cc9837a095671
 SHA512:
-  metadata.gz: 59898083c6f86b92da56fb15b990c1df664647319def15335f56b414a1fe41133f2fde382eec4738f2eaa29e32cfd4f2f5cf6207559dc1f9be14e14a25abbf31
-  data.tar.gz: b1dd8db43eb6f791bc4c0671202ec0e36a9b59b3a28e5db43b45a1b75a5a53c45a7dcba324aa6697dcfc3160f7e4bcf2ae3985b3fa04c65cd5ecbd3a61a5edb1
+  metadata.gz: 363119060b6e6191f6fe401a121c6548b2ca3ae28f5875a95db30aaffbb29d952c8baa0a6a37f3deb4085a24389af87c4b698eb950bcf9b9a46c1761a1a82721
+  data.tar.gz: bc7e1560401aa6afebc76066457085b1b0898e04b69feff43cf7d4ae72693bfe164022c604575752463941360b4ca8bed5ff868d90ad4e7bf0764bc92570c1bd

data/lib/core_ext/array_without_blank.rb

@@ -0,0 +1,46 @@
+class ArrayWithoutBlank < Array
+  def self.new(*several_variants)
+    arr = super
+    arr.reject!(&:blank?)
+    arr
+  end
+
+  def initialize_copy(other_ary)
+    super other_ary.reject(&:blank?)
+  end
+
+  def replace(other_ary)
+    super other_ary.reject(&:blank?)
+  end
+
+  def push(obj, *smth)
+    return self if obj.blank?
+    super
+  end
+
+  def insert(*args)
+    super *args.reject(&:blank?)
+  end
+
+  def []=(index, obj)
+    return self[index] if obj.blank?
+    super
+  end
+
+  def concat(other_ary)
+    super other_ary.reject(&:blank?)
+  end
+
+  def +(other_ary)
+    super other_ary.reject(&:blank?)
+  end
+
+  def <<(obj)
+    return self if obj.blank?
+    super
+  end
+
+  def to_ary
+    Array.new(self)
+  end
+end

data/lib/duck_record/base.rb

@@ -305,11 +305,12 @@ module DuckRecord #:nodoc:
 
       self.class.reflections.keys.each do |k|
         records = send(k)
-        sub_hash = if records.respond_to?(:to_ary)
-                     records.to_ary.map { |a| a.to_h }
-                   else
-                     records.to_h
-                   end
+        sub_hash =
+          if records.respond_to?(:to_ary)
+            records.to_ary.map { |a| a.to_h }
+          else
+            records.to_h
+          end
 
         if include_empty || sub_hash.any?
           hash[k] = sub_hash

data/lib/duck_record/serialization.rb

@@ -15,5 +15,18 @@ module DuckRecord #:nodoc:
 
       super(options)
     end
+
+    private
+
+    def read_attribute_for_serialization(key)
+      v = send(key)
+      if v.respond_to?(:to_ary)
+        v.to_ary
+      elsif v.respond_to?(:to_hash)
+        v.to_hash
+      else
+        v
+      end
+    end
   end
 end

data/lib/duck_record/type/array_without_blank.rb

@@ -0,0 +1,36 @@
+module DuckRecord
+  module Type # :nodoc:
+    class ArrayWithoutBlank < ActiveModel::Type::Value # :nodoc:
+      include ActiveModel::Type::Helpers::Mutable
+
+      attr_reader :subtype
+      delegate :type, :user_input_in_time_zone, :limit, to: :subtype
+
+      def initialize(subtype)
+        @subtype = subtype
+      end
+
+      def cast(value)
+        type_cast_array(value, :cast)
+      end
+
+      def ==(other)
+        other.is_a?(Array) && subtype == other.subtype
+      end
+
+      def map(value, &block)
+        value.map(&block)
+      end
+
+      private
+
+        def type_cast_array(value, method)
+          if value.is_a?(::Array)
+            ::ArrayWithoutBlank.new value.map { |item| type_cast_array(item, method) }
+          else
+            @subtype.public_send(method, value)
+          end
+        end
+    end
+  end
+end

data/lib/duck_record/type.rb

@@ -9,6 +9,7 @@ require "duck_record/type/time"
 require "duck_record/type/json"
 
 require "duck_record/type/array"
+require "duck_record/type/array_without_blank"
 
 require "duck_record/type/unsigned_integer"
 require "duck_record/type/decimal_without_scale"
@@ -67,5 +68,6 @@ module DuckRecord
     register(:json, Type::JSON, override: false)
 
     add_modifier({ array: true }, Type::Array)
+    add_modifier({ array_without_blank: true }, Type::ArrayWithoutBlank)
   end
 end

data/lib/duck_record/version.rb

@@ -1,3 +1,3 @@
 module DuckRecord
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/duck_record.rb

@@ -2,6 +2,8 @@ require "active_support"
 require "active_support/rails"
 require "active_model"
 
+require "core_ext/array_without_blank"
+
 require "duck_record/type"
 require "duck_record/attribute_set"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_record
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- lib/core_ext/array_without_blank.rb
 - lib/duck_record.rb
 - lib/duck_record/associations.rb
 - lib/duck_record/associations/association.rb
@@ -121,6 +122,7 @@ files:
 - lib/duck_record/translation.rb
 - lib/duck_record/type.rb
 - lib/duck_record/type/array.rb
+- lib/duck_record/type/array_without_blank.rb
 - lib/duck_record/type/date.rb
 - lib/duck_record/type/date_time.rb
 - lib/duck_record/type/decimal_without_scale.rb