Cleanup, change to links structure though api

lib/neows/models/browse.rb

@@ -7,26 +7,13 @@
 
 module Neows
   module Models
-    # @todo remove wrapper when _embedded is removed from api
-    class EmbeddedResults < Neows::Models::BaseModel
-      attribute :nearEarthObjectFeedDtoes, Array[Neows::Models::NearEarthObject]
-    end
-
     class Browse < Neows::Models::BaseModel
       include Neows::Models::LinkNavigation
       include Neows::Models::Pagination
 
       # @!attribute [rw]
-      # @note Temporary wrapper around the result set. Use #near_earth_objects
-      # @return [EmbeddedResults]
-      attribute :_embedded, EmbeddedResults
-
-      # Helper accessor for #_embedded.near_earth_objects
-      #
-      # @return [Array<Neows::Models::NearEarthObject>] list of Near Earth Objects
-      def near_earth_objects
-        _embedded.nearEarthObjectFeedDtoes
-      end
+      # @return [Array<Neows::Models::NearEarthObjects]
+      attribute :near_earth_objects, Array[Neows::Models::NearEarthObject]
     end
   end
 end

lib/neows/models/link_navigation.rb

@@ -11,21 +11,20 @@ module LinkNavigation
 
       # @!attribute [rw] links
       # @return [Neows::Models::Links]
-      attribute :_links, Neows::Models::Links
-      alias_method :links, :_links
+      attribute :links, Neows::Models::Links
 
       # Request the objects next results
       #
       # @return [self]
       def next
-        perform_get(links.next.href, self.class)
+        perform_get(links.next, self.class)
       end
 
       # Request the objects previous results
       #
       # @return [self]
       def prev
-        perform_get(links.prev.href, self.class)
+        perform_get(links.prev, self.class)
       end
     end
   end

lib/neows/models/links.rb

@@ -1,21 +1,21 @@
 require 'virtus'
 require 'neows/models/base_model'
-require 'neows/models/link'
+require 'neows/models/self_link'
 
 module Neows
   module Models
     class Links < Neows::Models::BaseModel
       # @!attribute [rw]
-      # @return [Neows::Models::Link]
-      attribute :self, Neows::Models::Link
+      # @return [String]
+      attribute :self, String
 
       # @!attribute [rw]
-      # @return [Neows::Models::Link]
-      attribute :next, Neows::Models::Link
+      # @return [String]
+      attribute :next, String
 
       # @!attribute [rw]
-      # @return [Neows::Models::Link]
-      attribute :prev, Neows::Models::Link
+      # @return [String]
+      attribute :prev, String
     end
   end
 end

lib/neows/models/miss_distance.rb

@@ -13,14 +13,12 @@ class MissDistance < Neows::Models::BaseModel
       attribute :lunar, Float
 
       # @!attribute [rw]
-      # @todo Switch from using SanitizedInteger to Integer after API removes commas
       # @return [Integer]
-      attribute :kilometers, Neows::Attributes::SanitizedInteger
+      attribute :kilometers, Integer
 
       # @!attribute [rw]
-      # @todo Switch from using SanitizedInteger to Integer after API removes commas
       # @return [Integer]
-      attribute :miles, Neows::Attributes::SanitizedInteger
+      attribute :miles, Integer
     end
   end
 end

lib/neows/models/near_earth_object.rb

@@ -2,14 +2,14 @@
 require 'neows/models/close_approach_data'
 require 'neows/models/estimated_diameter'
 require 'neows/models/orbital_data'
+require 'neows/models/self_link'
 
 module Neows
   module Models
     class NearEarthObject < Neows::Models::BaseModel
-      attribute :isPotentiallyHazardousAsteroid, Boolean
       # @!attribute [rw]
       # @return [Boolean]
-      alias_method :is_potentially_hazardous_asteroid, :isPotentiallyHazardousAsteroid
+      attribute :is_potentially_hazardous_asteroid, Boolean
 
       # @!attribute [rw]
       # @return [Integer]
@@ -38,6 +38,10 @@ class NearEarthObject < Neows::Models::BaseModel
       # @!attribute [rw]
       # @return [Neows::Models::OrbitalData]
       attribute :orbital_data, Neows::Models::OrbitalData
+
+      # @!attribute [rw]
+      # @return [Neows::Models::SelfLink]
+      attribute :links, Neows::Models::SelfLink
     end
   end
 end

lib/neows/models/page.rb

@@ -9,13 +9,11 @@ class Page < Neows::Models::BaseModel
 
       # @!attribute [rw] total_elements
       # @return [Integer]
-      attribute :totalElements, Integer
-      alias_method :total_elements, :totalElements
+      attribute :total_elements, Integer
 
       # @!attribute [rw] total_pages
       # @return [Integer]
-      attribute :totalPages, Integer
-      alias_method :total_pages, :totalPages
+      attribute :total_pages, Integer
 
       # @!attribute [rw]
       # @return [Integer]

lib/neows/models/relative_velocity.rb

@@ -9,14 +9,12 @@ class RelativeVelocity < Neows::Models::BaseModel
       attribute :kms, Float
 
       # @!attribute [rw]
-      # @todo Switch from using SanitizedFloat to Float after API removes commas
       # @return [Float]
-      attribute :kph, Neows::Attributes::SanitizedFloat
+      attribute :kph, Float
 
       # @!attribute [rw]
-      # @todo Switch from using SanitizedFloat to Float after API removes commas
       # @return [Float]
-      attribute :mph, Neows::Attributes::SanitizedFloat
+      attribute :mph, Float
     end
   end
 end

lib/neows/models/link.rb → lib/neows/models/self_link.rb

@@ -2,10 +2,10 @@
 
 module Neows
   module Models
-    class Link < Neows::Models::BaseModel
+    class SelfLink < Neows::Models::BaseModel
       # @!attribute [rw]
       # @return [String]
-      attribute :href, String
+      attribute :self, String
     end
   end
 end