moments 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cfe9d93c489151bacb9c2c4b8de955a038db05cddf2a6d7edcb60c24532f8f3
-  data.tar.gz: be776d177f3878449fb8aabab929cbe84bb31965e428cef9c31bd72d3ce964a7
+  metadata.gz: 0b85363c9163c9935f75833c74b4e7d587cc70d962ca4f86e14e6d8a3bb14196
+  data.tar.gz: 1a6421e682139a2cefb0b82d12bcd5d08cb2f8220ab20a65f9646938e0ee1653
 SHA512:
-  metadata.gz: 6b231e18ee429b37402e44571866f860a57e8b86957db6a18a75463fb6c3e325b7b7ec5dfe1da62d01259d78b749f3272bbd1c3078c268b8d1fbfcb70a3e55db
-  data.tar.gz: fab01ca909e9c5418ad1ca734a4709e11a81effe6bc283bf8cb5174f2d62548d29bd7a3bedc85be2c2b23902f6f614694bc45dc229184bb657c00bf0373dfdf4
+  metadata.gz: 360367e75466166fc7bb786fa4d0247b23d7ba61b118286bc137c7b697ef25a12bf3d847f0b2907de9a899ee1d3132298b5196ef93387b536e800fca8132c24a
+  data.tar.gz: e374f88fd8029894bdeee1e0ea79ae58188552fe43438dfb56e37335a36121b91c6b14e0d8b7a814ff0901c10c9928916051f1ea38a1b28997bce3ff47f932a9

data/.rspec

@@ -1,4 +1,2 @@
---warnings
---color
---format documentation
 --require spec_helper
+--color

data/.rubocop.yml

@@ -1,42 +1,81 @@
-Layout/LineLength:
+# inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.5
+  NewCops: enable
+  SuggestExtensions: false
+  Exclude:
+    - 'gemfiles/*.gemfile'
+    - 'vendor/**/*'
+
+Style/Documentation:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Exclude:
+    - spec/**/*_spec.rb
+
+Style/GuardClause:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
+
+Style/RaiseArgs:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 25
+
+Metrics/ClassLength:
+  Max: 120
+
+Metrics/ModuleLength:
   Max: 100
+
+Layout/LineLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*_spec.rb
+
+Metrics/MethodLength:
+  Max: 15
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Style/FormatString:
+  Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
-Layout/ArgumentAlignment:
-  EnforcedStyle: with_fixed_indentation
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
 
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
+Style/WordArray:
+  Enabled: false
 
-Style/ExponentialNotation:
-  Enabled: true
-Style/HashEachMethods:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/SlicingWithRange:
+Style/RedundantSelf:
+  Enabled: false
+
+Layout/HashAlignment:
   Enabled: true
+  EnforcedLastArgumentHashStyle: always_ignore
 
-Metrics/ParameterLists:
-  CountKeywordArgs: false
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*
+Style/TrivialAccessors:
+  AllowPredicates: true

data/CHANGELOG.md

@@ -1,20 +1,31 @@
 # Changelog
 
-## [v0.1.0](https://github.com/excpt/moments/tree/v0.1.0) (2020-08-18)
+## [Unreleased](https://github.com/excpt/moments/tree/HEAD)
 
-[Full Changelog](https://github.com/excpt/moments/compare/v0.0.2.alpha...v0.1.0)
+[Full Changelog](https://github.com/excpt/moments/compare/v0.1.0...HEAD)
 
 **Closed issues:**
 
-- Replace Travis CI with another CI [\#3](https://github.com/excpt/moments/issues/3)
+- Make a new release [\#7](https://github.com/excpt/moments/issues/7)
 
 **Merged pull requests:**
 
-- Fix `\#in\_\*` for times with miliseconds [\#6](https://github.com/excpt/moments/pull/6) ([AlexWayfer](https://github.com/AlexWayfer))
-- Fix diffs with different timezones, `Date` diffs and `\#in\_years` [\#5](https://github.com/excpt/moments/pull/5) ([AlexWayfer](https://github.com/AlexWayfer))
-- Add `\#in\_\*` methods, like `\#in\_seconds` [\#4](https://github.com/excpt/moments/pull/4) ([AlexWayfer](https://github.com/AlexWayfer))
+- Parse string input whenever possible [\#10](https://github.com/excpt/moments/pull/10) ([RomanVanLoo](https://github.com/RomanVanLoo))
+- Add `in_weeks` [\#9](https://github.com/excpt/moments/pull/9) ([RomanVanLoo](https://github.com/RomanVanLoo))
+- Release 0.1.0 [\#8](https://github.com/excpt/moments/pull/8) ([excpt](https://github.com/excpt))
+- Fix `#in_*` for times with miliseconds [\#6](https://github.com/excpt/moments/pull/6) ([AlexWayfer](https://github.com/AlexWayfer))
+- Fix diffs with different timezones, `Date` diffs and `#in_years` [\#5](https://github.com/excpt/moments/pull/5) ([AlexWayfer](https://github.com/AlexWayfer))
+- Add `#in_*` methods, like `#in_seconds` [\#4](https://github.com/excpt/moments/pull/4) ([AlexWayfer](https://github.com/AlexWayfer))
 - Many improvements [\#2](https://github.com/excpt/moments/pull/2) ([AlexWayfer](https://github.com/AlexWayfer))
 
+## [v0.1.0](https://github.com/excpt/moments/tree/v0.1.0) (2020-08-18)
+
+[Full Changelog](https://github.com/excpt/moments/compare/v0.0.2.alpha...v0.1.0)
+
+**Closed issues:**
+
+- Replace Travis CI with another CI [\#3](https://github.com/excpt/moments/issues/3)
+
 ## [v0.0.2.alpha](https://github.com/excpt/moments/tree/v0.0.2.alpha) (2014-11-14)
 
 [Full Changelog](https://github.com/excpt/moments/compare/v0.0.1.alpha...v0.0.2.alpha)

data/lib/moments/difference.rb

@@ -65,11 +65,15 @@ module Moments
       in_hours / 24
     end
 
+    def in_weeks
+      in_days / 7
+    end
+
     def in_months
       months_diff = @ordered_to.month - @ordered_from.month
       months_diff -= 1 if months_diff.positive? && @ordered_to.mday < @ordered_from.mday
 
-      (@ordered_to.year - @ordered_from.year) * 12 + months_diff
+      ((@ordered_to.year - @ordered_from.year) * 12) + months_diff
     end
 
     def in_years
@@ -96,12 +100,22 @@ module Moments
       when *TIME_CLASSES
         value.to_time.getutc
       when Date
-        value
+        value.to_time
+      when String
+        begin
+          Time.parse(value).getutc
+        rescue ArgumentError
+          unsupported_format
+        end
       else
-        raise ArgumentError, 'Unsupported format'
+        unsupported_format
       end
     end
 
+    def unsupported_format
+      raise ArgumentError, 'Unsupported format'
+    end
+
     def precise_difference
       @diff = calculate_diff
 

data/lib/moments/version.rb

@@ -11,7 +11,7 @@ module Moments
     # major version
     MAJOR = 0
     # minor version
-    MINOR = 1
+    MINOR = 2
     # patch version
     PATCH = 0
     # alpha, beta, etc. tag

data/moments.gemspec

@@ -11,15 +11,15 @@ Gem::Specification.new do |spec|
   spec.description = ''
   spec.homepage    = 'https://github.com/excpt/moments'
   spec.license     = 'MIT'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '>= 1', '< 3'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.86.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'github_changelog_generator'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
 end

data/spec/lib/moments/difference_spec.rb

@@ -333,7 +333,10 @@ describe Moments::Difference do
           {
             years: 6,
             months: 5,
-            days: 4
+            days: 4,
+            hours: 0,
+            minutes: 0,
+            seconds: 0
           }
         end
 
@@ -444,14 +447,7 @@ describe Moments::Difference do
     end
   end
 
-  shared_examples 'in a component' do |
-    when_seconds:,
-    when_minutes:,
-    when_hours:,
-    when_days:,
-    when_months:,
-    when_years:
-  |
+  shared_examples 'in a component' do |when_seconds:, when_minutes:, when_hours:, when_days:, when_months:, when_years:|
     context 'with equal dates' do
       let(:to) { from }
 
@@ -668,23 +664,23 @@ describe Moments::Difference do
     subject { Moments::Difference.new(from, to).in_seconds }
 
     include_examples 'in a component',
-      when_seconds: 15,
-      when_minutes: 12 * 60 + 15,
-      when_hours: 8 * 60 * 60 + 12 * 60 + 15,
-      when_days: 6 * 24 * 60 * 60 + 8 * 60 * 60 + 12 * 60 + 15,
-      when_months:
-        (31 + 28 + 31 + 30) * 24 * 60 * 60 +
-          6 * 24 * 60 * 60 +
-          8 * 60 * 60 +
-          12 * 60 +
-          15,
-      when_years:
-        2 * 365 * 24 * 60 * 60 +
-          (31 + 28 + 31 + 30) * 24 * 60 * 60 +
-          6 * 24 * 60 * 60 +
-          8 * 60 * 60 +
-          12 * 60 +
-          15
+                     when_seconds: 15,
+                     when_minutes: (12 * 60) + 15,
+                     when_hours: (8 * 60 * 60) + (12 * 60) + 15,
+                     when_days: (6 * 24 * 60 * 60) + (8 * 60 * 60) + (12 * 60) + 15,
+                     when_months:
+                       ((31 + 28 + 31 + 30) * 24 * 60 * 60) +
+                         (6 * 24 * 60 * 60) +
+                         (8 * 60 * 60) +
+                         (12 * 60) +
+                         15,
+                     when_years:
+                       (2 * 365 * 24 * 60 * 60) +
+                         ((31 + 28 + 31 + 30) * 24 * 60 * 60) +
+                         (6 * 24 * 60 * 60) +
+                         (8 * 60 * 60) +
+                         (12 * 60) +
+                         15
 
     context 'with miliseconds' do
       context 'when `to` is a bit greater' do
@@ -721,81 +717,81 @@ describe Moments::Difference do
     subject { Moments::Difference.new(from, to).in_minutes }
 
     include_examples 'in a component',
-      when_seconds: 0,
-      when_minutes: 12,
-      when_hours: 8 * 60 + 12,
-      when_days: 6 * 24 * 60 + 8 * 60 + 12,
-      when_months:
-        (31 + 28 + 31 + 30) * 24 * 60 +
-          6 * 24 * 60 +
-          8 * 60 +
-          12,
-      when_years:
-        2 * 365 * 24 * 60 +
-          (31 + 28 + 31 + 30) * 24 * 60 +
-          6 * 24 * 60 +
-          8 * 60 +
-          12
+                     when_seconds: 0,
+                     when_minutes: 12,
+                     when_hours: (8 * 60) + 12,
+                     when_days: (6 * 24 * 60) + (8 * 60) + 12,
+                     when_months:
+                       ((31 + 28 + 31 + 30) * 24 * 60) +
+                         (6 * 24 * 60) +
+                         (8 * 60) +
+                         12,
+                     when_years:
+                       (2 * 365 * 24 * 60) +
+                         ((31 + 28 + 31 + 30) * 24 * 60) +
+                         (6 * 24 * 60) +
+                         (8 * 60) +
+                         12
   end
 
   context '#in_hours' do
     subject { Moments::Difference.new(from, to).in_hours }
 
     include_examples 'in a component',
-      when_seconds: 0,
-      when_minutes: 0,
-      when_hours: 8,
-      when_days: 6 * 24 + 8,
-      when_months:
-        (31 + 28 + 31 + 30) * 24 +
-          6 * 24 +
-          8,
-      when_years:
-        2 * 365 * 24 +
-          (31 + 28 + 31 + 30) * 24 +
-          6 * 24 +
-          8
+                     when_seconds: 0,
+                     when_minutes: 0,
+                     when_hours: 8,
+                     when_days: (6 * 24) + 8,
+                     when_months:
+                       ((31 + 28 + 31 + 30) * 24) +
+                         (6 * 24) +
+                         8,
+                     when_years:
+                       (2 * 365 * 24) +
+                         ((31 + 28 + 31 + 30) * 24) +
+                         (6 * 24) +
+                         8
   end
 
   context '#in_days' do
     subject { Moments::Difference.new(from, to).in_days }
 
     include_examples 'in a component',
-      when_seconds: 0,
-      when_minutes: 0,
-      when_hours: 0,
-      when_days: 6,
-      when_months:
-        (31 + 28 + 31 + 30) +
-          6,
-      when_years:
-        2 * 365 +
-          (31 + 28 + 31 + 30) +
-          6
+                     when_seconds: 0,
+                     when_minutes: 0,
+                     when_hours: 0,
+                     when_days: 6,
+                     when_months:
+                       (31 + 28 + 31 + 30) +
+                         6,
+                     when_years:
+                       (2 * 365) +
+                         (31 + 28 + 31 + 30) +
+                         6
   end
 
   context '#in_months' do
     subject { Moments::Difference.new(from, to).in_months }
 
     include_examples 'in a component',
-      when_seconds: 0,
-      when_minutes: 0,
-      when_hours: 0,
-      when_days: 0,
-      when_months: 4,
-      when_years: 2 * 12 + 4
+                     when_seconds: 0,
+                     when_minutes: 0,
+                     when_hours: 0,
+                     when_days: 0,
+                     when_months: 4,
+                     when_years: (2 * 12) + 4
   end
 
   context '#in_years' do
     subject { Moments::Difference.new(from, to).in_years }
 
     include_examples 'in a component',
-      when_seconds: 0,
-      when_minutes: 0,
-      when_hours: 0,
-      when_days: 0,
-      when_months: 0,
-      when_years: 2
+                     when_seconds: 0,
+                     when_minutes: 0,
+                     when_hours: 0,
+                     when_days: 0,
+                     when_months: 0,
+                     when_years: 2
 
     context 'when `to` day is greater than `from` day' do
       let(:from) { Time.utc 2013, 1, 1, 0, 0, 0 }

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
 # frozen_string_literal: true
 
-require 'codeclimate-test-reporter'
-
 require_relative '../lib/moments'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moments
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tim Rudat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2022-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,76 +16,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: '0'
 description: ''
 email:
 - timrudat@gmail.com
@@ -113,7 +107,8 @@ files:
 homepage: https://github.com/excpt/moments
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -129,11 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Handles time differences.
-test_files:
-- spec/lib/moments/difference_spec.rb
-- spec/lib/moments_spec.rb
-- spec/spec_helper.rb
+test_files: []