daily_image 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1efdea98fc3b59bc85431e1c8384ce8d0095cc22ff54d11021ef6918df677ae3
-  data.tar.gz: 804765d2e0540898e7853407fb3a23bcd7cd51128b8d30e57cd5f24a8daed6f8
+  metadata.gz: d230c52cf5a8cc4deef5b16da4df59c39732d7936d439131cfe112846c110f69
+  data.tar.gz: 265accdddf005fac351582fffb8d083717253b57b16993e338d8d7c68d8221b8
 SHA512:
-  metadata.gz: 34ba4f064cb456f6747f40fb7355e5e8922612736ef322d3fa129911b4289144eee46df4b7185746f5bcb248ed260ed3c14d61189722e90c2ab27ea59333d461
-  data.tar.gz: 219c852823562df7adb6f7b59efb75c773fe030afeb4e6b1825db5227eafc6df0133e113902adc8975e15225975305f2a46cbdff0a27b3af11ebcffb6366cdda
+  metadata.gz: 4dd49bb2b012b4e80c740800206d35f91a25e989cf33b383a98f7d303d83c954a87b516a6b0ec8775be9ff88ee3a43fc6651f6d09a5a4d76ba93bbad39bd6373
+  data.tar.gz: 00de691cb6076590e59dfcdbcc81bfe6b9700d4241cf010c9ab7f89f5bf44f5e309dd06c0a12eaa7c9cf057f1c038ecf35286f47b334293315516d23e1428821

data/.gitignore

@@ -6,4 +6,5 @@
 /pkg/
 /spec/reports/
 /.idea/
-/.DS_Store
+/.DS_Store
+Gemfile.lock

data/.ruby-version

@@ -0,0 +1 @@
+2.6.4

data/Gemfile

@@ -2,7 +2,5 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
-gem 'ruby-vips', '~> 2.0.13'
-
 # Specify your gem's dependencies in daily_image.gemspec
 gemspec

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    daily_image (0.1.0)
+    daily_image (0.1.5)
+      ruby-vips (~> 2.0.17)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ffi (1.9.25)
+    ffi (1.11.1)
     minitest (5.11.3)
-    rake (10.5.0)
-    ruby-vips (2.0.13)
+    rake (12.3.3)
+    ruby-vips (2.0.17)
       ffi (~> 1.9)
 
 PLATFORMS
@@ -19,8 +20,7 @@ DEPENDENCIES
   bundler (~> 1.16)
   daily_image!
   minitest (~> 5.0)
-  rake (~> 10.0)
-  ruby-vips (~> 2.0.13)
+  rake (~> 12.3, >= 12.3.3)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/README.md

@@ -1,6 +1,10 @@
 # DailyImage
 
-日签 Or 日历，生成一张当日的图片。Just For Fun!👏
+日签 Or 日历，生成一张指定日期的图片，可作为日历。Just For Fun!👏
+
+[PHP实现版本](https://github.com/dolphin836/make-calendar-image)
+[Python版本实现](https://github.com/wnma3mz/Tools/tree/master/daily_image)
+[Android桌面小部件](https://github.com/fairytale110/DailyImageWidget)
 
 ## 使用
 
@@ -28,22 +32,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 +62,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 +70,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
@@ -75,7 +80,7 @@ Common options:
 
 ## 示例
 
-![](./tmp/daily_2018-09-17.jpg)
+![](./tmp/daily_2018-10-06.jpeg)
 
 ## 感谢🙏
 
@@ -85,6 +90,10 @@ Common options:
 
 2. 诗词来自于 [一言·古诗词 API](https://github.com/xenv/gushici)
 
+## 待完成
+
+- [ ] 使用机器学习生成古诗词，替代一言·古诗词API
+
 ## 如何贡献
 
 1. Fork it

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/daily_image.gemspec

@@ -29,7 +29,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "ruby-vips", "~> 2.0.17"
+
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/daily_image.rb

@@ -1,6 +1,7 @@
 require "date"
 require "vips"
 require "daily_image/version"
+require "daily_image/lunar_solar_converter"
 require "daily_image/poem"
 require "daily_image/image"
 require "daily_image/config"
@@ -17,11 +18,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/config.rb

@@ -34,7 +34,7 @@ module DailyImage
     def configuration
       @config ||= {}.tap do |config|
         config[:bg_color] = bg_color || [255, 255, 255]
-        config[:frame_color] = frame_color || [151, 158, 160]
+        config[:frame_color] = frame_color || [100, 145, 170]
         config[:text_color] = text_color || [100, 145, 170]
         config[:date_color] = date_color || [100, 145, 170]
         config[:unused_color] = unused_color || [200, 205, 215]

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
@@ -27,6 +28,7 @@ module DailyImage
       image = draw_day(image)
       image = draw_date(image)
       image = draw_week(image)
+      image = draw_lunar_txt(image)
       image = draw_progress_txt(image)
 
       draw_progress(image)
@@ -60,7 +62,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 +76,7 @@ module DailyImage
 
     # 画出左上角日期
     def draw_date(image)
-      date = Date.today.to_s
+      date = @date.strftime("%Y.%m.%d")
       text = generate_text_image(date, dpi: 150)
 
       # 计算放置位置
@@ -86,21 +88,34 @@ 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)
 
       # 计算放置位置
-      x = (image.width * 0.75).to_i
+      x = (image.width * 0.78).to_i
       y = (image.height * 0.09).to_i
 
       image.draw_image text, x, y, mode: :set
     end
 
+    # 画出农历信息
+    def draw_lunar_txt(image)
+      text = DailyImage::LunarSolarConverter.date_to_lunar(@date)
+
+      # 获取文字图片
+      text_image = generate_text_image(text)
+
+      x = (@width - text_image.width) / 2
+      y = @height * 0.4
+
+      image.draw_image text_image, x, y, mode: :set
+    end
+
     # 画出进度描述信息
     def draw_progress_txt(image)
-      day = Date.today.yday
+      day = @date.yday
       percent = (percent_of_year * 100).round(2)
       text = "第 #{day} 天，进度已消耗 #{percent}%"
 
@@ -108,7 +123,7 @@ module DailyImage
       text_image = generate_text_image(text)
 
       x = (@width - text_image.width) / 2
-      y = @height * 0.44
+      y = @height * 0.45
 
       image.draw_image text_image, x, y, mode: :set
     end
@@ -182,8 +197,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/lunar_solar_converter.rb

@@ -0,0 +1,208 @@
+# -*- coding: utf-8 -*-
+
+module DailyImage
+  class Lunar
+    attr_accessor :lunar_day, :lunar_month, :lunar_year, :is_leap
+
+    def initialize(y = 0, m = 0, d = 0, leap = false)
+      @lunar_year = y
+      @lunar_month = m
+      @lunar_day = d
+      @is_leap = leap
+    end
+  end
+
+  class Solar
+    attr_accessor :solar_day, :solar_month, :solar_year
+
+    def initialize(y = 0, m = 0, d = 0)
+      @solar_year = y
+      @solar_month = m
+      @solar_day = d
+    end
+  end
+
+  class LunarSolarConverter
+    LUNAR_MONTH_DAYS = [
+        1887, 0x1694, 0x16aa, 0x4ad5, 0xab6, 0xc4b7, 0x4ae, 0xa56, 0xb52a, 0x1d2a, 0xd54, 0x75aa, 0x156a, 0x1096d,
+        0x95c, 0x14ae, 0xaa4d, 0x1a4c, 0x1b2a, 0x8d55, 0xad4, 0x135a, 0x495d, 0x95c, 0xd49b, 0x149a, 0x1a4a, 0xbaa5,
+        0x16a8, 0x1ad4, 0x52da, 0x12b6, 0xe937, 0x92e, 0x1496, 0xb64b, 0xd4a, 0xda8, 0x95b5, 0x56c, 0x12ae, 0x492f,
+        0x92e, 0xcc96, 0x1a94, 0x1d4a, 0xada9, 0xb5a, 0x56c, 0x726e, 0x125c, 0xf92d, 0x192a, 0x1a94, 0xdb4a, 0x16aa,
+        0xad4, 0x955b, 0x4ba, 0x125a, 0x592b, 0x152a, 0xf695, 0xd94, 0x16aa, 0xaab5, 0x9b4, 0x14b6, 0x6a57, 0xa56,
+        0x1152a, 0x1d2a, 0xd54, 0xd5aa, 0x156a, 0x96c, 0x94ae, 0x14ae, 0xa4c, 0x7d26, 0x1b2a, 0xeb55, 0xad4, 0x12da,
+        0xa95d, 0x95a, 0x149a, 0x9a4d, 0x1a4a, 0x11aa5, 0x16a8, 0x16d4, 0xd2da, 0x12b6, 0x936, 0x9497, 0x1496, 0x1564b,
+        0xd4a, 0xda8, 0xd5b4, 0x156c, 0x12ae, 0xa92f, 0x92e, 0xc96, 0x6d4a, 0x1d4a, 0x10d65, 0xb58, 0x156c, 0xb26d,
+        0x125c, 0x192c, 0x9a95, 0x1a94, 0x1b4a, 0x4b55, 0xad4, 0xf55b, 0x4ba, 0x125a, 0xb92b, 0x152a, 0x1694, 0x96aa,
+        0x15aa, 0x12ab5, 0x974, 0x14b6, 0xca57, 0xa56, 0x1526, 0x8e95, 0xd54, 0x15aa, 0x49b5, 0x96c, 0xd4ae, 0x149c,
+        0x1a4c, 0xbd26, 0x1aa6, 0xb54, 0x6d6a, 0x12da, 0x1695d, 0x95a, 0x149a, 0xda4b, 0x1a4a, 0x1aa4, 0xbb54, 0x16b4,
+        0xada, 0x495b, 0x936, 0xf497, 0x1496, 0x154a, 0xb6a5, 0xda4, 0x15b4, 0x6ab6, 0x126e, 0x1092f, 0x92e, 0xc96,
+        0xcd4a, 0x1d4a, 0xd64, 0x956c, 0x155c, 0x125c, 0x792e, 0x192c, 0xfa95, 0x1a94, 0x1b4a, 0xab55, 0xad4, 0x14da,
+        0x8a5d, 0xa5a, 0x1152b, 0x152a, 0x1694, 0xd6aa, 0x15aa, 0xab4, 0x94ba, 0x14b6, 0xa56, 0x7527, 0xd26, 0xee53,
+        0xd54, 0x15aa, 0xa9b5, 0x96c, 0x14ae, 0x8a4e, 0x1a4c, 0x11d26, 0x1aa4, 0x1b54, 0xcd6a, 0xada, 0x95c, 0x949d,
+        0x149a, 0x1a2a, 0x5b25, 0x1aa4, 0xfb52, 0x16b4, 0xaba, 0xa95b, 0x936, 0x1496, 0x9a4b, 0x154a, 0x136a5, 0xda4,
+        0x15ac
+    ]
+
+    SOLAR11 = [
+        1887, 0xec04c, 0xec23f, 0xec435, 0xec649, 0xec83e, 0xeca51, 0xecc46, 0xece3a, 0xed04d, 0xed242, 0xed436,
+        0xed64a, 0xed83f, 0xeda53, 0xedc48, 0xede3d, 0xee050, 0xee244, 0xee439, 0xee64d, 0xee842, 0xeea36, 0xeec4a,
+        0xeee3e, 0xef052, 0xef246, 0xef43a, 0xef64e, 0xef843, 0xefa37, 0xefc4b, 0xefe41, 0xf0054, 0xf0248, 0xf043c,
+        0xf0650, 0xf0845, 0xf0a38, 0xf0c4d, 0xf0e42, 0xf1037, 0xf124a, 0xf143e, 0xf1651, 0xf1846, 0xf1a3a, 0xf1c4e,
+        0xf1e44, 0xf2038, 0xf224b, 0xf243f, 0xf2653, 0xf2848, 0xf2a3b, 0xf2c4f, 0xf2e45, 0xf3039, 0xf324d, 0xf3442,
+        0xf3636, 0xf384a, 0xf3a3d, 0xf3c51, 0xf3e46, 0xf403b, 0xf424e, 0xf4443, 0xf4638, 0xf484c, 0xf4a3f, 0xf4c52,
+        0xf4e48, 0xf503c, 0xf524f, 0xf5445, 0xf5639, 0xf584d, 0xf5a42, 0xf5c35, 0xf5e49, 0xf603e, 0xf6251, 0xf6446,
+        0xf663b, 0xf684f, 0xf6a43, 0xf6c37, 0xf6e4b, 0xf703f, 0xf7252, 0xf7447, 0xf763c, 0xf7850, 0xf7a45, 0xf7c39,
+        0xf7e4d, 0xf8042, 0xf8254, 0xf8449, 0xf863d, 0xf8851, 0xf8a46, 0xf8c3b, 0xf8e4f, 0xf9044, 0xf9237, 0xf944a,
+        0xf963f, 0xf9853, 0xf9a47, 0xf9c3c, 0xf9e50, 0xfa045, 0xfa238, 0xfa44c, 0xfa641, 0xfa836, 0xfaa49, 0xfac3d,
+        0xfae52, 0xfb047, 0xfb23a, 0xfb44e, 0xfb643, 0xfb837, 0xfba4a, 0xfbc3f, 0xfbe53, 0xfc048, 0xfc23c, 0xfc450,
+        0xfc645, 0xfc839, 0xfca4c, 0xfcc41, 0xfce36, 0xfd04a, 0xfd23d, 0xfd451, 0xfd646, 0xfd83a, 0xfda4d, 0xfdc43,
+        0xfde37, 0xfe04b, 0xfe23f, 0xfe453, 0xfe648, 0xfe83c, 0xfea4f, 0xfec44, 0xfee38, 0xff04c, 0xff241, 0xff436,
+        0xff64a, 0xff83e, 0xffa51, 0xffc46, 0xffe3a, 0x10004e, 0x100242, 0x100437, 0x10064b, 0x100841, 0x100a53,
+        0x100c48, 0x100e3c, 0x10104f, 0x101244, 0x101438, 0x10164c, 0x101842, 0x101a35, 0x101c49, 0x101e3d, 0x102051,
+        0x102245, 0x10243a, 0x10264e, 0x102843, 0x102a37, 0x102c4b, 0x102e3f, 0x103053, 0x103247, 0x10343b, 0x10364f,
+        0x103845, 0x103a38, 0x103c4c, 0x103e42, 0x104036, 0x104249, 0x10443d, 0x104651, 0x104846, 0x104a3a, 0x104c4e,
+        0x104e43, 0x105038, 0x10524a, 0x10543e, 0x105652, 0x105847, 0x105a3b, 0x105c4f, 0x105e45, 0x106039, 0x10624c,
+        0x106441, 0x106635, 0x106849, 0x106a3d, 0x106c51, 0x106e47, 0x10703c, 0x10724f, 0x107444, 0x107638, 0x10784c,
+        0x107a3f, 0x107c53, 0x107e48
+    ]
+
+    TIAN_GAN = ["甲", "乙", "丙", "丁", "戊", "己", "庚", "辛", "壬", "癸"]
+    DI_ZHI = ["子", "丑", "寅", "卯", "辰", "巳", "午", "未", "申", "酉", "戌", "亥"]
+    MONTH = ["正月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "腊月"]
+    DAY = [
+        "初一", "初二", "初三", "初四", "初五", "初六", "初七", "初八", "初九", "初十",
+        "十一", "十二", "十三", "十四", "十五", "十六", "十七", "十八", "十九", "二十",
+        "廿一", "廿二", "廿三", "廿四", "廿五", "廿六", "廿七", "廿八", "廿九", "三十", "卅一"
+    ]
+
+    class << self
+
+      def date_to_lunar(date = Date.today)
+        converter = LunarSolarConverter.new
+        solar = Solar.new
+
+        solar.solar_year = date.year
+        solar.solar_month = date.month
+        solar.solar_day = date.day
+
+        lunar = converter.solar_to_lunar(solar)
+        lunar_text(lunar)
+      end
+
+      protected
+
+      def lunar_text(lunar)
+        tian_gan = TIAN_GAN[(lunar.lunar_year - 4) % 10]
+        di_zhi =  DI_ZHI[(lunar.lunar_year - 4) % 12]
+        month = "#{lunar.is_leap ? '闰' : ''}#{MONTH[lunar.lunar_month - 1]}"
+        day = "#{DAY[lunar.lunar_day - 1]}"
+
+        "#{tian_gan}#{di_zhi}年 #{month}#{day}"
+      end
+
+    end
+
+    def lunar_to_solar(lunar)
+      offset = 0
+      days = LUNAR_MONTH_DAYS[lunar.lunar_year - LUNAR_MONTH_DAYS.first]
+      leap = get_bit_int(days, 4, 13)
+      loopend = leap
+
+      unless lunar.is_leap
+        loopend = if lunar.lunar_month <= leap || leap == 0
+                    lunar.lunar_month - 1
+                  else
+                    lunar.lunar_month
+                  end
+      end
+
+      (0..loopend-1).each do |i|
+        tmp_offset = get_bit_int(days, 1, 12 - i) == 1 ? 30 : 29
+
+        offset += tmp_offset
+      end
+
+      offset += lunar.lunar_day
+      solar11 = SOLAR11[lunar.lunar_year - SOLAR11.first]
+
+      y = get_bit_int(solar11, 12, 9)
+      m = get_bit_int(solar11, 4, 5)
+      d = get_bit_int(solar11, 5, 0)
+
+      solar_from_int(solar_to_int(y, m, d) + offset - 1)
+    end
+
+    def solar_to_lunar(solar)
+      lunar = Lunar.new(0, 0, 0, false)
+      index = solar.solar_year - SOLAR11.first
+      data = (solar.solar_year << 9) | (solar.solar_month << 5) | solar.solar_day
+
+      index -= 1 if SOLAR11[index] > data
+      solar11 = SOLAR11[index]
+
+      y = get_bit_int(solar11, 12, 9)
+      m = get_bit_int(solar11, 4, 5)
+      d = get_bit_int(solar11, 5, 0)
+      offset = solar_to_int(solar.solar_year, solar.solar_month, solar.solar_day) - solar_to_int(y, m, d)
+
+      days = LUNAR_MONTH_DAYS[index]
+      leap = get_bit_int(days, 4, 13)
+
+      lunar_year = index + SOLAR11.first
+      lunar_month = 1
+      offset += 1
+
+      (0..12).each do |i|
+        dm = get_bit_int(days, 1, 12 - i) == 1 ? 30 : 29
+        break if dm >= offset
+
+        lunar_month += 1
+        offset -= dm
+      end
+
+      lunar.lunar_year = lunar_year
+      lunar.lunar_month = lunar_month
+      lunar.lunar_day = offset.to_i
+      lunar.is_leap = false
+
+      if leap != 0 && lunar_month > leap
+        lunar.lunar_month = lunar_month - 1
+
+        lunar.is_leap = true if lunar_month == leap + 1
+      end
+
+      lunar
+    end
+
+    private
+
+    def get_bit_int(data, length, shift)
+      (data & (((1 << length) - 1) << shift)) >> shift
+    end
+
+    def solar_to_int(y, m, d)
+      m = (m + 9) % 12
+      y -= m / 10
+
+      365 * y + y / 4 - y / 100 + y / 400 + (m * 306 + 5) / 10 + (d - 1)
+    end
+
+    def solar_from_int(g)
+      y = (10000 * g + 14780) / 3652425
+      ddd = g - (365 * y + y / 4 - y / 100 + y / 400)
+
+      if ddd < 0
+        y -= 1
+        ddd = g - (365 * y + y / 4 - y / 100 + y / 400)
+      end
+
+      mi = (100 * ddd + 52) / 3060
+      mm = (mi + 2) % 12 + 1
+      y += (mi + 2) / 12
+      dd = ddd - (mi * 306 + 5) / 10 + 1
+
+      Solar.new(y, mm, dd)
+    end
+
+  end
+end

data/lib/daily_image/poem.rb

@@ -15,7 +15,7 @@ require "json"
 module DailyImage
   class Poem
 
-    API_URL = "https://api.gushi.ci/all.json"
+    API_URL = "https://v1.jinrishici.com/all.json"
 
     def txt
       get(API_URL)

data/lib/daily_image/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: daily_image
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - renyijiu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-vips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.17
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.17
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -76,15 +97,17 @@ files:
 - lib/daily_image.rb
 - lib/daily_image/config.rb
 - lib/daily_image/image.rb
+- lib/daily_image/lunar_solar_converter.rb
 - lib/daily_image/poem.rb
 - lib/daily_image/version.rb
 - tmp/daily_2018-09-14.jpg
 - tmp/daily_2018-09-17.jpg
+- tmp/daily_2018-10-06.jpeg
 homepage: https://github.com/renyijiu/daily_image
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,9 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: "A gem generate a daily image. Just For Fun \U0001F60A"
 test_files: []