hanreki 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e19a99e96ee72d1f6259a403d3be1b18aa8141f2
-  data.tar.gz: 61b77c384c40eb397c0ca071cecbeac193332de7
+  metadata.gz: a867b87334a1a1be5954d74b9059cd465651f1a5
+  data.tar.gz: 2961b20754273404809b8c9f8f1d2d789edfb879
 SHA512:
-  metadata.gz: dc07f84b3368ffe36618ce9d39918cc4e8fd89c79b67d7b0719a5b8d34626bb76189046b6179090e083b8173b73165a16d47344a14da60042c3da11ab196f978
-  data.tar.gz: c9737f48c8221baaf4e50c4b7d0545d9469db75237041697eab1c5548d501e6020630857e7c2d8f5b1c51200ac2021b722574bfcc23872b96060d93c2540702a
+  metadata.gz: a04b6f1fe15222d4de38772121cfe025a0df77008a58a726e09cec72bf0f2b4fa3650ac7ec4e4ef1f4ef1eca17d850bd8889369c920bab1dd332114a15d44709
+  data.tar.gz: 8579bada5beea05a9b7cf71eea9e2e423a456425430e28034dc77e2c19e3a0f36cb2fba1db85351ac6b097a9bca8ec536c53036b288d96e2f466eb3d6ffed9e7

data/README.md

@@ -25,12 +25,15 @@ And then execute:
     $ bundle exec hanreki
 
 ## Usage
-TODO
+Run `hanreki help` or `bundle exec hanreki help`.
 
 ## Development
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 Bug reports and pull requests are welcome on GitHub at https://github.com/camphor-/hanreki.
+
+## Why "hanreki"?
+This application is named after a Japanese word "[頒暦](https://ja.wikipedia.org/wiki/頒暦)".

data/hanreki.gemspec

@@ -14,7 +14,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/camphor-/hanreki'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f|
+                         f.match(%r{^(
+                           (bin|test|spec|features)/|
+                           \.gitignore|\.rspec|\.travis\.yml|Rakefile
+                         )}x)
+                       }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
@@ -23,6 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'icalendar', '~> 2.3'
+  spec.add_dependency 'json-schema', '~> 2.7'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 12.0'

data/lib/hanreki/schedule.rb

@@ -1,6 +1,7 @@
 require 'csv'
 require 'date'
 require 'json'
+require 'json-schema'
 require 'hanreki/event'
 require 'hanreki/i_calendar'
 require 'hanreki/time_util'
@@ -14,6 +15,7 @@ class Schedule
   JSON_PRIVATE_PATH = 'json/camphor_private_events.json'
   JSONP_PUBLIC_PATH = 'jsonp/camphor_public_events.js'
   JSONP_PRIVATE_PATH = 'jsonp/camphor_private_events.js'
+  JSON_SCHEMA_PATH = File.expand_path('../schema.json', __FILE__)
 
   def initialize
     # マスターファイルを生成する際のファイル名の決定に使用
@@ -55,22 +57,20 @@ class Schedule
   # Output private and public JSON calendar files
   def out_json
     File.open(JSON_PUBLIC_PATH, 'w') do |f|
-      JSON.dump(public_events.map { |event| event.to_h(:public, :string) } , f)
+      f.write(events_to_json(public_events, :public, validate: true))
     end
     File.open(JSON_PRIVATE_PATH, 'w') do |f|
-      JSON.dump(private_events.map { |event| event.to_h(:private, :string) } , f)
+      f.write(events_to_json(private_events, :private, validate: true))
     end
   end
 
   # Output private and public JSONP calendar files
   def out_jsonp(callback = 'callback')
     File.open(JSONP_PUBLIC_PATH, 'w') do |f|
-      events = public_events.map { |event| event.to_h(:public, :string) }
-      f.write("#{callback}(#{events.to_json});")
+      f.write("#{callback}(#{events_to_json(public_events, :public)});")
     end
     File.open(JSONP_PRIVATE_PATH, 'w') do |f|
-      events = private_events.map { |event| event.to_h(:private, :string) }
-      f.write("#{callback}(#{events.to_json});")
+      f.write("#{callback}(#{events_to_json(private_events, :private)});")
     end
   end
 
@@ -123,4 +123,14 @@ class Schedule
   def private_events
     @events.select(&:private?)
   end
+
+  def events_to_json(events, type, validate = false)
+    json = events.map { |event| event.to_h(type, :string) }.to_json
+    validate_json!(json) if validate
+    json
+  end
+
+  def validate_json!(json)
+    JSON::Validator.validate!(JSON_SCHEMA_PATH, json)
+  end
 end

data/lib/hanreki/schema.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "array",
+  "items": [
+    {
+      "type": "object",
+      "properties": {
+        "title": {"type": "string"},
+        "start": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "end": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "url": {
+          "anyOf": [
+            {"type": "string"},
+            {"type": "null"}
+          ]
+        }
+      },
+      "required": ["title", "start", "end", "url"]
+    }
+  ]
+}

data/lib/hanreki/version.rb

@@ -1,3 +1,3 @@
 module Hanreki
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanreki
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - CAMPHOR-
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,15 +102,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - exe/hanreki
 - hanreki.gemspec
 - lib/hanreki.rb
@@ -104,6 +112,7 @@ files:
 - lib/hanreki/event.rb
 - lib/hanreki/i_calendar.rb
 - lib/hanreki/schedule.rb
+- lib/hanreki/schema.json
 - lib/hanreki/time_util.rb
 - lib/hanreki/version.rb
 homepage: https://github.com/camphor-/hanreki
@@ -126,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple schedule manager for CAMPHOR-

data/.gitignore

@@ -1,11 +0,0 @@
-*.gem
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/vendor/bundle/

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.travis.yml

@@ -1,12 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.1
-  - 2.2.4
-  - 2.3.1
-  - 2.4.0
-before_install:
-  - gem install bundler
-notifications:
-  slack:
-    secure: SqYPNEedzTJqs9XHn0SW1RvPVG2GPcMJWMrE4hg35WnzZk7rSk9DbHqjjZo1+qAS8MF/du68KKPRJe1KewerK+Zub2wwsFAR2Wvp0Elrq2fgKKNMY67ulG+ET6f2Mz9Uij83CO9fBxbCXxqja+nTbHZhx7YM5B9KSAqwNs6DYahxtueLiqK4y4YVULt/KUvo9mA2gjIbeTZE0TZ/se0pXVtunh/UFW+CE34rkTT3zoUtk4CcCO/wMXu56vwqyHluwwmhVVjvMB96WYrJ3O2R9ef3Cm9rfzAeyJ0LDBddOwr+z4ZsI2Yz+b270bM6F1Mb6sDO48WGi12u8JRRGECy/GA8R93Jo6mnC+cEPx50XElPE5njbI56LRBuzAjimEyxpwfA9UWBgRDGmHyEc3B16ri/DKknEE+YxEvsEfgKSt012sXBS0gYO6jIz318GMxdj6+EYYVJXwJMj8MZlCUtvfgqq4qQwk/vBDK9BAcfDjIbayWLEnenXJWnRwW7gVn4hQG4qx+TUUZDcgiZ+adFcMLZjvd500GSOeV8H+4U5pR0MWIzuC1MTAIYB4E7Tma2QQqU2dG3ztHqo4ubApTb/qBpcYrFOjCBPT2ItGC85mSlGMs4vgMnVUGyFaLR5u4PYe6Hd/uNfE6i8ayJ2E1STFVUuwD0EdOXqEZT6ulnvD4=

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "hanreki"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here