date_breakup 2.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f5169901ddfd246e1258b86eae3a6d7947c6f685a0c986f6b098d09519347e2
-  data.tar.gz: 9bad2347cb86b12f4e53552c0a2c59f22036445045f68e7580d1c6290442e56a
+  metadata.gz: 21887235144f6659466a3e0d709417dab4bd9d9dd6f5686e036e01f8890d8e3d
+  data.tar.gz: 7842cf3953652600cd749bd8a1b212d4967476f0aade5899dba0100ddb642ed2
 SHA512:
-  metadata.gz: d73dae5066c6f626f9bbf5a7be5aed0a11cc88f29138d88f907b8aca317534468229c4ccc049b4d6583bd8bdcc40e628255d27acf1fdc2b638a177cf3336818f
-  data.tar.gz: e85a1c91c06bea7d3a060230f8b9295f6a5a2f7f2baead68262b88dd6c3f3f09fd39672ea16da673c081b9e6714854339a108d23f6908bf19a872a3f3b244396
+  metadata.gz: 1b964d8d15cb315b57fef5109c2c013fdfbfe0f740d09eea092152ae02b29bda6dffb852cd77138d462ad99b3b9105f23b7b3e759119078ae5014d5e03045a87
+  data.tar.gz: 37aaf14964872d38432d51135915065913224db2f82d9e813946b5bccfafaf4b8fbbe29d720d641ebd23b0fc77b889bf9f36c9169d5d6483e21038d1d5715b55

data/.gitignore

@@ -10,4 +10,5 @@
 # rspec failure tracking
 .rspec_status
 
