mxhero-api 0.1.33 → 0.1.34

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjQyMjQzMGIzZWJjY2YxZGQ0ZDQ1OTRhODc4YjA1NmZjMjg0NGU2MQ==
+    ZWM3MjU1MTU3MjhmMjA4MzJiNDJiYjZjN2IzMTEzNjU0NzJiYmRlOQ==
   data.tar.gz: !binary |-
-    MDQzZWI4ZTQ2ZDAyYjYwYzhjZjZhNTE4YmVmYWNmMDkyZGY5Zjg4ZQ==
+    MmM2MzU1OTU3MDI4MjE3OWI4Y2RiZGRiOGI0YzgzYTdiN2I5ODM1OA==
 SHA512:
   metadata.gz: !binary |-
-    NTMyY2RkMTNkNzI5MzMyMDY1MDgyYjBhMTMyMWUxMzA4NWVkZjEyYzJhZmNj
-    N2QzNjc1MjBmY2ZiMDIyY2QxYzQ2YWM4YTg2Y2FiM2VlYzJjNjMyZDQ2MDlm
-    NGM3NTUxNjA0YTdkNTRhMDIyNzA3NmY0ZjQ3YTA4OGQ5OTczY2E=
+    ODYwOWUwMzlhZTZjZjI0NDhiZDljN2Y2ODQ2MDY1OGI5YTY5MTYxMzI4NTA3
+    MzY2ZDY1OGE1MjdiNmNmM2FjNTY0MDRiYzMyZjBmNGVjMWU3NzI0ZThhNTEy
+    ZDVkMDRkNzBjYWE3MWRiNDZjOTI0MDE0MDJjOGE1OTVjYjc2MTA=
   data.tar.gz: !binary |-
-    MWQxNWI1NWU4NjZmZDZiYjFkOTU0Yzk0MDA2MTY2ZTAxZWRkODgwM2UwODBh
-    NTEzNmNjMzljY2ViODI5ZjE3MGJlYzRjNDc1Y2FlMmJkN2MxNGZjODRlMDQw
-    ZjcyNjNiYTRlODk5YzM2NmNhMWM0MjMyNGNlNDAzMjhiNzA0MWU=
+    YWRiYTRlZjVlYTQxZTM5NTRmNTk4MGM2YWVmNjg5MDY2ZWU2ZjgwMmU2NWQ1
+    ZTRmYzk2NTYzNTMyYjBlOGM3YTQyY2QyYTI5ZThjZTUxMGMyMDE5NTAxY2Uy
+    NjczNjE0NGU5MTQ2NmE1Mzg2NWE3YmYxMmNiNmZiODgyMDEyMGU=

data/VERSION

@@ -1 +1 @@
-0.1.33
+0.1.34

data/lib/resources/domain.rb

@@ -1,5 +1,23 @@
 module MxHero::API
+  
+  module MetadataLoader
+    
+    def initialize(data = {})
+      super(data)
+      load_metadata
+    end
+
+    private
 
+    def load_metadata
+      is_empty = metadata.nil? ||  metadata == '' || metadata == 'null' 
+      #@metadata = JSON.parse(metadata) if metadata
+      @metadata = is_empty ? nil : JSON.parse(metadata, symbolize_names: true)
+    end
+
+  end
+
+  
   class Domain < Resource
 
     attributes :domain, :server,
@@ -11,11 +29,13 @@ module MxHero::API
     attribute :source
     attribute :metadata
 
+    include MetadataLoader
+
     def initialize(data = {})
       super(data)
       load_features(features)
       load_cos(cos)
-      load_metadata
+      # load_metadata
     end
 
     def change_to_trial
@@ -34,36 +54,28 @@ module MxHero::API
       @features = features.map { |feature| Feature.new feature }
     end
 
-    def load_metadata
-      @metadata = JSON.parse(metadata) if metadata
-    end
-
   end
 
+  
 
   class Feature < Resource
     attribute :component, map: 'feature'
     attributes :created, :updated, :metadata
     attribute :max_rules_amount, map: 'maxRulesAmount'
 
+    include MetadataLoader
+
     def initialize(data = {})
       super(data)
       if max_rules_amount == 0 || max_rules_amount.nil?
         @max_rules_amount = Float::INFINITY
       end
-      load_metadata
     end
 
     def unlimited_use?
       max_rules_amount == Float::INFINITY
     end
 
-    private
-
-    def load_metadata
-      @metadata = JSON.parse(metadata, symbolize_names: true) if metadata
-    end
-
   end
 
 

data/mxhero-api.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: mxhero-api 0.1.33 ruby lib
+# stub: mxhero-api 0.1.34 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mxhero-api"
-  s.version = "0.1.33"
+  s.version = "0.1.34"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maximiliano Dello Russo", "Juan Pablo Royo", "mxHero"]

data/test/test_domain.rb

@@ -12,6 +12,14 @@ class DomainTest < MiniTest::Unit::TestCase
     assert_equal data[:source], domain.source
   end
 
+  def test_empty_metadata
+    [ '', 'null', nil ].each do |value|
+      data[:metadata] = value 
+      domain = MxHero::API::Domain.new data
+      assert domain.metadata.nil?, "Is not empty in case of '#{value}'"
+    end
+  end
+
   def test_change_domain_to_trial
     domain = MxHero::API::Domain.new data
     domain.change_to_trial

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mxhero-api
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - Maximiliano Dello Russo