timely 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 584fc428f9daeae0837d23072b66f7f9b243ff64
-  data.tar.gz: 5fb6844cfb6c8d57bd31993de1ad1d61c6bb3359
+  metadata.gz: e269e83cabcd6ebf62cc0e79c35dd7b4c91dc7da
+  data.tar.gz: d4a795800ff6fdf86b2a5d7e3e479f64148172e4
 SHA512:
-  metadata.gz: 09ba7d44b3b223dd336a0bfc80bf3ea265c9ae9f23d69184ce0844640cd1c26068846123908688e4f6dcd701b47437eb6e398d38d76bd41d940832a9d358e573
-  data.tar.gz: 5782e3428094d1272eb40a0923394a24c8196099601430374ccacf86fa59fa6b91606e4818938ba7f8f25bebf7a7ec45b8024938eedea19ea349cae0923cc95c
+  metadata.gz: c4d7a6dc25c00a7ae5db203a787eb1ebfdaa9768cb7283118182dec200621d4bb8660701d6f8a64d9186493237f785e4573f4b1caff234e226aef3653a1da86b
+  data.tar.gz: 9831dec21982816e62f8b301c8ff2c49696c9df083c87c827ebc6b54f9a150e6e5217dd8c9c89616b8c5eca22fb7cde5da50407b2d9bb52bd54a45b527ec8380

data/.rubocop.yml

@@ -0,0 +1,8 @@
+Metrics/LineLength:
+  Max: 80
+
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false # Using Ruby 2.4 doesn't need it

data/.ruby-version

@@ -0,0 +1 @@
+2.4.4

data/.travis.yml

@@ -2,6 +2,12 @@ language: ruby
 rvm:
   - 2.2.2
   - 2.3.0
+  - 2.4
+matrix:
+  fast_finish: true
+  exclude:
+    - rvm: 2.4
+      gemfile: gemfiles/rails3.gemfile
 script: bundle exec rake spec
 gemfile:
   - gemfiles/rails3.gemfile

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+## 0.3.1
+
+* Using Fixnum is deprecated
+
 ## 0.3.0
 
 * Add time zone awareness for Time#on (e.g. Rails)

data/lib/timely/version.rb

@@ -1,3 +1,3 @@
 module Timely
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/timely/week_days.rb

@@ -1,6 +1,6 @@
 module Timely
   class WeekDays
-    WEEKDAY_KEYS = [:sun, :mon, :tue, :wed, :thu, :fri, :sat]
+    WEEKDAY_KEYS = %i[sun mon tue wed thu fri sat]
 
     # Create a new Weekdays object
     # weekdays can be in three formats
@@ -13,20 +13,20 @@ module Timely
     #   e.g. [1, 0, 1, 0, 0, 0, 0] is Sunday and Tuesday
     def initialize(weekdays)
       @weekdays = {
-        :sun => false,
-        :mon => false,
-        :tue => false,
-        :wed => false,
-        :thu => false,
-        :fri => false,
-        :sat => false
+        sun: false,
+        mon: false,
+        tue: false,
+        wed: false,
+        thu: false,
+        fri: false,
+        sat: false
       }
 
       case weekdays
-      when Fixnum
+      when Integer
         # 4 -> 0000100 (binary) -> "0010000" (reversed string) -> {:tue => true}
         weekdays.to_s(2).reverse.each_char.with_index do |char, index|
-          set_day(index, char == '1')
+          set_day(index, char == "1")
         end
       when Hash
         weekdays.each_pair do |day, value|
@@ -38,16 +38,17 @@ module Timely
         end
       when NilClass
         @weekdays = {
-          :sun => true,
-          :mon => true,
-          :tue => true,
-          :wed => true,
-          :thu => true,
-          :fri => true,
-          :sat => true
+          sun: true,
+          mon: true,
+          tue: true,
+          wed: true,
+          thu: true,
+          fri: true,
+          sat: true
         }
       else
-        raise ArgumentError, "You must initialize with an Fixnum, Hash or Array"
+        raise ArgumentError,
+              "You must initialize with an Integer, Hash or Array"
       end
     end
 
@@ -61,15 +62,11 @@ module Timely
     end
 
     def set_day(day, set)
-      key = if day.is_a?(Fixnum)
-        WEEKDAY_KEYS[day]
-      elsif day.is_a?(String)
-        day.to_sym
-      else
-        day
+      key = day_to_index(day)
+      unless WEEKDAY_KEYS.include?(key)
+        raise ArgumentError, "Invalid week day index #{key}"
       end
-      raise ArgumentError, "Invalid week day index #{key}" unless WEEKDAY_KEYS.include?(key)
-      @weekdays[key] = [true, 'true', 1, '1'].include?(set)
+      @weekdays[key] = [true, "true", 1, "1"].include?(set)
     end
 
     def applies_for_date?(date)
@@ -80,33 +77,34 @@ module Timely
     # Accepts either symbol or integer
     # e.g. :sun or 0 = Sunday, :sat or 6 = Saturday
     def has_day?(weekday)
-      weekday = WEEKDAY_KEYS[weekday] if weekday.is_a?(Fixnum)
+      weekday = WEEKDAY_KEYS[weekday] if weekday.is_a?(Integer)
       @weekdays[weekday]
     end
 
     def number_of_occurances_in(range)
       range.inject(0) do |count, date|
-        applies_for_date?(date) ? count+1 : count
+        applies_for_date?(date) ? count + 1 : count
       end
     end
 
     # Returns true if all days are selected
     def all_days?
-      @weekdays.all?{|day, selected| selected}
+      @weekdays.all? { |_day, day_selected| day_selected }
     end
 
     # Returns array of weekday selected
     # e.g. [:sun, :sat]
     def weekdays
-      selected = @weekdays.select{|day, selected| selected}
+      selected = @weekdays.select { |_day, day_selected| day_selected }
       # Ruby 1.8 returns an array for Hash#select and loses order
-      selected.is_a?(Hash) ? selected.keys : selected.map(&:first).sort_by{|v| WEEKDAY_KEYS.index(v)}
+      return selected.keys if selected.is_a?(Hash)
+      selected.map(&:first).sort_by { |v| WEEKDAY_KEYS.index(v) }
     end
 
     # Returns comma separated and capitalized in Sun-Sat order
     # e.g. 'Mon, Tue, Wed' or 'Sat' or 'Sun, Sat'
     def to_s
-      days = weekdays.map{|day| day.to_s.capitalize}
+      days = weekdays.map { |day| day.to_s.capitalize }
       last_day = days.pop
 
       days.empty? ? last_day : days.join(", ") + ", and " + last_day
@@ -123,6 +121,18 @@ module Timely
       int
     end
 
-    ALL_WEEKDAYS = WeekDays.new(%w(1 1 1 1 1 1 1))
+    private
+
+    def day_to_index(day)
+      if day.is_a?(Integer)
+        WEEKDAY_KEYS[day]
+      elsif day.is_a?(String)
+        day.to_sym
+      else
+        day
+      end
+    end
+
+    ALL_WEEKDAYS = WeekDays.new(%w[1 1 1 1 1 1 1])
   end
 end

data/timely.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coverage-kit'
   spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'activerecord'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timely
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +215,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -280,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Set of time, date, weekday related methods.