-*.gem
+*.gem
+*.DS_STORE

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in date_breakup.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    date_breakup (3.0.1)
+      date (~> 3.1, >= 3.1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.3)
+    date (3.1.1)
+    diff-lcs (1.4.4)
+    method_source (1.0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+
+PLATFORMS
+  x86_64-darwin-20
+
+DEPENDENCIES
+  bundler (~> 2.2, >= 2.2.20)
+  date_breakup!
+  pry (~> 0.14.1)
+  rake (~> 13.0, >= 13.0.3)
+  rspec (~> 3.10)
+
+BUNDLED WITH
+   2.2.20

data/README.md

@@ -1,4 +1,10 @@
 # DateBreakup
+VERSION 3 is Live Now.
+
+What's New?
+- The code to generate data has been cleaned and made dynamic.
+- Dependencies has been updated.
+- The class name has changed and methods too. (Please refer the examples below)
 
 ## Installation
 
@@ -20,11 +26,103 @@ Or install it yourself as:
 
 ### Pass in 2 Date(String) & get a breakup of dates in years, months, weeks & days
 
+#### FOR YEARS (BREAKUP in YEARS, MONTHS, WEEKS, DAYS)
 ```ruby
-DateBreakup::Range.between('01/01/2019', '31/12/2019').get_accurate
+# Was: DateBreakup::Range.between('01/01/2019', '31/12/2019').get_years
+DateBreakup.between('01/01/2019', '31/12/2019').in_years
 => {
     :years=>[
       {:year=>2019, :start_date=>Sat, 01 Jan 2019, :end_date=>Sat, 31 Dec 2019}
+    ],
+    :months=>[],
+    :weeks=>[],
+    :days=>[]
+  }
+```
+
+#### FOR MONTHS (BREAKUP in MONTHS, WEEKS, DAYS)
+```ruby
+# Was: DateBreakup::Range.between('01/01/2019', '31/12/2019').get_months
+DateBreakup.between('01/01/2019', '31/12/2019').in_months
+=> {
+    :years=>[],
+    :months=>[
+      {:month=>1, :year=>2019, :start_date=>Tue, 01 Jan 2019, :end_date=>Thu, 31 Jan 2019},
+      {:month=>2, :year=>2019, :start_date=>Fri, 01 Feb 2019, :end_date=>Thu, 28 Feb 2019},
+      {:month=>3, :year=>2019, :start_date=>Fri, 01 Mar 2019, :end_date=>Sun, 31 Mar 2019},
+      {:month=>4, :year=>2019, :start_date=>Mon, 01 Apr 2019, :end_date=>Tue, 30 Apr 2019},
+      {:month=>5, :year=>2019, :start_date=>Wed, 01 May 2019, :end_date=>Fri, 31 May 2019},
+      {:month=>6, :year=>2019, :start_date=>Sat, 01 Jun 2019, :end_date=>Sun, 30 Jun 2019},
+      {:month=>7, :year=>2019, :start_date=>Mon, 01 Jul 2019, :end_date=>Wed, 31 Jul 2019},
+      {:month=>8, :year=>2019, :start_date=>Thu, 01 Aug 2019, :end_date=>Sat, 31 Aug 2019},
+      {:month=>9, :year=>2019, :start_date=>Sun, 01 Sep 2019, :end_date=>Mon, 30 Sep 2019},
+      {:month=>10, :year=>2019, :start_date=>Tue, 01 Oct 2019, :end_date=>Thu, 31 Oct 2019},
+      {:month=>11, :year=>2019, :start_date=>Fri, 01 Nov 2019, :end_date=>Sat, 30 Nov 2019},
+      {:month=>12, :year=>2019, :start_date=>Sun, 01 Dec 2019, :end_date=>Tue, 31 Dec 2019}
+    ],
+    :weeks=>[],
+    :days=>[]
+  }
+```
+#### FOR WEEKS (BREAKUP in WEEKS, DAYS)
+```ruby
+# Was: DateBreakup::Range.between('01/01/2019', '31/12/2019').get_weeks
+DateBreakup.between('01/01/2019', '31/12/2019').in_weeks
+=> {
+    :years=>[],
+    :months=>[],
+    :weeks=>[
+      {:week=>2, :month=>1, :year=>2019, :start_date=>Mon, 07 Jan 2019, :end_date=>Sun, 13 Jan 2019},
+      {:week=>3, :month=>1, :year=>2019, :start_date=>Mon, 14 Jan 2019, :end_date=>Sun, 20 Jan 2019},
+      {:week=>4, :month=>1, :year=>2019, :start_date=>Mon, 21 Jan 2019, :end_date=>Sun, 27 Jan 2019},
+      {:week=>5, :month=>1, :year=>2019, :start_date=>Mon, 28 Jan 2019, :end_date=>Sun, 03 Feb 2019},
+      {:week=>6, :month=>2, :year=>2019, :start_date=>Mon, 04 Feb 2019, :end_date=>Sun, 10 Feb 2019},
+      {:week=>7, :month=>2, :year=>2019, :start_date=>Mon, 11 Feb 2019, :end_date=>Sun, 17 Feb 2019},
+      {:week=>8, :month=>2, :year=>2019, :start_date=>Mon, 18 Feb 2019, :end_date=>Sun, 24 Feb 2019},
+      {:week=>9, :month=>2, :year=>2019, :start_date=>Mon, 25 Feb 2019, :end_date=>Sun, 03 Mar 2019},
+      {:week=>10, :month=>3, :year=>2019, :start_date=>Mon, 04 Mar 2019, :end_date=>Sun, 10 Mar 2019},
+      ...
+      {:week=>43, :month=>10, :year=>2019, :start_date=>Mon, 21 Oct 2019, :end_date=>Sun, 27 Oct 2019},
+      {:week=>44, :month=>10, :year=>2019, :start_date=>Mon, 28 Oct 2019, :end_date=>Sun, 03 Nov 2019},
+      {:week=>45, :month=>11, :year=>2019, :start_date=>Mon, 04 Nov 2019, :end_date=>Sun, 10 Nov 2019},
+      {:week=>46, :month=>11, :year=>2019, :start_date=>Mon, 11 Nov 2019, :end_date=>Sun, 17 Nov 2019},
+      {:week=>47, :month=>11, :year=>2019, :start_date=>Mon, 18 Nov 2019, :end_date=>Sun, 24 Nov 2019},
+      {:week=>48, :month=>11, :year=>2019, :start_date=>Mon, 25 Nov 2019, :end_date=>Sun, 01 Dec 2019},
+      {:week=>49, :month=>12, :year=>2019, :start_date=>Mon, 02 Dec 2019, :end_date=>Sun, 08 Dec 2019},
+      {:week=>50, :month=>12, :year=>2019, :start_date=>Mon, 09 Dec 2019, :end_date=>Sun, 15 Dec 2019},
+      {:week=>51, :month=>12, :year=>2019, :start_date=>Mon, 16 Dec 2019, :end_date=>Sun, 22 Dec 2019},
+      {:week=>52, :month=>12, :year=>2019, :start_date=>Mon, 23 Dec 2019, :end_date=>Sun, 29 Dec 2019}
+    ],
+    :days=>[
+      {:day=>1, :month_day=>1, :month=>1, :year=>2019, :start_date=>Tue, 01 Jan 2019, :end_date=>Tue, 01 Jan 2019},
+      {:day=>2, :month_day=>2, :month=>1, :year=>2019, :start_date=>Wed, 02 Jan 2019, :end_date=>Wed, 02 Jan 2019},
+      {:day=>3, :month_day=>3, :month=>1, :year=>2019, :start_date=>Thu, 03 Jan 2019, :end_date=>Thu, 03 Jan 2019},
+      {:day=>4, :month_day=>4, :month=>1, :year=>2019, :start_date=>Fri, 04 Jan 2019, :end_date=>Fri, 04 Jan 2019},
+      {:day=>5, :month_day=>5, :month=>1, :year=>2019, :start_date=>Sat, 05 Jan 2019, :end_date=>Sat, 05 Jan 2019},
+      {:day=>6, :month_day=>6, :month=>1, :year=>2019, :start_date=>Sun, 06 Jan 2019, :end_date=>Sun, 06 Jan 2019},
+      {:day=>364, :month_day=>30, :month=>12, :year=>2019, :start_date=>Mon, 30 Dec 2019, :end_date=>Mon, 30 Dec 2019},
+      {:day=>365, :month_day=>31, :month=>12, :year=>2019, :start_date=>Tue, 31 Dec 2019, :end_date=>Tue, 31 Dec 2019}
+    ]
+  }
+```
+#### FOR DAYS (BREAKUP in DAYS)
+```ruby
+# Was: DateBreakup::Range.between('01/01/2019', '31/12/2019').get_days
+DateBreakup.between('01/01/2019', '31/12/2019').in_days
+=> {
+    :years=>[],
+    :months=>[],
+    :weeks=>[],
+    :days=>[
+      {:day=>1, :month_day=>1, :month=>1, :year=>2019, :start_date=>Tue, 01 Jan 2019, :end_date=>Tue, 01 Jan 2019},
+      {:day=>2, :month_day=>2, :month=>1, :year=>2019, :start_date=>Wed, 02 Jan 2019, :end_date=>Wed, 02 Jan 2019},
+      {:day=>3, :month_day=>3, :month=>1, :year=>2019, :start_date=>Thu, 03 Jan 2019, :end_date=>Thu, 03 Jan 2019},
+      {:day=>4, :month_day=>4, :month=>1, :year=>2019, :start_date=>Fri, 04 Jan 2019, :end_date=>Fri, 04 Jan 2019},
+      {:day=>5, :month_day=>5, :month=>1, :year=>2019, :start_date=>Sat, 05 Jan 2019, :end_date=>Sat, 05 Jan 2019},
+      {:day=>6, :month_day=>6, :month=>1, :year=>2019, :start_date=>Sun, 06 Jan 2019, :end_date=>Sun, 06 Jan 2019},
+      ...
+      {:day=>364, :month_day=>30, :month=>12, :year=>2019, :start_date=>Mon, 30 Dec 2019, :end_date=>Mon, 30 Dec 2019},
+      {:day=>365, :month_day=>31, :month=>12, :year=>2019, :start_date=>Tue, 31 Dec 2019, :end_date=>Tue, 31 Dec 2019}
     ]
   }
 ```
@@ -32,7 +130,8 @@ DateBreakup::Range.between('01/01/2019', '31/12/2019').get_accurate
 ### More Further Apart Dates
 
 ```ruby
-DateBreakup::Range.between('10/10/2010', '12/12/2012').get_accurate
+# Was: DateBreakup::Range.between('10/10/2010', '12/12/2012').get_years
+DateBreakup.between('10/10/2010', '12/12/2012').in_years
 => {
     :years=>[
       {:year=>2011, :start_date=>Sat, 01 Jan 2011, :end_date=>Sat, 31 Dec 2011}
@@ -71,11 +170,11 @@ DateBreakup::Range.between('10/10/2010', '12/12/2012').get_accurate
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org). -->
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/date_breakup. -->
+Bug reports and pull requests are welcome on GitHub at https://github.com/HuzaifaSaifuddin/date_breakup.
 
 ## License
 

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "date_breakup"
+require 'bundler/setup'
+require 'date_breakup'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "date_breakup"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/date_breakup.gemspec

@@ -1,41 +1,40 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "date_breakup/version"
+require 'date_breakup'
 
 Gem::Specification.new do |spec|
-  spec.name          = "date_breakup"
+  spec.name          = 'date_breakup'
   spec.version       = DateBreakup::VERSION
-  spec.authors       = ["Huzaifa Saifuddin"]
-  spec.email         = ["Huzaifa@Huzaifas-MacBook-Pro.local"]
+  spec.authors       = ['Huzaifa Saifuddin']
+  spec.email         = ['Huzaifa@Huzaifas-MacBook-Pro.local']
 
-  spec.summary       = "Feed in 2 dates and get a breakup of dates grouped in years, months, weeks & days"
-  spec.description   = "Feed in 2 dates and get a breakup of dates grouped in years, months, weeks & days"
-  spec.homepage      = "https://github.com/HuzaifaSaifuddin/date_breakup"
-  spec.license       = "MIT"
+  spec.summary       = 'Feed in 2 dates and get a breakup of dates grouped in years, months, weeks & days'
+  spec.description   = 'Feed in 2 dates and get a breakup of dates grouped in years, months, weeks & days'
+  spec.homepage      = 'https://github.com/HuzaifaSaifuddin/date_breakup'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry", "~> 1.0"
+  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.20'
+  spec.add_development_dependency 'pry', '~> 0.14.1'
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.3'
+  spec.add_development_dependency 'rspec', '~> 3.10'
 
-  spec.add_runtime_dependency 'date', '~> 2.0'
+  spec.add_runtime_dependency 'date', '~> 3.1', '>= 3.1.1'
 end

data/lib/date_breakup.rb

@@ -1,183 +1,49 @@
-require "date_breakup/version"
-require "time_difference"
+# frozen_string_literal: true
 
-module DateBreakup
-  class Range
-    private_class_method :new
+require 'rubygems'
+require 'time_difference'
 
-    def self.between(date1, date2)
-      new(Date.parse(date1), Date.parse(date2))
-    end
-
-    def get_years
-      get_year_array(@date1, @date2)
-
-      output = { years: @year_array, months: @month_array, weeks: @week_array, days: @day_array }
-    end
-
-    def get_months
-      get_month_array(@date1, @date2)
-
-      output = { years: @year_array, months: @month_array, weeks: @week_array, days: @day_array }
-    end
-
-    def get_weeks
-      get_week_array(@date1, @date2)
-
-      output = { years: @year_array, months: @month_array, weeks: @week_array, days: @day_array }
-    end
-
-    def get_days
-      get_day_array(@date1, @date2)
-
-      output = { years: @year_array, months: @month_array, weeks: @week_array, days: @day_array }
-    end
-
-    private
-
-    def initialize(date1, date2)
-      @date1 = date1
-      @date2 = date2
-      @year_array = Array.new
-      @month_array = Array.new
-      @week_array = Array.new
-      @day_array = Array.new
-    end
-
-    def get_year_array(date, end_date)
-      move_to_date = true
-      # YEAR
-      if move_to_date
-        if date.beginning_of_year == date
-          if date.end_of_year <= @date2
-            date, move_to_date = get_year_data(date)
-          end
-        end
-      end
-
-      # MONTH
-      if move_to_date
-        if date.beginning_of_month == date
-          if date.end_of_month <= @date2
-            date, move_to_date = get_month_data(date)
-          end
-        end
-      end
-
-      # Week
-      if move_to_date
-        if date.beginning_of_week == date && date.end_of_week <= @date2
-          if date.beginning_of_week.month == date.end_of_week.month || date.end_of_week.end_of_month >= @date2
-            date, move_to_date = get_week_data(date)
-          end
-        end
-      end
-
-      # DAY
-      if move_to_date
-        date, move_to_date = get_date_data(date)
-      end
-
-      if date <= end_date
-        get_year_array(date, end_date)
-      end
-    end
+class DateBreakup
+  VERSION = '3.0.1'
 
-    def get_month_array(date, end_date)
-      move_to_date = true
-      # MONTH
-      if move_to_date
-        if date.beginning_of_month == date
-          if date.end_of_month <= @date2
-            date, move_to_date = get_month_data(date)
-          end
-        end
-      end
-
-      # Week
-      if move_to_date
-        if date.beginning_of_week == date && date.end_of_week <= @date2
-          if date.beginning_of_week.month == date.end_of_week.month || date.end_of_week.end_of_month >= @date2
-            date, move_to_date = get_week_data(date)
-          end
-        end
-      end
+  def self.between(start_date, end_date)
+    new(Date.parse(start_date), Date.parse(end_date))
+  end
 
-      # DAY
-      if move_to_date
-        date, move_to_date = get_date_data(date)
-      end
+  def initialize(start_date, end_date)
+    @start_date = start_date
+    @end_date = end_date
 
-      if date <= end_date
-        get_month_array(date, end_date)
-      end
-    end
+    @years = []
+    @months = []
+    @weeks = []
+    @days = []
+  end
 
-    def get_week_array(date, end_date)
-      move_to_date = true
-      # Week
-      if move_to_date
-        if date.beginning_of_week == date && date.end_of_week <= @date2
-          date, move_to_date = get_week_data(date)
+  # Methods
+  # in_years, in_months, in_weeks, in_days
+  %w[years months weeks days].each do |method|
+    define_method "in_#{method}" do
+      date = @start_date
+      while date <= @end_date
+        if ['years'].include?(method) && date.beginning_of_year == date && @end_date >= date.end_of_year
+          @years << { year: date.year, start_date: date, end_date: date.end_of_year }
+          date = date.end_of_year + 1.day
+        elsif ['years', 'months'].include?(method) && date.beginning_of_month == date && @end_date >= date.end_of_month
+          @months << { month: date.month, year: date.year, start_date: date, end_date: date.end_of_month }
+          date = date.end_of_month + 1.day
+        elsif ['years', 'months', 'weeks'].include?(method) && date.beginning_of_week == date && @end_date >= date.end_of_week
+          @weeks << { week: date.cweek, month: date.month, year: date.year, start_date: date,
+                      end_date: date.end_of_week }
+          date = date.end_of_week + 1.day
+        else
+          @days << { day: date.yday, month_day: date.mday, month: date.month, year: date.year, start_date: date,
+                     end_date: date }
+          date += 1.day
         end
       end
 
-      # DAY
-      if move_to_date
-        date, move_to_date = get_date_data(date)
-      end
-
-      if date <= end_date
-        get_week_array(date, end_date)
-      end
-    end
-
-    def get_day_array(date, end_date)
-      move_to_date = true
-      # DAY
-      if move_to_date
-        date, move_to_date = get_date_data(date)
-      end
-
-      if date <= end_date
-        get_day_array(date, end_date)
-      end
-    end
-
-    def get_year_data(date)
-      year_hash = { year: date.year, start_date: date, end_date: date.end_of_year }
-      @year_array << year_hash
-      new_date = date.end_of_year + 1.day
-      move_to_date = false
-
-      return new_date, move_to_date
-    end
-
-    def get_month_data(date)
-      month_hash = { month: date.month, year: date.year, start_date: date, end_date: date.end_of_month }
-      @month_array << month_hash
-      new_date = date.end_of_month + 1.day
-      move_to_date = false
-
-      return new_date, move_to_date
-    end
-
-    def get_week_data(date)
-      week_hash = { week: date.cweek, month: date.month, year: date.year, start_date: date, end_date: date.end_of_week }
-      @week_array << week_hash
-      new_date = date.end_of_week + 1.day
-      move_to_date = false
-
-      return new_date, move_to_date
-    end
-
-    def get_date_data(date)
-      day_hash = { day: date.yday, month_day: date.mday, month: date.month, year: date.year, start_date: date, end_date: date }
-      @day_array << day_hash
-      new_date = date + 1.day
-      move_to_date = false
-
-      return new_date, move_to_date
+      { years: @years, months: @months, weeks: @weeks, days: @days }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: date_breakup
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Huzaifa Saifuddin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,88 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.20
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: date
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 description: Feed in 2 dates and get a breakup of dates grouped in years, months,
   weeks & days
 email:
@@ -92,6 +110,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -99,14 +118,12 @@ files:
 - bin/setup
 - date_breakup.gemspec
 - lib/date_breakup.rb
-- lib/date_breakup/version.rb
-- lib/date_breakup_v1.rb
 homepage: https://github.com/HuzaifaSaifuddin/date_breakup
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Feed in 2 dates and get a breakup of dates grouped in years, months, weeks
   & days

data/lib/date_breakup/version.rb

@@ -1,3 +0,0 @@
-module DateBreakup
-  VERSION = "2.0.0"
-end

data/lib/date_breakup_v1.rb

@@ -1,215 +0,0 @@
-require "date_breakup/version"
-require "time_difference"
-
-module DateBreakup
-  class Range
-    private_class_method :new
-
-    def self.between(date1, date2)
-      new(Date.parse(date1), Date.parse(date2))
-    end
-
-    def get_accurate
-      years, remaining_dates_year = get_years(@date1, @date2)
-
-      months, remaining_dates_month = get_months(remaining_dates_year)
-
-      weeks, remaining_dates_week = get_weeks(remaining_dates_month)
-
-      days, remaining_dates_days = get_days(remaining_dates_week)
-
-      output = { years: years, months: months, weeks: weeks, days: days }
-    end
-
-    private
-
-    def initialize(date1, date2)
-      @date1 = date1
-      @date2 = date2
-    end
-
-    def get_years(date1, date2)
-      year_array = []
-      remaining_dates = []
-
-      if date1.beginning_of_year == date1 && date1.end_of_year <= date2
-        year_hash = { year: date1.year, start_date: date1.beginning_of_year, end_date: date1.end_of_year }
-        year_array << year_hash
-      end
-
-      get_year_range(date1, date2, year_array, year_hash)
-
-      if year_array.count > 0
-        if(date1 != year_array[0][:start_date])
-          remaining_dates_hash = { date1: date1, date2: year_array[0][:start_date] - 1 }
-          remaining_dates << remaining_dates_hash
-        end
-
-        if(date2 != year_array[-1][:end_date])
-          remaining_dates_hash = { date1: year_array[-1][:end_date] + 1, date2: date2 }
-          remaining_dates << remaining_dates_hash
-        end
-      else
-        remaining_dates << { date1: date1, date2: date2 }
-      end
-
-      return year_array, remaining_dates
-    end
-
-    def get_months(remaining_dates_year)
-      month_array = []
-      remaining_dates = []
-
-      remaining_dates_year.each do |rd|
-        date1, date2 = rd[:date1], rd[:date2]
-        if date1.beginning_of_month == date1 && date1.end_of_month <= date2
-          month_hash = { month: date1.month, year: date1.year, start_date: date1.beginning_of_month, end_date: date1.end_of_month }
-          month_array << month_hash
-        end
-
-        get_month_range(date1, date2, month_array, month_hash)
-      end
-
-
-      if month_array.count > 0
-        month_arrx1 = month_array.sort_by{ |ma| ma[:start_date] }.select{ |wa| wa[:year] == remaining_dates_year[0][:date1].year }.first
-
-        if month_arrx1
-          if(remaining_dates_year[0][:date1] != month_arrx1[:start_date])
-            remaining_dates_hash = { date1: remaining_dates_year[0][:date1], date2: month_arrx1[:start_date] - 1 }
-            remaining_dates << remaining_dates_hash
-          end
-        else
-          remaining_dates_hash = { date1: remaining_dates_year[0][:date1], date2: remaining_dates_year[0][:date2] }
-          remaining_dates << remaining_dates_hash
-        end
-
-        month_arrx2 = month_array.sort_by{ |ma| ma[:start_date] }.select{ |wa| wa[:year] == remaining_dates_year[-1][:date2].year }.last
-        if month_arrx2
-          if(remaining_dates_year[-1][:date2] != month_arrx2[:end_date])
-            remaining_dates_hash = { date1: month_arrx2[:end_date] + 1, date2: remaining_dates_year[-1][:date2] }
-            remaining_dates << remaining_dates_hash
-          end
-        else
-          remaining_dates_hash = { date1: remaining_dates_year[-1][:date1], date2: remaining_dates_year[-1][:date2] }
-          remaining_dates << remaining_dates_hash
-        end
-      else
-        remaining_dates = remaining_dates_year
-      end
-
-      return month_array, remaining_dates
-    end
-
-    def get_weeks(remaining_dates_month)
-      week_array = []
-      remaining_dates = []
-
-      remaining_dates_month.each do |rd|
-        date1, date2 = rd[:date1], rd[:date2]
-        if date1.beginning_of_week == date1 && date1.end_of_week <= date2
-          week_hash = { week: date1.cweek, month: date1.month, year: date1.year, start_date: date1.beginning_of_week, end_date: date1.end_of_week }
-          week_array << week_hash
-        end
-
-        get_week_range(date1, date2, week_array, week_hash)
-      end
-
-      if week_array.count > 0
-        week_arrx1 = week_array.sort_by{ |ma| ma[:start_date] }.select{ |wa| wa[:month] == remaining_dates_month[0][:date1].month }.first
-        if week_arrx1
-          if(remaining_dates_month[0][:date1] != week_arrx1[:start_date])
-            remaining_dates_hash = { date1: remaining_dates_month[0][:date1], date2: week_arrx1[:start_date] - 1 }
-            remaining_dates << remaining_dates_hash
-          end
-        end
-
-        week_arrx2 = week_array.sort_by{ |ma| ma[:start_date] }.select{ |wa| wa[:month] == remaining_dates_month[0][:date2].month }.last
-        if week_arrx2
-          if(remaining_dates_month[0][:date2] != week_arrx2[:end_date])
-            remaining_dates_hash = { date1: week_arrx2[:end_date] + 1, date2: remaining_dates_month[0][:date2] }
-            remaining_dates << remaining_dates_hash
-          end
-        end
-
-        week_arrx3 = week_array.sort_by{ |ma| ma[:start_date] }.select{ |wa| wa[:month] == remaining_dates_month[-1][:date1].month }.first
-        if week_arrx3
-          if(remaining_dates_month[0][:date1] != week_arrx3[:end_date])
-            remaining_dates_hash = { date1: remaining_dates_month[-1][:date1], date2: week_arrx3[:start_date] - 1 }
-            remaining_dates << remaining_dates_hash
-          end
-        end
-
-        week_arrx4 = week_array.sort_by{ |ma| ma[:start_date] }.select{ |wa| wa[:month] == remaining_dates_month[-1][:date1].month }.last
-        if week_arrx4
-          if(remaining_dates_month[-1][:date2] != week_arrx4[:end_date])
-            remaining_dates_hash = { date1: week_arrx4[:end_date] + 1, date2: remaining_dates_month[-1][:date2] }
-            remaining_dates << remaining_dates_hash
-          end
-        end
-      else
-        remaining_dates = remaining_dates_month
-      end
-
-      return week_array, remaining_dates
-    end
-
-    def get_days(remaining_dates_week)
-      day_array = []
-      remaining_dates = []
-
-      remaining_dates_week.each do |rd|
-        date1, date2 = rd[:date1], rd[:date2]
-        dates = (date1).upto(date2).to_a
-
-        dates.each do |date|
-          unless day_array.find{ |da| da[:start_date] == date }.present?
-            day_hash = { day: date.yday, month_day: date.mday, month: date.month, year: date.year, start_date: date, end_date: date }
-            day_array << day_hash
-          end
-        end
-      end
-
-      return day_array, remaining_dates
-    end
-
-    def get_year_range(date1, date2, year_array, year_hash)
-      next_year = (date1.end_of_year + 1.day)
-      end_next_year = next_year.end_of_year
-      if end_next_year <= date2
-        year = end_next_year.year
-        start_date = next_year.beginning_of_year
-        end_date = end_next_year
-        year_hash = { year: year, start_date: start_date, end_date: end_date }
-        year_array << year_hash
-        get_year_range(next_year, date2, year_array, year_hash)
-      end
-    end
-
-    def get_month_range(date1, date2, month_array, month_hash)
-      next_month = (date1.end_of_month + 1.day)
-      end_next_month = next_month.end_of_month
-      if end_next_month <= date2
-        month = end_next_month.month
-        start_date = next_month.beginning_of_month
-        end_date = end_next_month
-        month_hash = { month: month, year: end_next_month.year, start_date: start_date, end_date: end_date }
-        month_array << month_hash
-        get_month_range(next_month, date2, month_array, month_hash)
-      end
-    end
-
-    def get_week_range(date1, date2, week_array, week_hash)
-      next_week = (date1.end_of_week + 1.day)
-      end_next_week = next_week.end_of_week
-      if end_next_week <= date2
-        week = end_next_week.cweek
-        start_date = next_week.beginning_of_week
-        end_date = end_next_week
-        week_hash = { week: week, month: end_next_week.month, year: end_next_week.year, start_date: start_date, end_date: end_date }
-        week_array << week_hash
-        get_week_range(next_week, date2, week_array, week_hash)
-      end
-    end
-  end
-end