cronex 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5695e6afc392e79737154019b9829971a9657c78
-  data.tar.gz: 081a03e92358d7c8a7fb66579339fc6959c3fa8d
+  metadata.gz: 29978d178bd1bb48a3a10583b197d09a0bd768ea
+  data.tar.gz: 7efd313aecf280cfe7d6817b392cc51e571a7c29
 SHA512:
-  metadata.gz: ec3ae6a6b82dece4d6515b967cb82ab4b55dfceaa8170aff4545177640a2fe8c6b4cd2c39426ce0e313fb142dc34f5b4f9dacb8dc63b4a8c11191dc50ce4a6ce
-  data.tar.gz: 8d508c90b05f6e1390426aba56b9b6f18927d122c734e9437ec63eefa71b7b8ac1234e56c1dd596ecd5ad171adf549de3344f19732a251bcc070b62cf44b5619
+  metadata.gz: fa456bfec078001cc6b12cc6c7d950e6dd1b8746d69f7341f3ffa6a2834add6ac72ebdb96364713f9d0818eab7dd1c6e6a857cf281a88c7447b1079ac75b68b6
+  data.tar.gz: b4dd39b0fce8599164262e26000bad29b2eeecfc964e82675f353c6af1a886cec1c7f8ba22a494e195fb5ceaa3182978de2306eff54cc73cbc5f4563e08f4bdf

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### [0.7.0] - 2018-11-22
+* Include day of week when day of month is specified
+
 ### [0.6.1] - 2017-11-17
 * Fix 4th day spelling
 

data/lib/cronex/exp_descriptor.rb

@@ -162,8 +162,7 @@ module Cronex
       month_desc = month_description(expression_parts)
       dow_desc = day_of_week_description(expression_parts)
       year_desc = year_description(expression_parts)
-      day_desc = expression_parts[3] == '*' ? dow_desc : dom_desc
-      description = format('%s%s%s%s', time_segment, day_desc, month_desc, year_desc)
+      description = format('%s%s%s%s%s', time_segment, dom_desc, dow_desc, month_desc, year_desc)
       description = transform_verbosity(description, options[:verbose])
       description = transform_case(description, options[:casing])
       description

data/lib/cronex/version.rb

@@ -1,3 +1,3 @@
 module Cronex
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/spec/exp_descriptor_en_spec.rb

@@ -180,8 +180,8 @@ module Cronex
       expect(desc('23 12 15 * *')).to eq('At 12:23 PM, on day 15 of the month')
     end
 
-    it 'day of month ignores day of week' do
-      expect(desc('23 12 15 * SUN')).to eq('At 12:23 PM, on day 15 of the month')
+    it 'day of month with day of week' do
+      expect(desc('23 12 15 * SUN')).to eq('At 12:23 PM, on day 15 of the month, only on Sunday')
     end
 
     it 'month name' do

data/spec/exp_descriptor_fr_spec.rb

@@ -180,8 +180,8 @@ module Cronex
       expect(desc('23 12 15 * *')).to eq('À 12:23 PM, le 15 de chaque mois')
     end
 
-    it 'day of month ignores day of week' do
-      expect(desc('23 12 15 * SUN')).to eq('À 12:23 PM, le 15 de chaque mois')
+    it 'day of month with day of week' do
+      expect(desc('23 12 15 * SUN')).to eq('À 12:23 PM, le 15 de chaque mois, seulement le dimanche')
     end
 
     it 'month name' do

data/spec/exp_descriptor_pt_BR_spec.rb

@@ -180,8 +180,8 @@ module Cronex
       expect(desc('23 12 15 * *')).to eq('Às 12:23 PM, no dia 15 do mês')
     end
 
-    it 'day of month ignores day of week' do
-      expect(desc('23 12 15 * SUN')).to eq('Às 12:23 PM, no dia 15 do mês')
+    it 'day of month with day of week' do
+      expect(desc('23 12 15 * SUN')).to eq('Às 12:23 PM, no dia 15 do mês, todo(a) domingo')
     end
 
     it 'month name' do

data/spec/exp_descriptor_ro_spec.rb

@@ -180,8 +180,8 @@ module Cronex
       expect(desc('23 12 15 * *')).to eq('La 12:23 PM, în a 15-a zi a lunii')
     end
 
-    it 'day of month ignores day of week' do
-      expect(desc('23 12 15 * SUN')).to eq('La 12:23 PM, în a 15-a zi a lunii')
+    it 'day of month with day of week' do
+      expect(desc('23 12 15 * SUN')).to eq('La 12:23 PM, în a 15-a zi a lunii, numai duminică')
     end
 
     it 'month name' do

data/spec/exp_descriptor_ru_spec.rb

@@ -180,8 +180,8 @@ module Cronex
       expect(desc('23 12 15 * *')).to eq('В 12:23 PM, 15 число месяца')
     end
 
-    it 'day of month ignores day of week' do
-      expect(desc('23 12 15 * SUN')).to eq('В 12:23 PM, 15 число месяца')
+    it 'day of month with day of week' do
+      expect(desc('23 12 15 * SUN')).to eq('В 12:23 PM, 15 число месяца, только воскресенье')
     end
 
     it 'month name' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cronex
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Adrian Kazaku
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby library that converts cron expressions into human readable strings