daily_image 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1efdea98fc3b59bc85431e1c8384ce8d0095cc22ff54d11021ef6918df677ae3
-  data.tar.gz: 804765d2e0540898e7853407fb3a23bcd7cd51128b8d30e57cd5f24a8daed6f8
+  metadata.gz: 6c742c99232c23048b9089800c43dcfaf1837f4b79cf9f611a4ecba5d04f3843
+  data.tar.gz: 51bb96c6e953651f3b7a06d9177eb42959dbb8c061d3ccf8b9184e7fa21985de
 SHA512:
-  metadata.gz: 34ba4f064cb456f6747f40fb7355e5e8922612736ef322d3fa129911b4289144eee46df4b7185746f5bcb248ed260ed3c14d61189722e90c2ab27ea59333d461
-  data.tar.gz: 219c852823562df7adb6f7b59efb75c773fe030afeb4e6b1825db5227eafc6df0133e113902adc8975e15225975305f2a46cbdff0a27b3af11ebcffb6366cdda
+  metadata.gz: cac9a0befcd6832b868c551f4ee56eac5225b32c15355e186c37078134e088a42c6bd1a6bb218f13565f15337f1a6d7744b76fda9fef5c48cd0ab0f1613fd213
+  data.tar.gz: 53f04fbe7ae37305a3c2f959173f953d7eeaa509b0a9cb68848788d97545f80f6ec9441bae972b8e1ff4455de04fbef6de62ac0160614ccac73ac2c9990f23bc

data/README.md

@@ -1,6 +1,6 @@
 # DailyImage
 
-日签 Or 日历，生成一张当日的图片。Just For Fun!👏
+日签 Or 日历，生成一张指定日期的图片，可作为日历。Just For Fun!👏
 
 ## 使用
 
@@ -28,22 +28,22 @@ gem 'daily_image'
 
 # 初始项目配置
 DailyImage.configure do |config|
-  config[:bg_color] = [255, 255, 255]        # 背景颜色
-  config[:frame_color] = [151, 158, 160]     # 边框颜色
-  config[:text_color] = [100, 145, 170]      # 文字颜色
-  config[:date_color] = [100, 145, 170]      # 中间日期颜色
-  config[:unused_color] = [200, 205, 215]    # 进度条未使用颜色
-  config[:used_color] = [100, 145, 170]      # 进度条已使用颜色
-  config[:out_frame_offset] = 15             # 外层边框偏移量
-  config[:in_frame_offset] = 50              # 下半部分内层边框偏移量
-  config[:font] = 'Hiragino Sans GB'         # 文字默认字体
+  config.bg_color = [255, 255, 255]        # 背景颜色
+  config.frame_color = [151, 158, 160]     # 边框颜色
+  config.text_color = [100, 145, 170]      # 文字颜色
+  config.date_color = [100, 145, 170]      # 中间日期颜色
+  config.unused_color = [200, 205, 215]    # 进度条未使用颜色
+  config.used_color = [100, 145, 170]      # 进度条已使用颜色
+  config.out_frame_offset = 15             # 外层边框偏移量
+  config.in_frame_offset = 50              # 下半部分内层边框偏移量
+  config.font = 'Hiragino Sans GB'         # 文字默认字体
 end
 
 # 调用方法
-DailyImage.draw_image(output_path)           # 默认图片存放地址，包所在的目录
+DailyImage.draw_image(output_path = nil, date = Date.today)           # 默认图片存放地址，包所在的目录; 默认生成为当日
 
 # 例子
