xpub 0.0.7 → 0.0.8

data/lib/xpub/dsl/checker.rb

@@ -1,70 +1,65 @@
+# Xpub module
 module Xpub
- class CallBook
-  class CallChecker
-   
-   def initialize name, book
-    @name = name
-    @book = book
-   end
+  class CallBook
+    class CallChecker
+      def initialize(name, book)
+        @name = name
+        @book = book
+      end
+
+      def validate
+      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
 
-   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
+        words.sort.each do |word, infos|
+          next unless word
+          puts word.color :red
+          infos.each do |info|
+            puts "  #{info[:file]}(#{info[:line]})"
+          end
+        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
+    class CallNumberChecker < CallChecker
+      def check(option)
+        _check option, /([０-９一二三四五六七八九十百千万億兆京〇零]+)/
+      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
+    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 number_checker(name, &block)
+      call = CallNumberChecker.new name, self
+      call.instance_eval(&block) if block
+      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
+    def kana_checker(name, &block)
+      call = CallKanaChecker.new name, self
+      call.instance_eval(&block) if block
+      call.validate
+      @checkers << call
+    end
   end
- end
 end

data/lib/xpub/dsl/page.rb

@@ -1,36 +1,36 @@
+# Xpub module
 module Xpub
- class CallBook
-  class CallLatexBuilder
-   class CallLatexOp
+  class CallBook
+    class CallLatexBuilder
+      class CallLatexOp
+        def initialize(name, book, builder)
+          @name = name
+          @book = book
+          @builder = builder
+        end
 
-    def initialize name, book, builder
-     @name = name
-     @book = book
-     @builder = builder
-    end
-    def validate
-    end
+        def validate
+        end
 
-    def template_path
-     "#{Dir::getwd}/theme/#{@builder.theme}/#{@name}/#{@metadata}.erb"
-    end
+        def template_path
+          "#{Dir.getwd}/theme/#{@builder.theme}/#{@name}/#{@metadata}.erb"
+        end
 
-    def latex book, builder
-     f = open template_path
-     erb = ERB.new f.read, nil, "-"
-     f.close
-     erb.result(binding)
-    end
+        def latex(book, builder)
+          f = open template_path
+          erb = ERB.new f.read, nil, '-'
+          f.close
+          erb.result(binding)
+        end
+      end
 
-   end
+      class CallImgPageLatexOp < CallLatexOp
+        dsl_accessor :topoffset, default: '0in'
+        dsl_accessor :leftoffset, default: '0in'
+        dsl_accessor :file
 
-   class CallImgPageLatexOp < CallLatexOp
-    dsl_accessor :topoffset, :default => "0in"
-    dsl_accessor :leftoffset, :default => "0in"
-    dsl_accessor :file
-
-    def latex book, builder
-     <<"EOS"
+        def latex(_book, _builder)
+          <<"EOS"
 \\enlargethispage{200truemm}%
 \\thispagestyle{empty}%
 \\vspace*{-1truein}
