xpub 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877ab04ae6dcc87b84f58981a8b4f4cf4db2b13c
-  data.tar.gz: 97eb7fb47e86d13a1771ad5adc36ed0e772e2c24
+  metadata.gz: 340f22ebfe3786f4c573a588ed8b06a387878963
+  data.tar.gz: 1f13447525369f0263468cc8f77f25b81c2d3892
 SHA512:
-  metadata.gz: 37a38c380d0590f97bb65a496ad9da5eb35c189b652b86c24f2699ed7fbd298fb71a0d6e8f50c91d0b1c47d5935d6ce41c8e8c1eb20c220c654845f90e0e2c08
-  data.tar.gz: 09a15c7aa078c85c4cf10309aa1c3e9ca5935883217a6bd54c8c78cbd4aa8c59cdf76f346396ca4b52a33d1392dbad2f0dd71159f0efd306320653e776a5c58b
+  metadata.gz: 31a0c70456c76295b43f1d8935fcda4c7d55af8d060a11c1b713558f98f32f9548bdd099d903b84406ed312ee4cb6ecd96c72c9e5cddf9cb93898dec4cec7cb8
+  data.tar.gz: 9014abe8a5e25cf605aa057007b6b61bcfd0af1412309e29a91b8179041c7e7c571c4d88472d9e3088e0da5ce72dede5861dd1aa007955662fac7c40bcb11ea0

data/bin/xpub

@@ -10,6 +10,9 @@ require 'pathname'
 require 'shellwords'
 require 'erb'
 require 'time'
+require 'singleton'
+require 'dsl_accessor'
+require 'levenshtein'
 
 require 'xpub/version.rb'
 
@@ -21,10 +24,13 @@ opt = OptionParser.new do |opt|
  opt.on_head('[cmd]',
              '    init    Xpubファイルの生成',
              '    build   ビルド',
-             '    clean   テンポラリフォルダと出力フォルダをクリア')
+             '    clean   テンポラリフォルダと出力フォルダをクリア',
+             '    check   ソースコードを検証'
+             )
  opt.on('-v', '出力を詳細にする') { |v| option[:v] = v }
  opt.on('--book=VALUE', 'ビルドするbookを指定する') { |v| option[:book] = v }
  opt.on('--builder=VALUE', 'ビルドするbuilderを指定する') { |v| option[:builder] = v }
+ opt.on('--checker=VALUE', 'チェックするcheckerを指定する') { |v| option[:checker] = v }
  opt.on('--pandoc-json-output', 'ビルド時にpandocのjsonを出力') { |v| option['pandoc-json-output'] = v }
  opt.permute!(ARGV)
 end
@@ -43,6 +49,7 @@ require "xpub/dsl/book"
 require "xpub/dsl/src_file"
 require "xpub/dsl/builder"
 require "xpub/dsl/page"
+require "xpub/dsl/checker"
 
 if File.file?("#{curDir}/Xpub") && ARGV[0] != "init"
  load "#{curDir}/Xpub"
@@ -67,6 +74,9 @@ elsif ARGV[0] == "init"
  end
  puts "init...".color :green
  FileUtils.cp_r(Dir.glob(File.dirname(__FILE__) + "/../skel/*"),"./")
+elsif ARGV[0] == "check"
+ puts "check...".color :green
+ Xpub::BookManager.instance.check option
 else
  puts opt.help
  exit

data/lib/xpub/dsl/book.rb

@@ -1,138 +1,34 @@
-require 'singleton'
-
 module Xpub
  class CallBook
   attr_reader :name, :src_files, :resource_files, :creators, :contributors, :identifiers
 
+  dsl_accessor :title, :instance=>true, :default => "UNTITLED"
+  dsl_accessor :subtitle, :instance=>true
+  dsl_accessor :short, :instance=>true
+  dsl_accessor :collection, :instance=>true
+  dsl_accessor :edition, :instance=>true
+  dsl_accessor :extended, :instance=>true
+  dsl_accessor :publisher, :instance=>true
+  dsl_accessor :rights, :instance=>true
+  dsl_accessor :publication, :instance=>true
+  dsl_accessor :modification, :instance=>true
+  dsl_accessor :lang, :instance=>true, :default => "ja"
+  dsl_accessor :description, :instance=>true
+
   def initialize name
    @name = name
