sifttter-redux 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjZhZTIzMTI3NTM1Mjc1MjFhZThiODc5ZmI2YmFkZjc4YTk2ZDY3Yw==
+    ZDU5ZGQ5Y2Q5MjhhMmZkMjczNjk1NGMxNGZkNWM0ZjcwMDRiNGJjYg==
   data.tar.gz: !binary |-
-    OTAxYzExZjZjNDc1MmU5NjVkY2RkYjE1MTU3YzYwNDliMmU5Nzk2YQ==
+    NmEwNjIwMDQxZGVmZDkwNzA1ZDE2ZWJmMGYzM2NjN2MyOTUyYzVhZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDA2Y2VmYTg4YWIzNTFkZTg0YjYyMTAyZGQ1ODM1Y2IzMjE0ZDA5NDkwZjIy
-    ZmQ2NDBhYzExYjIxMjVjM2U1NTY4NDkxYWY2ZmI4NjhlYWY3OTU3ZTVkMjE5
-    M2NiMTFjNTY5NTlmYTljYjY2ZWY4ZDVkZGM3NTk5MWRhNmFkMzE=
+    NTA2NzBlYTgxNjQyMmMxMWVkNDgzYTlkYzlkM2U1ZDAwNDExYzI0M2RlYTE0
+    NGQxYTg4YTUzYmFhOWI5NThiMDRhZjkxZWRhYzZkN2QyYThlMGVhNDJlNDcx
+    Y2ExM2E1OWE3MTUxYWJhYzRjZjQxODY2NWIyYjU0Y2I2MzBlNWI=
   data.tar.gz: !binary |-
-    NDEzOTY5YWZkZmMyZDBiOWRlNWVkOTNhZGNjYmVhNjAzNjFhMmExYTc0ZTgx
-    MDg1ODY4YTM0M2U4MzRkMzkzM2M3YzFiNzdlMGIzZDVhNjQ5ZTAwMjc1NTAz
-    MjI4NmMzN2IzMmRiMjcwMjJlODVlZGRiOWQ5YWZmMGUyMzg4NzY=
+    ZGQ5N2QwNDM2MTAyZmFkY2VjYjg5OWQ3NTdhYTdkNDA2OWQ0MTY4M2Q0YjU2
+    ZDNmNmE1NTJlMTU0N2MyODdlMzBkNDM2MDU1ZmI1NTE4N2RkNDdkMjMwMjNi
+    MDY2YjQ4NzJiMDYyNDZkZTY2YjNlYjMxNzFiYWQ1NGRmMGNhMWE=

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.3.1
+
+* Removed reliance on Rails methods for first-and-last-day-of-week calculations
+* Fixed a bug with the gemspec
+
 # 0.3.0
 
 * Added ability to create entries for the past N days (not just 7)

data/lib/sifttter-redux/constants.rb

@@ -1,5 +1,5 @@
 module SifttterRedux
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
   
   # Sifttter and Sifttter Redux Constants
   SRD_CONFIG_FILEPATH = File.join(ENV['HOME'], '.sifttter_redux')

data/lib/sifttter-redux/date-range-maker.rb

@@ -1,4 +1,3 @@
-require 'active_support/core_ext'
 require 'chronic'
 
 #|  ======================================================
@@ -115,8 +114,8 @@ class DateRangeMaker
       opts[k] = v
     end
     
-    beginning_date = Date.today.at_beginning_of_week
-    end_date = Date.today.at_end_of_week
+    beginning_date = Date.today - Date.today.wday + 1
+    end_date = Date.today - Date.today.wday + 7
     
     # We're currently before the end of the week, so
     # reset the new ending date to today.
@@ -125,9 +124,9 @@ class DateRangeMaker
     end
     
     if (opts[:include_today])
-      _r = (beginning_date - num_weeks.week..end_date)
+      _r = (beginning_date - num_weeks * 7..end_date)
     else
-      _r = (beginning_date - num_weeks.week...end_date)
+      _r = (beginning_date - num_weeks * 7...end_date)
     end
     
     return _r

data/sifttter-redux.gemspec

@@ -22,7 +22,6 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md HISTORY.md LICENSE]
   
   s.add_development_dependency('rake', '~> 0')
-  s.add_runtime_dependency('activesupport', '~> 0')
   s.add_runtime_dependency('chronic', '0.10.2')
   s.add_runtime_dependency('colored','1.2')
   s.add_runtime_dependency('gli','2.9.0')

data/test/catch_up_test.rb

@@ -1,4 +1,3 @@
-require 'active_support/core_ext'
 require 'date'
 require 'test_helper'
 require File.join(File.dirname(__FILE__), '..', 'lib/sifttter-redux/date-range-maker.rb')
@@ -34,39 +33,39 @@ class DefaultTest < Test::Unit::TestCase
   end
   
   def test_current_week
-    end_date = Date.today.at_end_of_week
-    if Date.today.at_end_of_week > Date.today
+    end_date = Date.today - Date.today.wday + 7
+    if end_date > Date.today
       end_date = Date.today
     end
       
-    assert_equal($drm.last_n_weeks, (Date.today.at_beginning_of_week...end_date))
+    assert_equal($drm.last_n_weeks, (Date.today - Date.today.wday + 1...end_date))
   end
   
   def test_current_week_include_today
-    end_date = Date.today.at_end_of_week
-    if Date.today.at_end_of_week > Date.today
+    end_date = Date.today - Date.today.wday + 7
+    if end_date > Date.today
       end_date = Date.today
     end
       
-    assert_equal($drm.last_n_weeks(0, {:include_today => true}), (Date.today.at_beginning_of_week..end_date))
+    assert_equal($drm.last_n_weeks(0, {:include_today => true}), (Date.today - Date.today.wday + 1..end_date))
   end
   
   def test_last_2_weeks
-    end_date = Date.today.at_end_of_week
-    if Date.today.at_end_of_week > Date.today
+    end_date = Date.today - Date.today.wday + 7
+    if end_date > Date.today
       end_date = Date.today
     end
       
-    assert_equal($drm.last_n_weeks(2), (Date.today.at_beginning_of_week - 2.week...end_date))
+    assert_equal($drm.last_n_weeks(2), (Date.today - Date.today.wday - 13...end_date))
   end
   
   def test_last_2_weeks_include_today
-    end_date = Date.today.at_end_of_week
-    if Date.today.at_end_of_week > Date.today
+    end_date = Date.today - Date.today.wday + 7
+    if end_date > Date.today
       end_date = Date.today
     end
       
-    assert_equal($drm.last_n_weeks(2, {:include_today => true}), (Date.today.at_beginning_of_week - 2.week..end_date))
+    assert_equal($drm.last_n_weeks(2, {:include_today => true}), (Date.today - Date.today.wday - 13..end_date))
   end
   
   def test_range_only_start_date

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Aaron Bach
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement