add users recent_observation_fields endpoint; fix lint warnings; incr…

…ease test coverage

lib/endpoints/computervision.js

@@ -9,7 +9,7 @@ const computervision = class computervision {
     return iNaturalistAPI.upload( "computervision/score_image", params, options )
       .then( response => {
         response.results = response.results.map( r => (
-          Object.assign( { }, r, { taxon: new Taxon( r.taxon ) } )
+          { ...r, taxon: new Taxon( r.taxon ) }
         ) );
         if ( response.common_ancestor ) {
           response.common_ancestor.taxon = new Taxon( response.common_ancestor.taxon );
@@ -19,12 +19,12 @@ const computervision = class computervision {
   }
 
   static score_observation( params, opts = { } ) { // eslint-disable-line camelcase
-    const options = Object.assign( { }, opts );
+    const options = { ...opts };
     options.useAuth = true;
     return iNaturalistAPI.get( "computervision/score_observation/:id", params, options )
       .then( response => {
         response.results = response.results.map( r => (
-          Object.assign( { }, r, { taxon: new Taxon( r.taxon ) } )
+          { ...r, taxon: new Taxon( r.taxon ) }
         ) );
         if ( response.common_ancestor ) {
           response.common_ancestor.taxon = new Taxon( response.common_ancestor.taxon );

lib/endpoints/controlled_terms.js

@@ -3,8 +3,12 @@ const ControlledTerm = require( "../models/controlled_term" );
 
 const typifyResponse = response => {
   const typifiedResponse = ControlledTerm.typifyResultsResponse( response );
+  if ( !typifiedResponse.results ) {
+    return typifiedResponse;
+  }
+
   for ( let i = 0; i < typifiedResponse.results.length; i += 1 ) {
-    if ( typifiedResponse.results[i] && !typifiedResponse.results[i].values ) {
+    if ( typifiedResponse.results[i] && typifiedResponse.results[i].values ) {
       typifiedResponse.results[i].values = typifiedResponse.results[i].values.map(
         v => ( new ControlledTerm( v ) )
       );
@@ -17,7 +21,7 @@ const controlledTerms = class controlledTerms { // eslint-disable-line camelcase
   static for_taxon( params, opts = { } ) { // eslint-disable-line camelcase
     if ( iNaturalistAPI.apiURL && iNaturalistAPI.apiURL.match( /\/v2/ ) ) {
       const taxonIds = params.taxon_id.toString( ).split( "," ).join( "," );
-      const newParams = Object.assign( {}, params );
+      const newParams = { ...params };
       delete newParams.taxon_id;
       return iNaturalistAPI.get( `controlled_terms/for_taxon/${taxonIds}`, newParams, opts ).then( typifyResponse );
     }

lib/endpoints/identifications.js

@@ -19,28 +19,28 @@ const identifications = class identifications {
     return iNaturalistAPI.delete( "identifications/:id", params, options );
   }
 
-  static similar_species( params, opts ) { // eslint-disable-line camelcase
-    const options = Object.assign( { }, opts || { } );
+  static similar_species( params, opts = { } ) { // eslint-disable-line camelcase
+    const options = { ...opts };
     options.useAuth = true;
     return iNaturalistAPI.get( "identifications/similar_species", params, options )
       .then( response => {
         if ( response.results ) {
           response.results = response.results.map( r => (
-            Object.assign( { }, r, { taxon: new Taxon( r.taxon ) } )
+            { ...r, taxon: new Taxon( r.taxon ) }
           ) );
         }
         return response;
       } );
   }
 
-  static recent_taxa( params, opts ) { // eslint-disable-line camelcase
-    const options = Object.assign( { }, opts || { } );
+  static recent_taxa( params, opts = { } ) { // eslint-disable-line camelcase
+    const options = { ...opts };
     options.useAuth = true;
     return iNaturalistAPI.get( "identifications/recent_taxa", params, options )
       .then( response => {
         if ( response.results ) {
           response.results = response.results.map( res => {
-            const r = Object.assign( { }, res );
+            const r = { ...res };
             r.taxon = new Taxon( r.taxon );
             r.identification = new Identification( r.identification );
             if ( r.identification?.observation?.identifications ) {
@@ -54,14 +54,14 @@ const identifications = class identifications {
       } );
   }
 
-  static recent_taxa_revisited( params, opts ) { // eslint-disable-line camelcase
-    const options = Object.assign( { }, opts || { } );
+  static recent_taxa_revisited( params, opts = { } ) { // eslint-disable-line camelcase
+    const options = { ...opts };
     options.useAuth = true;
     return iNaturalistAPI.get( "identifications/recent_taxa_revisited", params, options )
       .then( response => {
         if ( response.results ) {
           response.results = response.results.map( res => {
-            const r = Object.assign( { }, res );
+            const r = { ...res };
             r.taxon = new Taxon( r.taxon );
             r.identification = new Identification( r.identification );
             if ( r.identification?.observation?.identifications ) {
@@ -80,7 +80,7 @@ const identifications = class identifications {
       .then( response => {
         if ( response.results ) {
           response.results = response.results.map( r => (
-            Object.assign( { }, r, { user: new User( r.user ) } )
+            { ...r, user: new User( r.user ) }
           ) );
         }
         return response;

lib/endpoints/messages.js

@@ -7,20 +7,22 @@ const messages = class messages {
       .then( Message.typifyInstanceResponse );
   }
 
-  static search( params, options ) {
-    const opts = Object.assign( {}, options, {
+  static search( params, options = { } ) {
+    const opts = {
+      ...options,
       useWriteApi: true,
       useAuth: true
-    } );
+    };
     return iNaturalistAPI.get( "messages", params, opts )
       .then( Message.typifyResultsResponse );
   }
 
-  static fetch( params, options ) {
-    const opts = Object.assign( {}, options, {
+  static fetch( params, options = { } ) {
+    const opts = {
+      ...options,
       useWriteApi: true,
       useAuth: true
-    } );
+    };
     return iNaturalistAPI.get( "messages/:id", params, opts )
       .then( Message.typifyResultsResponse );
   }
@@ -29,11 +31,12 @@ const messages = class messages {
     return iNaturalistAPI.delete( "messages/:id", params, options );
   }
 
-  static unread( params, options ) {
-    const opts = Object.assign( {}, options, {
+  static unread( params, options = { } ) {
+    const opts = {
+      ...options,
       useWriteApi: true,
       useAuth: true
-    } );
+    };
     return iNaturalistAPI.get( "messages/count", params, opts );
   }
 };

lib/endpoints/observation_photos.js

@@ -13,8 +13,8 @@ const observationPhotos = class observationPhotos {
     return iNaturalistAPI.upload( "observation_photos", params, options );
   }
 
-  static update( params, opts ) {
-    const options = Object.assign( { }, opts );
+  static update( params, opts = { } ) {
+    const options = { ...opts };
 
     if ( iNaturalistAPI.apiURL && iNaturalistAPI.apiURL.match( /\/v2/ ) ) {
       return iNaturalistAPI.put( "observation_photos/:id", params, options );

lib/endpoints/observation_sounds.js

@@ -13,8 +13,8 @@ const observationSounds = class observationSounds {
     return iNaturalistAPI.upload( "observation_sounds", params, options );
   }
 
-  static update( params, opts ) {
-    const options = Object.assign( { }, opts );
+  static update( params, opts = { } ) {
+    const options = { ...opts };
 
     if ( iNaturalistAPI.apiURL && iNaturalistAPI.apiURL.match( /\/v2/ ) ) {
       return iNaturalistAPI.put( "observation_sounds/:id", params, options );

lib/endpoints/observations.js

@@ -28,7 +28,6 @@ const observations = class observations {
   }
 
   static unfave( params, options ) {
-    // return observations.unvote( params, options );
     if ( !iNaturalistAPI.apiURL || !iNaturalistAPI.apiURL.match( /\/v2/ ) ) {
       return observations.unvote( params, options );
     }

lib/endpoints/projects.js

@@ -24,7 +24,7 @@ const projects = class projects {
 
   static update( params, options ) {
     return iNaturalistAPI
-      .upload( "projects/:id", params, Object.assign( { }, options, { method: "put" } ) )
+      .upload( "projects/:id", params, { ...options, method: "put" } )
       .then( Project.typifyInstanceResponse );
   }
 
@@ -65,8 +65,11 @@ const projects = class projects {
   }
 
   static subscriptions( params, options ) {
-    return iNaturalistAPI.get( "projects/:id/subscriptions", params,
-      iNaturalistAPI.optionsUseAuth( options ) );
+    return iNaturalistAPI.get(
+      "projects/:id/subscriptions",
+      params,
+      iNaturalistAPI.optionsUseAuth( options )
+    );
   }
 
   static followers( params, options ) {
@@ -78,8 +81,11 @@ const projects = class projects {
   }
 
   static membership( params, options ) {
-    return iNaturalistAPI.get( "projects/:id/membership", params,
-      iNaturalistAPI.optionsUseAuth( options ) );
+    return iNaturalistAPI.get(
+      "projects/:id/membership",
+      params,
+      iNaturalistAPI.optionsUseAuth( options )
+    );
   }
 
   static feature( params, options ) {

lib/endpoints/users.js

@@ -71,6 +71,12 @@ const users = class users {
       ...opts, useAuth: true
     } );
   }
+
+  static recent_observation_fields( params, opts = { } ) {
+    return iNaturalistAPI.get( "users/recent_observation_fields", params, {
+      ...opts, useAuth: true
+    } );
+  }
 };
 
 module.exports = users;

lib/models/authorized_application.js

@@ -1,8 +1,8 @@
 const Model = require( "./model" );
 
 const AuthorizedApplication = class AuthorizedApplication extends Model {
-  static typifyInstanceResponse( response ) {
-    return super.typifyInstanceResponse( response, AuthorizedApplication );
+  static typifyResultsResponse( response ) {
+    return super.typifyResultsResponse( response, AuthorizedApplication );
   }
 };
 

lib/models/conservation_status.js

@@ -1,10 +1,6 @@
 const Model = require( "./model" );
 
 const ConservationStatus = class ConservationStatus extends Model {
-  static typifyInstanceResponse( response ) {
-    return super.typifyInstanceResponse( response, ConservationStatus );
-  }
-
   iucnStatus( ) {
     switch ( this.iucn ) {
       case 0:
@@ -53,6 +49,9 @@ const ConservationStatus = class ConservationStatus extends Model {
       case "Norma Oficial 059":
         return this.normaStatus( );
       default:
+        if ( !this.status ) {
+          return this.status;
+        }
         switch ( this.status.toLowerCase( ) ) {
           case "se":
           case "fe":

lib/models/provider_authorization.js

@@ -1,8 +1,8 @@
 const Model = require( "./model" );
 
 const ProviderAuthorization = class ProviderAuthorization extends Model {
-  static typifyInstanceResponse( response ) {
-    return super.typifyInstanceResponse( response, ProviderAuthorization );
+  static typifyResultsResponse( response ) {
+    return super.typifyResultsResponse( response, ProviderAuthorization );
   }
 };
 

lib/test_helper.js

@@ -1,3 +1,5 @@
+const iNaturalistAPI = require( "./inaturalist_api" );
+
 const testHelper = class testHelper {
   static mockResponse( uri ) {
     return {
@@ -161,6 +163,20 @@ const testHelper = class testHelper {
       ]
     } );
   }
+
+  static v1ToV2( ) {
+    iNaturalistAPI.setConfig( {
+      apiURL: iNaturalistAPI.apiURL.replace( "/v1", "/v2" ),
+      writeApiURL: iNaturalistAPI.apiURL.replace( "/v1", "/v2" )
+    } );
+  }
+
+  static v2ToV1( ) {
+    iNaturalistAPI.setConfig( {
+      apiURL: iNaturalistAPI.apiURL.replace( "/v2", "/v1" ),
+      writeApiURL: iNaturalistAPI.apiURL.replace( "/v2", "/v1" )
+    } );
+  }
 };
 
 module.exports = testHelper;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inaturalistjs",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "inaturalistjs",
   "author": "iNaturalist",
   "license": "MIT",

test/endpoints/authorized_applications.js

@@ -24,6 +24,7 @@ describe( "AuthorizedApplications", ( ) => {
         } );
       authorizedApplications.search( ).then( r => {
         nockScope.done( );
+        expect( r.results[0].constructor.name ).to.eq( "AuthorizedApplication" );
         expect( r.results[0].application.id ).to.eq( stub.application.id );
         expect( r.results[0].application.name ).to.eq( stub.application.name );
         expect( r.results[0].created_at ).to.eq( stub.created_at );