-   @title = "UNTITLED"
-   @subtitle = nil
-   @short = nil
-   @collection = nil
-   @edition = nil
-   @extended = nil
-   @publisher = nil
-   @rights = nil
-   @publication = nil
-   @modification = nil
-   @lang = "ja"
    @creators = []
    @contributors = []
    @identifiers = []
-   @description = nil
-
    @src_files = []
    @resource_files = []
    @builders = []
+   @checkers = []
   end
 
-
   def validate
   end
 
-  def _set_or_get values
-   # 引数が 2 つ以上ならエラー
-   raise ArgumentError, "wrong number of arguments (#{ values.length} for 0..1)" if values.length > 1
-   values.empty?
-  end
-
-  def title *values
-   if _set_or_get values
-    @title
-   else
-    @title = values[0]
-   end
-  end
-
-  def subtitle *values
-   if _set_or_get values
-    @subtitle
-   else
-    @subtitle = values[0]
-   end
-  end
-
-  def short *values
-   if _set_or_get values
-    @short
-   else
-    @short = values[0]
-   end
-  end
-
-  def collection *values
-   if _set_or_get values
-    @collection
-   else
-    @collection = values[0]
-   end
-  end
-
-  def edition *values
-   if _set_or_get values
-    @edition
-   else
-    @edition = values[0]
-   end
-  end
-
-  def extended *values
-   if _set_or_get values
-    @extended
-   else
-    @extended = values[0]
-   end
-  end
-
-  def publisher *values
-   if _set_or_get values
-    @publisher
-   else
-    @publisher = values[0]
-   end
-  end
-
-  def rights *values
-   if _set_or_get values
-    @rights
-   else
-    @rights = values[0]
-   end
-  end
-
-  def publication *values
-   if _set_or_get values
-    @publication
-   else
-    @publication = values[0]
-   end
-  end
-
-  def modification *values
-   if _set_or_get values
-    @modification
-   else
-    @modification = values[0]
-   end
-  end
-
-  def lang *values
-   if _set_or_get values
-    @lang
-   else
-    @lang = values[0]
-   end
-  end
-
-  def description *values
-   if _set_or_get values
-    @description
-   else
-    @description = values[0]
-   end
-  end
-
   def build option
    puts "build #{@name} book.".color :green
    @builders.each { |b| 
@@ -142,30 +38,25 @@ module Xpub
    }
   end
 
+  def check option
+   puts "check #{@name} book.".color :green
+   @checkers.each { |c| 
+    if !option[:checker] || option[:checker] == c.name
+     c.check option
+    end
+   }
+  end
+
   class CallAuthor
    attr_reader :name
+   dsl_accessor :role, :instance=>true
 
    def initialize name
     @name = name
-    @role = nil
    end
 
    def validate
    end
-
-   def _set_or_get values
-    # 引数が 2 つ以上ならエラー
-    raise ArgumentError, "wrong number of arguments (#{ values.length} for 0..1)" if values.length > 1
-    values.empty?
-   end
-
-   def role *values
-    if _set_or_get values
-     @role
-    else
-     @role = values[0]
-    end
-   end
   end
 
   def creator name, &block
@@ -188,37 +79,15 @@ module Xpub
 
   class CallIdentifier
    attr_reader :identifier
+   dsl_accessor :scheme, :instance=>true
+   dsl_accessor :type_value, :instance=>true
 
    def initialize identifier
     @identifier = identifier
-    @scheme = nil
-    @type_value = nil
    end
 
    def validate
    end
-
-   def _set_or_get values
-    # 引数が 2 つ以上ならエラー
-    raise ArgumentError, "wrong number of arguments (#{ values.length} for 0..1)" if values.length > 1
-    values.empty?
-   end
-
-   def scheme *values
-    if _set_or_get values
-     @scheme
-    else
-     @scheme = values[0]
-    end
-   end
-
-   def type_value *values
-    if _set_or_get values
-     @type_value
-    else
-     @type_value = values[0]
-    end
-   end
   end
 
   def identifier identifier, &block