@@ -41,20 +41,20 @@ module Xpub
 \\includegraphics[width=\\paperheight,height=\\paperwidth]{#{file}}
 \\clearpage\n
 EOS
-    end
-   end
+        end
+      end
 
-   class CallEmptyPageLatexOp < CallLatexOp
-    dsl_accessor :no_page_number, :default => false
+      class CallEmptyPageLatexOp < CallLatexOp
+        dsl_accessor :no_page_number, default: false
 
-    def latex book, builder
-     (no_page_number ? "\\thispagestyle{empty}" : "")  + "　\\clearpage\n"
-    end
-   end
+        def latex(_book, _builder)
+          (no_page_number ? '\\thispagestyle{empty}' : '') + "　\\clearpage\n"
+        end
+      end
 
-   class CallInnerTitlePageLatexOp < CallLatexOp
-    def latex book, builder
-     <<"EOS"
+      class CallInnerTitlePageLatexOp < CallLatexOp
+        def latex(book, _builder)
+          <<"EOS"
 \\makeatletter
 {
 \\thispagestyle{empty}%
@@ -71,7 +71,7 @@ EOS
 \\end{center}
 \\vspace*{1.5cm}
 \\begin{center}
-{\\Large #{book.creators.map { |c| c.name }.join " "}}
+{\\Large #{book.creators.map(&:name).join ' '}}
 \\end{center}
 \\vspace*{1.5cm}
 \\begin{flushleft}
@@ -82,54 +82,43 @@ EOS
 }%
 \\makeatother
 EOS
-    end
-   end
+        end
+      end
 
-   def hyoushi_image_page name, &block
-    call = CallImgPageLatexOp.new name, @book, self
-    if block
-     call.instance_eval &block
-    end
-    call.validate
-    @hyoushi << call
-   end
+      def hyoushi_image_page(name, &block)
+        call = CallImgPageLatexOp.new name, @book, self
+        call.instance_eval(&block) if block
+        call.validate
+        @hyoushi << call
+      end
 
-   def hyoushi_empty_page name, &block
-    call = CallEmptyPageLatexOp.new name, @book, self
-    if block
-     call.instance_eval &block
-    end
-    call.validate
-    @hyoushi << call
-   end
+      def hyoushi_empty_page(name, &block)
+        call = CallEmptyPageLatexOp.new name, @book, self
+        call.instance_eval(&block) if block
+        call.validate
+        @hyoushi << call
+      end
 
-   def hyoushi_inner_title_page name, &block
-    call = CallInnerTitlePageLatexOp.new name, @book, self
-    if block
-     call.instance_eval &block
-    end
-    call.validate
-    @hyoushi << call
-   end
+      def hyoushi_inner_title_page(name, &block)
+        call = CallInnerTitlePageLatexOp.new name, @book, self
+        call.instance_eval(&block) if block
+        call.validate
+        @hyoushi << call
+      end
 
-   def urahyoushi_image_page name, &block
-    call = CallImgPageLatexOp.new name, @book, self
-    if block
-     call.instance_eval &block
-    end
-    call.validate
-    @urahyoushi << call
-   end
+      def urahyoushi_image_page(name, &block)
+        call = CallImgPageLatexOp.new name, @book, self
+        call.instance_eval(&block) if block
+        call.validate
+        @urahyoushi << call
+      end
 
-   def urahyoushi_empty_page name, &block
-    call = CallEmptyPageLatexOp.new name, @book, self
-    if block
-     call.instance_eval &block
+      def urahyoushi_empty_page(name, &block)
+        call = CallEmptyPageLatexOp.new name, @book, self
+        call.instance_eval(&block) if block
+        call.validate
+        @urahyoushi << call
+      end
     end
-    call.validate
-    @urahyoushi << call
-   end
-
   end
- end
 end

data/lib/xpub/dsl/src_file.rb

@@ -1,139 +1,119 @@
 module Xpub
- class CallBook
+  class CallBook
+    class CallSrcFile
+      attr_reader :file
 
-  class CallSrcFile
-   attr_reader :file
+      def initialize(file)
+        @file = file
+      end
 
-   def initialize file
-    @file = file
-   end
+      def full_path
+        "#{Dir.getwd}/src/#{@file}"
+      end
 
-   def full_path
-    "#{Dir::getwd}/src/#{@file}"
-   end
+      def validate
+        raise "File does not exist.#{full_path}" unless File.exist? full_path
+      end
 
-   def validate
-    if !File.exist? full_path
-     raise "File does not exist.#{full_path}"
+      def debug
+        p full_path
+      end
     end
-   end
 
-   def debug
-    p full_path
-   end
-  end
-
-  class CallMdFile < CallSrcFile
-   def initialize file
-    if !file.match "\.md$"
-     file = file + ".md"
+    class CallMdFile < CallSrcFile
+      def initialize(file)
+        file += '.md' unless file =~ /.md$/
+        super file
+      end
     end
-    super file
-   end
-  end
 
-  class CallImgFile < CallSrcFile
-   def validate
-    super
-    if !@file.match "\.(jpeg|jpg|png|bmp|pdf)$"
-     raise "Image File Ext is not Image Ext. #{@file}"
+    class CallImgFile < CallSrcFile
+      def validate
+        super
+        raise "Image File Ext is not Image Ext. #{@file}" unless @file =~ /.(jpeg|jpg|png|bmp|pdf)$/
+      end
     end
-   end
-  end
-
 
-  class CallImgFiles
-   attr_reader :dir
-
-   def initialize dir
-    @dir = dir
-   end
-
-   def full_path
-    "#{Dir::getwd}/src/#{@dir}"
-   end
-
-   def validate
-    if !Dir.exist? full_path
-     raise "Image Dir does not exist.#{full_path}"
+    class CallImgFiles
+      attr_reader :dir
+
+      def initialize(dir)
+        @dir = dir
+      end
+
+      def full_path
+        "#{Dir.getwd}/src/#{@dir}"
+      end
+
+      def validate
+        raise "Image Dir does not exist.#{full_path}" unless Dir.exist? full_path
+      end
+
+      def img_files
+        validate
+        Dir.glob("#{full_path}/**/*.{jpeg,jpg,png,bmp,pdf}").sort.map do |path|
+          img = CallImgFile.new path.sub(full_path + '/', '')
+          img.validate
+          img
+        end
+      end
     end
-   end
-
-   def img_files
-    validate
-    Dir.glob("#{full_path}/**/*.{jpeg,jpg,png,bmp,pdf}").sort.map { |path|
-     img = CallImgFile.new path.sub(full_path + "/", "")
-     img.validate
-     img
-    }
-   end
-  end
-
-  class CallMdFiles
-   attr_reader :dir
 
-   def initialize dir
-    @dir = dir
-   end
-
-   def full_path
-    "#{Dir::getwd}/src/#{@dir}"
-   end
-
-   def validate
-    if !Dir.exist? full_path
-     raise "Markdown Dir does not exist.#{full_path}"
+    class CallMdFiles
+      attr_reader :dir
+
+      def initialize(dir)
+        @dir = dir
+      end
+
+      def full_path
+        "#{Dir.getwd}/src/#{@dir}"
+      end
+
+      def validate
+        raise "Markdown Dir does not exist.#{full_path}" unless Dir.exist? full_path
+      end
+
+      def md_files
+        validate
+        Dir.glob("#{full_path}/**/*.md").sort.map do |path|
+          mf = CallMdFile.new path.sub("#{Dir.getwd}/src/", '')
+          mf.validate
+          mf
+        end
+      end
+
+      def debug
+        p full_path
+      end
     end
-   end
-
-   def md_files
-    validate
-    Dir.glob("#{full_path}/**/*.md").sort.map { |path|
-     mf = CallMdFile.new path.sub("#{Dir::getwd}/src/", "")
-     mf.validate
-     mf
-    }
-   end
-
-   def debug
-    p full_path
-   end
-  end
 
-  def md_file file, &block
-   call = CallMdFile.new file
-   if block
-    call.instance_eval &block
-   end
-   call.validate
-   @src_files << call
-  end
+    def md_file(file, &block)
+      call = CallMdFile.new file
+      call.instance_eval(&block) if block
+      call.validate
+      @src_files << call
+    end
 
-  def md_files dir, &block
-   call = CallMdFiles.new dir
-   if block
-    call.instance_eval &block
-   end
-   call.validate
-   @src_files.concat call.md_files
-  end
+    def md_files(dir, &block)
+      call = CallMdFiles.new dir
+      call.instance_eval(&block) if block
+      call.validate
+      @src_files.concat call.md_files
+    end
 
-  def img_file file, &block
-   call = CallImgFile.new file
-   if block
-    call.instance_eval &block
-   end
-   call.validate
-   @resource_files << call
-  end
+    def img_file(file, &block)
+      call = CallImgFile.new file
+      call.instance_eval(&block) if block
+      call.validate
+      @resource_files << call
+    end
 
-  def img_files dir, &block
-   call = CallImgFiles.new dir
-   if block
-    call.instance_eval &block
-   end
-   call.validate
-   @resource_files.concat call.img_files
+    def img_files(dir, &block)
+      call = CallImgFiles.new dir
+      call.instance_eval(&block) if block
+      call.validate
+      @resource_files.concat call.img_files
+    end
   end
- end
 end