apple-news 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89ec0ccf7598a2ab1c8b56db94edd41673e3cc9b
-  data.tar.gz: e1f700824645bd25cdc8c634cc4797f809220121
+  metadata.gz: 0c750e8520361db81736ea6f3ff81a95e339f45d
+  data.tar.gz: 1061eea5f9574edf0e08c1a078521d012002deca
 SHA512:
-  metadata.gz: e34c083dd32ef1b2f9c0281c7833599c1b387c6bef83f4dd366732c621042e0ff8300b331571ba6919527b26448d8248407e39da5b91256ea606fb0495b279fb
-  data.tar.gz: 06f0d6ef9f91c4a7c7766c662a6ba3d7bdb3162687ac80375aff791e16982d34d46f19f94826aa17397df1e195bc1efa40c2dd1aaab42d0747af48de17cb4577
+  metadata.gz: 4c99a55c00daf17d10ce3af5257c8b8a20cc69b17b78b3af92785ca1771912114a7add9ad1f211950676332519ef56603efc1b9dc77e0744a6aa32b9fb08c1a4
+  data.tar.gz: dbee98d60a05b096c5ba997e8fd00bd8e2920a3b4fdc1fabb036c93811f107cba8325b1b7058969286470c06202e1230504654717e760c22a080b577d28d99b6

data/lib/apple-news.rb

@@ -2,6 +2,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 require "active_support/concern"
 require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/string/inflections"
+require "active_support/core_ext/object/blank"
 
 require "base64"
 require "json"

data/lib/apple-news/properties.rb

@@ -3,19 +3,23 @@ module AppleNews
     extend ActiveSupport::Concern
 
     def initialize(opts = nil)
-      load_properties(opts) if !opts.nil?
+      load_properties(opts)
     end
 
     def load_properties(opts)
-      opts = ActiveSupport::HashWithIndifferentAccess.new(opts)
+      opts = ActiveSupport::HashWithIndifferentAccess.new(opts || {})
       self.class.properties.each do |prop, settings|
         val = if !settings[:klass].nil?
           assigned_val = opts.fetch(prop, settings[:default])
           
           if settings[:default].is_a?(Array)
-            assigned_val.map { |v| settings[:klass].send(settings[:init_method], v) }
+            assigned_val.map { |v|
+              v.is_a?(Hash) ? settings[:klass].send(settings[:init_method], v) : v
+            }
           elsif settings[:default].is_a?(Hash)
-            Hash[assigned_val.map { |k, v| [k, settings[:klass].send(settings[:init_method], v)]}]
+            Hash[assigned_val.map { |k, v|
+              [k, v.is_a?(Hash) ? settings[:klass].send(settings[:init_method], v) : v]
+            }]
           elsif !assigned_val.nil? && !assigned_val.is_a?(Class)
             assigned_val
           else
@@ -65,7 +69,7 @@ module AppleNews
             send(key)
           end
 
-          [json_key, val]
+          [json_key, val.blank? ? nil : val]
         }.reject { |p| p[1].nil? }]
       end
     end

data/lib/apple-news/version.rb

@@ -1,3 +1,3 @@
 module AppleNews
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple-news
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryan LeFevre