-DailyImage.draw_image('./')
+DailyImage.draw_image('./', '2018-09-30')
 ```
 
 ### 命令行
@@ -58,7 +58,7 @@ Specific options:
     -b, --bg_color BG_COLOR          the image's background color
     -r, --frame_color FRAME_COLOR    the image's frame color
     -t, --text_color TEXT_COLOR      the image's text color
-    -d, --date_color DATE_COLOR      the middle date's text color
+    -c, --date_color DATE_COLOR      the middle date's text color
     -n, --unused_color UNUSED_COLOR  unused color of the progress bar
     -u, --used_color USED_COLOR      used color of the progress bar
     -o OUT_FRAME_OFFSET,             the outside frame offset
@@ -66,6 +66,7 @@ Specific options:
     -i, --in_offset IN_FRAME_OFFSET  the inside frame offset
     -f, --font FONT                  the text font
     -s, --output OUTPUT              the output path, save the new image
+    -d, --date Specific date         the date you want to generate
 
 Common options:
     -h, --help                       Show the help message

data/bin/daily_image

@@ -17,7 +17,8 @@ class DailyImageOptparser
                   :font,
                   :out_frame_offset,
                   :in_frame_offset,
-                  :output_path
+                  :output_path,
+                  :date
 
     def initialize
     end
@@ -37,6 +38,7 @@ class DailyImageOptparser
       in_frame_offset_option(parser)
       font_option(parser)
       output_path_option(parser)
+      date_option(parser)
 
       parser.separator ""
       parser.separator "Common options:"
@@ -73,7 +75,7 @@ class DailyImageOptparser
     end
 
     def date_color_option(parser)
-      parser.on("-d", "--date_color DATE_COLOR", "the middle date's text color") do |date_color|
+      parser.on("-c", "--date_color DATE_COLOR", "the middle date's text color") do |date_color|
         self.date_color = date_color
       end
     end
@@ -114,6 +116,12 @@ class DailyImageOptparser
       end
     end
 
+    def date_option(parser)
+      parser.on("-d", "--date Specific date", "the date you want to generate") do |date|
+        self.date = Date.parse(date.to_s) rescue Date.today
+      end
+    end
+
   end
 
   attr_reader :parser, :options
@@ -142,4 +150,4 @@ DailyImage.configure do |config|
   config.font = options.font if options.font
 end
 
-DailyImage.draw_image(options.output_path)
+DailyImage.draw_image(options.output_path, options.date)

data/lib/daily_image.rb

@@ -17,11 +17,13 @@ module DailyImage
       DailyImage::Config.instance.configuration
     end
 
-    def draw_image(output_path = nil)
+    def draw_image(output_path = nil, date = Date.today)
       output_path ||= Dir.pwd
-      output_file = File.join(output_path, "daily_#{Date.today}.jpeg")
+      date = Date.parse(date.to_s) rescue Date.today
 
-      image = DailyImage::Image.new.draw_image
+      output_file = File.join(output_path, "daily_#{date}.jpeg")
+
+      image = DailyImage::Image.new(date: date).draw_image
 
       image.write_to_file(output_file, Q: 100)
     end

data/lib/daily_image/image.rb

@@ -2,9 +2,10 @@
 module DailyImage
   class Image
 
-    def initialize(width = 600, height = 800)
+    def initialize(width = 600, height = 800, date: Date.today)
       @width = width
       @height = height
+      @date = date
     end
 
     def draw_image
@@ -60,7 +61,7 @@ module DailyImage
 
     # 画出中间日期
     def draw_day(image)
-      day = Date.today.day.to_s
+      day = @date.day.to_s
 
       # 生成字体图片
       text = generate_text_image(day, dpi: 1000, text_color: config[:date_color])
@@ -74,7 +75,7 @@ module DailyImage
 
     # 画出左上角日期
     def draw_date(image)
-      date = Date.today.to_s
+      date = @date.to_s
       text = generate_text_image(date, dpi: 150)
 
       # 计算放置位置
@@ -86,8 +87,8 @@ module DailyImage
 
     # 画出右上角信息
     def draw_week(image)
-      week_arr = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
-      week = week_arr[Date.today.cwday]
+      week_arr = ['星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期日']
+      week = week_arr[@date.cwday - 1]
 
       text = generate_text_image(week, dpi: 140)
 
@@ -100,7 +101,7 @@ module DailyImage
 
     # 画出进度描述信息
     def draw_progress_txt(image)
-      day = Date.today.yday
+      day = @date.yday
       percent = (percent_of_year * 100).round(2)
       text = "第 #{day} 天，进度已消耗 #{percent}%"
 
@@ -182,8 +183,8 @@ module DailyImage
 
     # 计算当天时间在一年的百分比
     def percent_of_year
-      days = Date.new(Date.today.year, 12, 31).yday
-      current_days = Date.today.yday
+      days = Date.new(@date.year, 12, 31).yday
+      current_days = @date.yday
 
       (current_days.to_f / days).round(4)
     end

data/lib/daily_image/version.rb

@@ -1,3 +1,3 @@
 module DailyImage
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daily_image
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - renyijiu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler