ridley 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29775148101ee7b5606bf8147c419def65765b13
-  data.tar.gz: fe10a06b4db60f71fb8832d4b59d62a83c2e6c17
+  metadata.gz: 12238b218882f651e98130c984371e19718130c9
+  data.tar.gz: a4c23d1276e08d7c2ffaa712f4520d75e88b2c5a
 SHA512:
-  metadata.gz: ba1cc8948844efbc746b227791f349210494ff9a4c9a21ebbc8a722eccf09fb8e7b9c4f203eee3cab2ad8161b74e94f34a673ad673e4d58b33ed06e520648d2e
-  data.tar.gz: b62e6e914f5696c5806dd1f0befe0713ffed69d95bc5cd6e88c7942ecb53fb0ac68672117dffeb5431d85cd96c3f60c462ab165a50658aeec199a02d1a86576d
+  metadata.gz: c4c44d05cd85d33218960192dc3071a83392415a20be96ed4e59d086a63b182c358e0acb69515c06aedabdf9ff58a843b3c87b69f3dddad7eca718a6f175a359
+  data.tar.gz: 9375cd35216860793a56df9eef360508c4497d2d806458c549c36318bf425c591619c70a72df29a5679fffbd3b9075c55c1e6b6b9072cef360b63af1966ebfda

data/lib/ridley/chef_objects/node_object.rb

@@ -67,7 +67,7 @@ module Ridley
     #
     # @return [String]
     def public_hostname
-      self.cloud? ? self.automatic[:cloud][:public_hostname] : self.automatic[:fqdn]
+      self.cloud? ? self.automatic[:cloud][:public_hostname] || self.automatic[:fqdn] : self.automatic[:fqdn]
     end
 
     # Returns the public IPv4 address of the instantiated node. This ip address should be
@@ -78,7 +78,7 @@ module Ridley
     #
     # @return [String]
     def public_ipv4
-      self.cloud? ? self.automatic[:cloud][:public_ipv4] : self.automatic[:ipaddress]
+      self.cloud? ? self.automatic[:cloud][:public_ipv4] || self.automatic[:ipaddress] : self.automatic[:ipaddress]
     end
     alias_method :public_ipaddress, :public_ipv4
 

data/lib/ridley/resources/search_resource.rb

@@ -131,19 +131,31 @@ module Ridley
     def partial(index, query_string, attributes, resources_registry, options = {})
       query_uri    = self.class.query_uri(index)
       param_string = self.class.build_param_string(query_string, options)
-
-      chef_id = chef_id_for_index(index)
-
-      body = Hash.new.tap do |body|
-        body[chef_id] = [ chef_id ] if chef_id
-        attributes.collect { |attr| body[attr] = attr.split('.') }
-      end
+      body         = build_partial_body(index, attributes)
 
       handle_partial(index, resources_registry, request(:post, "#{query_uri}#{param_string}", JSON.generate(body)))
     end
 
     private
 
+      def build_partial_body(index, attributes)
+        chef_id = chef_id_for_index(index)
+
+        Hash.new.tap do |body|
+          body[chef_id] = [ chef_id ] if chef_id
+
+          if index.to_sym == :node
+            body['cloud.public_hostname'] = [ 'cloud', 'public_hostname' ]
+            body['cloud.public_ip4v']     = [ 'cloud', 'public_ip4v' ]
+            body['cloud.provider']        = [ 'cloud', 'provider' ]
+            body['fqdn']                  = [ 'fqdn' ]
+            body['ipaddress']             = [ 'ipaddress' ]
+          end
+
+          attributes.collect { |attr| body[attr] = attr.split('.') }
+        end
+      end
+
       def chef_id_for_index(index)
         chef_id = index.to_sym == :node ? Ridley::NodeObject.chef_id : nil
       end
@@ -159,7 +171,7 @@ module Ridley
               next if key.to_s == chef_id.to_s
               attributes.deep_merge!(Hash.from_dotted_path(key, value))
             end
-            registry[:node_resource].new(name: item[:data][chef_id], normal: attributes)
+            registry[:node_resource].new(name: item[:data][chef_id], automatic: attributes)
           end
         else
           response[:rows]

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jamie Winsor