lib/evertils/common/query/time.rb in evertils-common-0.3.1 vs lib/evertils/common/query/time.rb in evertils-common-0.3.2

@@ -1,99 +1,88 @@
 module Evertils
   module Common
     module Query
       class Time < Query::Base
-
         #
         # @since 0.2.8
-        def notes_created_in_range(start, finish = nil)
+        def notes_in_range(start, finish = nil, period = :created)
           finish = DateTime.now if !finish
-          note_manager = Evertils::Common::Entity::Note.new
+          note_manager = Evertils::Common::Entity::Notes.new
 
-          note_manager.find_by_date_range(start, finish)
+          note_manager.find_by_date_range(start, finish, period)
         end
 
         #
         # @since 0.2.8
-        def notes_updated_in_range(start, finish = nil)
-          finish = DateTime.now if !finish
-          note_manager = Evertils::Common::Entity::Note.new
-
-          note_manager.find_by_date_range(start, finish, :updated)
-        end
-
-        #
-        # @since 0.2.8
         def notes_created_on(date = DateTime.now)
-          note_manager = Evertils::Common::Entity::Note.new
-
-          # start should be used for both start and end here
+          note_manager = Evertils::Common::Entity::Notes.new
           note_manager.find_by_date(date)
         end
 
         #
         # @since 0.2.8
         def notes_updated_on(date = DateTime.now)
-          note_manager = Evertils::Common::Entity::Note.new
-
-          # start should be used for both start and end here
+          note_manager = Evertils::Common::Entity::Notes.new
           note_manager.find_by_date(date, :updated)
         end
 
         #
         # @since 0.2.8
         def notebooks_created_in_range(start, finish = nil)
           finish = DateTime.now if !finish
-          notebook_manager = Evertils::Common::Entity::Notebook.new
+          notebook_manager = Evertils::Common::Entity::Notebooks.new
 
           notebook_manager.find_by_date_range(start, finish)
         end
 
         #
         # @since 0.2.8
         def notebooks_updated_in_range(start, finish = nil)
           finish = DateTime.now if !finish
-          notebook_manager = Evertils::Common::Entity::Notebook.new
+          notebook_manager = Evertils::Common::Entity::Notebooks.new
 
           notebook_manager.find_by_date_range(start, finish, :updated)
         end
 
         #
         # @since 0.2.8
         def last_year
           filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
           filter.words = "created:year-1"
 
-          @evernote.call(:findNotesMetadata, filter, nil, 300)
+          note_manager = Evertils::Common::Entity::Notes.new
+          note_manager.find_by_filter(filter)
         end
 
         #
         # @since 0.2.8
         def last_month
           filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
           filter.words = "created:month-1"
 
-          @evernote.call(:findNotesMetadata, filter, nil, 300)
+          note_manager = Evertils::Common::Entity::Notes.new
+          note_manager.find_by_filter(filter)
         end
 
         #
         # @since 0.2.8
         def last_week
           filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
           filter.words = "created:week-1"
 
-          @evernote.call(:findNotesMetadata, filter, nil, 300)
+          note_manager = Evertils::Common::Entity::Notes.new
+          note_manager.find_by_filter(filter)
         end
 
         #
         # @since 0.2.8
         def yesterday
           filter = ::Evernote::EDAM::NoteStore::NoteFilter.new
           filter.words = "created:day-1"
 
-          @evernote.call(:findNotesMetadata, filter, nil, 300)
+          note_manager = Evertils::Common::Entity::Notes.new
+          note_manager.find_by_filter(filter)
         end
-
       end
     end
   end
 end