lib/ffaker/time.rb in ffaker-2.9.0 vs lib/ffaker/time.rb in ffaker-2.10.0

@@ -16,31 +16,29 @@
 
     def day_of_week(options = {})
       fetch_sample(DAYS_OF_WEEK)[0..(options[:long] ? 10 : 2)]
     end
 
-    def date(params = {})
+    def datetime(params = {})
       years_back = params[:year_range] || 5
       latest_year = params [:year_latest] || 0
-      year = (rand * years_back).ceil + (::Time.now.year - latest_year - years_back)
-      month = (rand * 12).ceil
-      day = (rand * 31).ceil
-      hours = params[:hours] || 0
-      minutes = params[:minutes] || 0
-      series = [date = ::Time.local(year, month, day, hours, minutes)]
+      year = (rand * years_back).ceil + (::DateTime.now.year - latest_year - years_back)
+      month = rand(1..12)
+      day = rand(1..Date.new(year, month, -1).day)
+      hours = params[:hours] || rand(0..23)
+      minutes = params[:minutes] || rand(0..59)
+      series = [date = ::DateTime.new(year, month, day, hours, minutes)]
       if params[:series]
         params[:series].each do |some_time_after|
           series << series.last + (rand * some_time_after).ceil
         end
         return series
       end
-      date.strftime '%Y-%m-%d %T %z'
+      date
     end
 
-    def datetime(params = {})
-      hours = params[:hours] || (rand * 12).ceil
-      minutes = params[:minutes] || (rand * 59).ceil
-      date(params.merge(hours: hours, minutes: minutes))
+    def date(params = {})
+      datetime(params).to_date
     end
 
     def between(from, to)
       from_value = convert_to_time(from)
       to_value = convert_to_time(to)