@@ -246,8 +115,8 @@ module Xpub
    @books = []
   end
 
-  def add c
-   @books << c
+  def add b
+   @books << b
   end
 
   def build option
@@ -257,5 +126,13 @@ module Xpub
     end
    }
   end
+
+  def check option
+   @books.each { |book|
+    if !option[:book] || option[:book] == book.name
+     book.check option
+    end
+   }
+  end
  end
 end

data/lib/xpub/dsl/builder.rb

@@ -1,20 +1,13 @@
 module Xpub
  class CallBook
   class CallBuilder
-   attr_reader :name, :theme, :output
+   attr_reader :name
+   dsl_accessor :theme, :instance=>true, :default => "default"
+   dsl_accessor :output, :instance=>true
 
    def initialize name, book
     @name = name
     @book = book
-    @theme = "default"
-   end
-
-   def output output
-    @output = output
-   end
-
-   def theme theme
-    @theme = theme
    end
 
    def build
@@ -52,7 +45,6 @@ module Xpub
    end
 
    def cmd_exec cmd, args, option
-
     cmd_line = cmd + " " + args.map { |arg|
      Shellwords.shellescape(arg)
     }.join(" ")
@@ -70,49 +62,26 @@ module Xpub
   end
 
   class CallEpubBuilder < CallBuilder
+   dsl_accessor :template, :instance=>true, :default => "template.html"
+   dsl_accessor :filter, :instance=>true, :default => "pandoc-filter.rb"
+   dsl_accessor :stylesheet, :instance=>true, :default => "epub.css"
+   dsl_accessor :metadata, :instance=>true, :default => "metadata.dat"
+   dsl_accessor :page_progression_direction, :instance=>true, :default => "rtl"
+   dsl_accessor :cover_image, :instance=>true
+   dsl_accessor :pandoc_cmd, :instance=>true, :default => "pandoc"
+
    def initialize name, book
     @vars = []
     @meta = []
-    @template = "template.html"
-    @filter = "pandoc-filter.rb"
-    @stylesheet = "epub.css"
-    @metadata = "metadata.dat"
-    @page_progression_direction = "rtl"
-    @cover_image = nil
-
     if book.title != ""
      @vars << ["title", book.title]
     end
     super name, book
    end
 
-   def page_progression_direction param
-    @page_progression_direction = param
-   end
-
-   def template param
-    @template = param
-   end
-
-   def filter param
-    @filter = param
-   end
-
-   def stylesheet param
-    @stylesheet = param
-   end
-
-   def metadata param
-    @metadata = param
-   end
-
-   def cover_image param
-    @cover_image = param
-   end
-
    def meta_option
     result = []
