ruby_aem 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e416e06b6a94132684f6ce55369671579b4312e2
-  data.tar.gz: 23622d5f61323b8fe7abc10860a68344c3cc9efc
+  metadata.gz: b683ebcb4d5d0623b410102cc07623d0bc07ea6b
+  data.tar.gz: b0571ec2aa221353484b79247c6fc3e77d4be386
 SHA512:
-  metadata.gz: e35b72adbfd99dd6d4dea0af11de29f2f2ea31d00ee04b440311230cfebbc80077ba4349320ec782cb946a37241cbf3b076bfec48a21075f7a5345ca3484b321
-  data.tar.gz: 4fd4bf6e5856e9e3e7eef679dac78e65386fe26e8df30db659554f3494962ec5f3e6b94893008c49f2d060491eba743275adf4d71a04623ba6fd2459925819fa
+  metadata.gz: 9c27de523856d5ba67e28383b20a12d2eacdda5323f765b55196dacc8ea33fc5e063691ac550627b6d88e041af32e9fc0583ab5daba5eb4012b521607b6ce664
+  data.tar.gz: 1746e50ceff0c78e4a153ecad7e76adc12e6a2b399e5f392a33ae9ad7648f2a1729aa8df917ef3438cc4779314d46629e8ad776529f626cc1907bc08dc903459

data/conf/spec.yaml

@@ -493,7 +493,7 @@ configproperty:
         required:
           runmode: '%{run_mode}'
         optional:
-          - alias
+          - _alias
           - alias_type_hint
           - dav_create_absolute_uri
           - dav_create_absolute_uri_type_hint
@@ -855,5 +855,5 @@ user:
           verify: '%{new_password}'
       responses:
         200:
-          handler: simple
-          message: 'Logged in user password changed'
+          handler: html_change_password
+          message: 'User %{user}''s password has been changed'

data/lib/ruby_aem/handlers/html.rb

@@ -64,5 +64,28 @@ module RubyAem
       RubyAem::Result.new(message, response)
     end
 
+    # Check response body for indicator of change password failure.
+    #
+    # @param response HTTP response containing status_code, body, and headers
+    # @param response_spec response specification as configured in conf/spec.yaml
+    # @param call_params API call parameters
+    # @return RubyAem::Result
+    def Handlers.html_change_password(response, response_spec, call_params)
+
+      html = Nokogiri::HTML(response.body)
+      user = html.xpath('//body/div/table/tr/td/b/text()').to_s
+      desc = html.xpath('//body/div/table/tr/td/font/text()').to_s
+
+      if desc == 'Password successfully changed.'
+        call_params[:user] = user
+        message = response_spec['message'] % call_params
+        RubyAem::Result.new(message, response)
+      else
+        message = desc
+        result = RubyAem::Result.new(message, response)
+        raise RubyAem::Error.new(message, result)
+      end
+    end
+
   end
 end

data/lib/ruby_aem/resources/config_property.rb

@@ -44,11 +44,12 @@ module RubyAem
       def create(run_mode, config_node_name)
 
         name = RubyAem::Swagger.property_to_parameter(@call_params[:name])
+        type_hint_prefix = name.gsub(/^_/, '')
 
         @call_params[:run_mode] = run_mode
         @call_params[:config_node_name] = config_node_name
         @call_params["#{name}".to_sym] = @call_params[:value]
-        @call_params["#{name}_type_hint".to_sym] = @call_params[:type]
+        @call_params["#{type_hint_prefix}_type_hint".to_sym] = @call_params[:type]
 
         config_name = Swagger.config_node_name_to_config_name(config_node_name)
         @client.call(self.class, __callee__.to_s.concat(config_name.downcase.gsub(/\s+/, '')), @call_params)

data/lib/ruby_aem/swagger.rb

@@ -35,7 +35,11 @@ module RubyAem
     # @param property property name
     # @return swagger_aem parameter name
     def Swagger.property_to_parameter(property)
-      property.gsub(/\./, '_')
+      if (['alias'].include? property)
+        "_#{property}"
+      else
+        property.gsub(/\./, '_').gsub(/-/, '_')
+      end
     end
 
     # Sanitise path value by removing leading and trailing slashes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Shine Solutions
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri