mxhero-api 0.1.22 → 0.1.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTU2MzgzYTcyNzVhODRmOTM5MGU5MDZkN2Y0ZmVjM2JhYjg0YjA2Mg==
+    YjA2M2I2OTM1ZjljNWM0ZTQ0Mjk5ZGQzN2JlM2IwZjI0M2ZlZmVmMA==
   data.tar.gz: !binary |-
-    NjQ5MDE2MmNlYjE2YjJhOGY3ZDQ4NmMxMjhjMjk5MWRhYzMzNjY4MQ==
+    M2ViZWM4NWVlN2M1YTg0Yzg4NGVhNTBiZTBkOGRhZjQzMjE5YjRhMA==
 SHA512:
   metadata.gz: !binary |-
-    YzJlZGNjZTUzZmZkNGViY2VkY2Q2ZjA5ZjkwYzE5MGRhY2VlMDE4Yzk2OWM1
-    N2RlMmJhMjA1YzI1MzczMzQwMzY3OWJiZjdjYWFjMDllNDE1YzJmMjVhN2Vl
-    ZjFlNDkzMDEwZDc2ZDY2YmNhNmIzZDYyZDQzNGNhNThiN2E4OTE=
+    M2QzN2EzMWQxYmE0YzA2NTgzMWYzYmE3YWYwMDFlZGYxZmFhMjNjN2Y3ZjNi
+    ZDVmMDE4MmFhMTdjYjI1MjhmNjYzMzM3NmRkZDgyMDg0ZTdmYmJlZWIzZjY1
+    ZGViMmJlYjVhZTIwMjg1NjA5YWVlZjA5ZmEzMDY4OGM2NWZkMjc=
   data.tar.gz: !binary |-
-    NGY4NjVjOWUzYTI1ZDQ1OWExZDZiOWJiNzU3ZmQ4NmU1M2ZjOTkzN2Y5ZDY3
-    NzUzZTM0M2UzMjMxNjcwN2M4MjI0NTFjNjVlNjM3MTNiNmUyOGIyYzQyM2Mz
-    ZDgzNjllMzMwZGM2ZTI2NjJkNDVjNjk5ZjkwYzRhYTdiMWNmMzM=
+    OTEwY2EwYTk3NDU1YjdmMDgxYTNlZjNkNDU1YzU3M2IyNWI2OThlOWVlZGEy
+    ZTQ3ZWE3MjAxOTkwMzdlODkxNmY2NTc2ZTcxN2EyMGNjMWExOGFkZjEzMjEy
+    MWJlNGI2OTc4ZDBhN2NlMzQzN2Q1ZDFjN2JjZDYzNzJiZTIwYjE=

data/VERSION

@@ -1 +1 @@
-0.1.22
+0.1.23

data/lib/directories.rb

@@ -14,8 +14,7 @@ module MxHero::API
         [:next_update, :nextUpdate],
         [:last_update, :lastUpdate],
         :error, [:override, :overrideFlag], 
-        [:dn_authenticate, :dnAuthenticate],
-        :properties 
+        [:dn_authenticate, :dnAuthenticate]
       ].each do |property|
         case property
         when Symbol
@@ -24,8 +23,10 @@ module MxHero::API
           send "#{property.first}=", data[property.first] || data[property.last]
         end
       end
+      load_properties(data)
     end
 
+    
     def last_update=(date)
       parse_update_dates(:last_update, date) 
     end
@@ -38,7 +39,7 @@ module MxHero::API
       properties.each { |prop, value| send("#{prop}=", value) if respond_to?("#{prop}=") }
     end
 
-    def to_json
+    def to_hash
       {
         domain: domain,
         directoryType: type,
@@ -52,12 +53,33 @@ module MxHero::API
         error: error,
         overrideFlag: override,  #override.nil? ? true : override,
         dnAuthenticate: dn_authenticate,
-        properties: properties || []
-      }.to_json
+        properties: properties_field_to_hash
+      }
+    end
+
+    def to_json
+      to_hash.to_json
     end
     
     private
     
+    def load_properties(data)
+      @properties ||= {}
+      props = data[:properties]
+      case props
+      when Array then (props || []).each { |property| @properties[property[:name].to_sym] = property[:key] }
+      when Hash  then @properties = props
+      end
+    end
+
+    def properties_field_to_hash
+      values = []
+      (properties || []).each do |name, value|
+        values << { name: name, key: value } 
+      end
+      values
+    end
+    
     def parse_update_dates(property, date)
       if date.is_a? Integer or date.is_a? String
         instance_variable_set "@#{property}", DateTime.strptime(date.to_s, '%Q')

data/mxhero-api.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: mxhero-api 0.1.22 ruby lib
+# stub: mxhero-api 0.1.23 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mxhero-api"
-  s.version = "0.1.22"
+  s.version = "0.1.23"
 
   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_directories.rb

@@ -108,5 +108,39 @@ class DirectoriesTest < MiniTest::Unit::TestCase
     directory.update_properties changes 
     changes.keys.each { |prop| assert_equal changes[prop], directory.send(prop) }
   end
+
+  def test_initialize_properties
+	  directory = MxHero::API::Directory.new domain: domain, 
+  		properties: [ {name: 'email', key: 'ldap.email'}, {name: 'name', key: 'user.name'} ]
+
+	  assert_equal({ email: 'ldap.email', name: 'user.name' }, directory.properties)
+
+    directory = MxHero::API::Directory.new domain: domain, 
+      properties: { email: 'ldap.email', name: 'user.name' }
+    
+    assert_equal({ email: 'ldap.email', name: 'user.name' }, directory.properties)
+  end
+
+  def test_properties_to_json
+    directory = MxHero::API::Directory.new domain: domain, 
+      properties: { email: 'ldap.email', name: 'user.name' }
+   
+    expected = {
+      domain: directory.domain, directoryType: directory.type,
+      addres: directory.address, port: directory.port, sslFlag: directory.ssl,
+      user: directory.user, password: directory.password, filter: directory.filter,
+      base: directory.base, nextUpdate: directory.next_update, 
+      lastUpdate: directory.last_update, error: directory.error, 
+      overrideFlag: directory.override, dnAuthenticate: directory.dn_authenticate, 
+      properties: [ { name: 'email', key:'ldap.email' }, { name: 'name', key: 'user.name' } ]
+    }
+    
+    assert_equal expected.to_json, directory.to_json
+
+    directory = MxHero::API::Directory.new domain: domain
+    expected[:properties] = []
+    assert_equal expected.to_json, directory.to_json
+  end
+
 end
  

metadata

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