-    @meta.concat([["page-progression-direction", @page_progression_direction]]).each { |m|
+    @meta.concat([["page-progression-direction", page_progression_direction]]).each { |m|
      result << "-M"
      result << "#{m[0]}=#{m[1]}"
     }
@@ -129,15 +98,15 @@ module Xpub
    end
 
    def template_option
-    "--template=#{Dir::getwd}/theme/#{@theme}/#{@name}/#{@template}"
+    "--template=#{Dir::getwd}/theme/#{theme}/#{@name}/#{template}"
    end
 
    def filter_option
-    "--filter=#{Dir::getwd}/theme/#{@theme}/#{@name}/#{@filter}"
+    "--filter=#{Dir::getwd}/theme/#{theme}/#{@name}/#{filter}"
    end
 
    def stylesheet_option
-    "--epub-stylesheet=#{Dir::getwd}/theme/#{@theme}/#{@name}/#{@stylesheet}"
+    "--epub-stylesheet=#{Dir::getwd}/theme/#{theme}/#{@name}/#{stylesheet}"
    end
 
    def metadata_option
@@ -145,11 +114,11 @@ module Xpub
    end
 
    def metadata_path
-    tmp_path("#{@book.name}.#{@metadata}")
+    tmp_path("#{@book.name}.#{metadata}")
    end
 
    def metadata_template_path
-    "#{Dir::getwd}/theme/#{@theme}/#{@name}/#{@metadata}.erb"
+    "#{Dir::getwd}/theme/#{theme}/#{@name}/#{metadata}.erb"
    end
 
    def epub_path
@@ -164,10 +133,6 @@ module Xpub
     copy_to_tmp files
    end
 
-   def pandoc_cmd
-    "pandoc"
-   end
-
    def pandoc_option option
     option = [
      "--epub-chapter-level=1",
@@ -180,8 +145,8 @@ module Xpub
      stylesheet_option,
      metadata_option
     ]
-    if @cover_image
-     option << "--epub-cover-image=" + src_path(@cover_image) 
+    if cover_image
+     option << "--epub-cover-image=" + src_path(cover_image) 
     end
     option
    end
@@ -208,12 +173,15 @@ module Xpub
   end
 
   class CallLatexBuilder < CallBuilder
-   attr_reader :template
+   dsl_accessor :template, :instance=>true, :default => "template.tex"
+   dsl_accessor :filter, :instance=>true, :default => "pandoc-filter.rb"
+   dsl_accessor :extractbb_cmd, :instance=>true, :default => "extractbb"
+   dsl_accessor :pandoc_cmd, :instance=>true, :default => "pandoc"
+   dsl_accessor :latex_cmd, :instance=>true, :default => "uplatex"
+   dsl_accessor :dvipdfm_cmd, :instance=>true, :default => "dvipdfmx"
 
    def initialize name, book
     @vars = []
-    @template = "template.tex"
-    @filter = "pandoc-filter.rb"
     @hyoushi = []
     @urahyoushi = []
     super name, book
@@ -243,13 +211,6 @@ module Xpub
     @vars << [:postchaptername, param]
    end
 
-   def template param
-    @template = param
-   end
-
-   def filter param
-    @filter = param
-   end
 
    def vars_option
     result = []
@@ -261,11 +222,11 @@ module Xpub
    end
 
    def template_option
-    "--template=#{Dir::getwd}/theme/#{@theme}/#{@name}/#{@template}"
+    "--template=#{Dir::getwd}/theme/#{theme}/#{@name}/#{template}"
    end
 
    def filter_option
-    "--filter=#{Dir::getwd}/theme/#{@theme}/#{@name}/#{@filter}"
+    "--filter=#{Dir::getwd}/theme/#{theme}/#{@name}/#{filter}"
    end
 
    def tex_path
@@ -281,17 +242,13 @@ module Xpub
    end
 
    def pdf_path
-    if @output
-     output_path(@output) + '.pdf'
+    if output
+     output_path(output) + '.pdf'
     else
      output_path(@book.name) + '.pdf'
     end
    end
 
-   def extractbb_cmd
-    "extractbb"
-   end
-
    def _build_resource files, option
     copy_to_tmp files
     files.each { |file|
@@ -306,10 +263,6 @@ module Xpub
     _build_resource @book.resource_files, option
    end
 
-   def pandoc_cmd
-    "pandoc"
-   end
-
    def pandoc_option option
     [
      "--chapters",
@@ -321,14 +274,6 @@ module Xpub
     ]
    end
 
-   def latex_cmd
-    "uplatex"
-   end
-
-   def dvipdfm_cmd
-    "dvipdfmx"
-   end
-
    def build option
     FileUtils.mkdir_p(tmp_path "") unless FileTest.exist?(tmp_path "")
     if option['pandoc-json-output']
@@ -352,6 +297,7 @@ module Xpub
     end
    end
   end
+
   def epub_builder name, &block
    call = CallEpubBuilder.new name, self
    if block

data/lib/xpub/dsl/checker.rb

@@ -0,0 +1,69 @@
+module Xpub
+ class CallBook 
+  class CallChecker
+   def initialize name, book
+    @name = name
+    @book = book
+   end
+
+   def validate
+   end
+
+   def _check option, pattern
+    words = {}
+    @book.src_files.each do |file| 
+     f = open file.full_path
+     f.each_with_index do |line, index| 
+      line.match(pattern) do |md|
+       if words[md[1]]
+        words[md[1]] << { :file => file.file, :line => (index + 1) }
+       else
+        words[md[1]] = [{ :file => file.file, :line => (index + 1) }]
+       end
+      end
+     end
+     f.close
+    end
+
+    words.sort.each do |word, infos| 
+     if word
+      puts word.color :red
+      infos.each { |info| 
+       puts "  #{info[:file]}(#{info[:line]})"
+      }
+     end
+    end
+   end
+  end
+
+  class CallNumberChecker < CallChecker
+   def check option
+    _check option, /([０-９一二三四五六七八九十百千万億兆京〇零]+)/
+   end
+  end
+
+  class CallKanaChecker < CallChecker
+   def check option
+    _check option, /([\p{Katakana}ー－]+)/
+   end
+  end
+
+  def number_checker name, &block
+   call = CallNumberChecker.new name, self
+   if block
+    call.instance_eval &block
+   end
+   call.validate
+   @checkers << call
+  end
+
+  def kana_checker name, &block
+   call = CallKanaChecker.new name, self
+   if block
+    call.instance_eval &block
+   end
+   call.validate
+   @checkers << call
+  end
+ end
+end

data/lib/xpub/dsl/page.rb

@@ -24,23 +24,9 @@ module Xpub
    end
 
    class CallImgPageLatexOp < CallLatexOp
-    def initialize name, book, builder
-     @topoffset = "0in"
-     @leftoffset = "0in"
-     super name, book, builder
-    end
-
-    def topoffset param
-     @topoffset = param
-    end
-
-    def leftoffset param
-     @leftoffset = param
-    end
-
-    def file param
-     @file = param
-    end
+    dsl_accessor :topoffset, :instance=>true, :default => "0in"
+    dsl_accessor :leftoffset, :instance=>true, :default => "0in"
+    dsl_accessor :file, :instance=>true
 
     def latex book, builder
      <<"EOS"
@@ -49,34 +35,23 @@ module Xpub
 \\vspace*{-1truein}
 \\vspace*{-\\hoffset}
 \\vspace*{-\\oddsidemargin}
-\\vspace*{#{@leftoffset}}
-\\noindent\\hspace*{-1in}\\hspace*{-\\voffset}\\hspace*{-\\topmargin}\\hspace*{-\\headheight}\\hspace*{-\\headsep}\\hspace*{#{@topoffset}}
-\\includegraphics[width=\\paperheight,height=\\paperwidth]{#{@file}}
+\\vspace*{#{leftoffset}}
+\\noindent\\hspace*{-1in}\\hspace*{-\\voffset}\\hspace*{-\\topmargin}\\hspace*{-\\headheight}\\hspace*{-\\headsep}\\hspace*{#{topoffset}}
+\\includegraphics[width=\\paperheight,height=\\paperwidth]{#{file}}
 \\clearpage\n
 EOS
     end
    end
 
    class CallEmptyPageLatexOp < CallLatexOp
-    def initialize name, book, builder
-     @no_page_number = false
-     super name, book, builder
-    end
-
-    def no_page_number
-     @no_page_number = true
-    end
+    dsl_accessor :no_page_number, :instance=>true, :default => false
 
     def latex book, builder
-     (@no_page_number ? "\\thispagestyle{empty}" : "")  + "　\\clearpage\n"
+     (no_page_number ? "\\thispagestyle{empty}" : "")  + "　\\clearpage\n"
     end
    end
 
    class CallInnerTitlePageLatexOp < CallLatexOp
-    def initialize name, book, builder
-     super name, book, builder
-    end
-
     def latex book, builder
      <<"EOS"
 \\makeatletter

data/lib/xpub/version.rb

@@ -1,3 +1,3 @@
 module Xpub
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/xpub.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_dependency 'rainbow', '~> 2.0.0'
+  spec.add_dependency 'dsl_accessor', '~> 0.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xpub
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yoshihisa AMAKATA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: dsl_accessor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 description: Xpub is EPUB and PDF publisher.
 email:
 - amakata@gmail.com
@@ -69,6 +83,7 @@ files:
 - lib/xpub.rb
 - lib/xpub/dsl/book.rb
 - lib/xpub/dsl/builder.rb
+- lib/xpub/dsl/checker.rb
 - lib/xpub/dsl/page.rb
 - lib/xpub/dsl/src_file.rb
 - lib/xpub/version.rb