xpub 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0473ad049dd7ed21f6e235d01ba2e757dac48024
-  data.tar.gz: 5374e57d851d2cc78ea0163cb8d35f9ccffd4764
+  metadata.gz: a579ef8c6e7e9d5466e33a3e546a291693e5aed5
+  data.tar.gz: c75ed4a1328a969cee318b099dbd740352945cdb
 SHA512:
-  metadata.gz: 2ea2c19e1063fb7ce9c212d8278b24943104556fbf900a049d008f0071be06ffbaa65a1d6eb0d9139e0d30a78ddaca99237a75aa05af3da85e53293a64b4ab01
-  data.tar.gz: b7d83bbcb73294392cb820066e0675a3a2965df3a25a2e583c96bc48e2fb2f93f497bf315b9907d4ef86e74010eeeac620baf6b191fafc68a1f82c7aba00fcd2
+  metadata.gz: c1777154097204b47f7245fd25c03660876b2b91340784a8f9062dbd7d8f31af208d7a0a4ec20894c8c50aa17e943cc301e0894ddac0c545aaf75e457a3807ad
+  data.tar.gz: c872d2c9b36364f3192da333ec505d37aeead02b0addfda7700cf4422583111cc3e824d3aa8a7be1aec7153b59ce97231dd47734063ecccac64bfd31684d3480

data/README.md

@@ -113,7 +113,7 @@ $ xpub book -v
 コマンドラインの実行結果を結果にかかわらず詳細に出力します。
 
 ```
-$ xpub book --pandoc-json-output 
+$ xpub book --pandoc-json-output
 ```
 
 pandocのjsonオブジェクトをtmpフォルダに生成します。デバック用です。
@@ -168,7 +168,7 @@ Xpub::book "sample" do
   latex_builder "latex" do
     documentclass "utbook"
     classoption "11pt"
-    classoption "twocolumn" 
+    classoption "twocolumn"
     classoption "twoside"
     classoption "a5j"
     # prepartname "第"
@@ -181,24 +181,24 @@ Xpub::book "sample" do
     # filter "pandoc-filter.rb"
 
     hyoushi_image_page "h01" do
-	  file "sample1.jpg"
-	  topoffset "-0.8mm"
-	  leftoffset "2.1mm"
+      file "sample1.jpg"
+      topoffset "-0.8mm"
+      leftoffset "2.1mm"
     end
     hyoushi_empty_page "h02" do
-	  no_page_number
+      no_page_number true
     end
     hyoushi_inner_title_page "title"
     urahyoushi_empty_page "h03" do
-	  no_page_number
+      no_page_number true
     end
     urahyoushi_image_page "h04" do#
-	  file "sample1.jpg"
-	  topoffset "-0.8mm"
-	  leftoffset "-5mm"
+      file "sample1.jpg"
+      topoffset "-0.8mm"
+      leftoffset "-5mm"
     end
   end
-  
+
   epub_builder "epub" do
     cover_image "sample1.jpg"
   end
@@ -209,13 +209,13 @@ end
 
 本ツールのMarkdownの形式は現在のところpandocの読み込み形式に従います。
 
-EPUB出力では下記のオプションが与えられた物として動作します。 
+EPUB出力では下記のオプションが与えられた物として動作します。
 
 ```
 markdown_phpextra+hard_line_breaks+raw_html
 ```
 
-PDF出力では下記のオプションが与えられた物として動作します。 
+PDF出力では下記のオプションが与えられた物として動作します。
 
 ```
 markdown_phpextra+hard_line_breaks+raw_tex

data/bin/xpub

@@ -11,7 +11,6 @@ require 'shellwords'
 require 'erb'
 require 'time'
 require 'singleton'
-require 'dsl_accessor'
 require 'levenshtein'
 
 require 'xpub/version.rb'
@@ -45,6 +44,7 @@ end
 $:.unshift "#{curDir}/lib"
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
+require "xpub/dsl_accessor"
 require "xpub/dsl/book"
 require "xpub/dsl/src_file"
 require "xpub/dsl/builder"
@@ -81,4 +81,3 @@ else
  puts opt.help
  exit
 end
-

data/lib/xpub/dsl/book.rb

@@ -2,18 +2,18 @@ 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
+  dsl_accessor :title, :default => "UNTITLED"
+  dsl_accessor :subtitle
+  dsl_accessor :short
+  dsl_accessor :collection
+  dsl_accessor :edition
+  dsl_accessor :extended
+  dsl_accessor :publisher
+  dsl_accessor :rights
+  dsl_accessor :publication
+  dsl_accessor :modification
+  dsl_accessor :lang, :default => "ja"
+  dsl_accessor :description
 
   def initialize name
    @name = name
@@ -31,7 +31,7 @@ module Xpub
 
   def build option
    puts "build #{@name} book.".color :green
-   @builders.each { |b| 
+   @builders.each { |b|
     if !option[:builder] || option[:builder] == b.name
      b.build option
     end
@@ -40,7 +40,7 @@ module Xpub
 
   def check option
    puts "check #{@name} book.".color :green
-   @checkers.each { |c| 
+   @checkers.each { |c|
     if !option[:checker] || option[:checker] == c.name
      c.check option
     end
@@ -49,7 +49,7 @@ module Xpub
 
   class CallAuthor
    attr_reader :name
-   dsl_accessor :role, :instance=>true
+   dsl_accessor :role
 
    def initialize name
     @name = name
@@ -79,8 +79,8 @@ module Xpub
 
   class CallIdentifier
    attr_reader :identifier
-   dsl_accessor :scheme, :instance=>true
-   dsl_accessor :type_value, :instance=>true
+   dsl_accessor :scheme
+   dsl_accessor :type_value
 
    def initialize identifier
     @identifier = identifier

data/lib/xpub/dsl/builder.rb

@@ -2,8 +2,8 @@ module Xpub
  class CallBook
   class CallBuilder
    attr_reader :name
-   dsl_accessor :theme, :instance=>true, :default => "default"
-   dsl_accessor :output, :instance=>true
+   dsl_accessor :theme, :default => "default"
+   dsl_accessor :output
 
    def initialize name, book
     @name = name
@@ -33,7 +33,7 @@ module Xpub
    end
 
    def copy_to_tmp files
-    files.each { |file| 
+    files.each { |file|
      pn = Pathname.new tmp_path(file.file)
      FileUtils.mkdir_p(pn.dirname) unless FileTest.exist?(pn.dirname)
 
@@ -62,13 +62,13 @@ 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"
+   dsl_accessor :template, :default => "template.html"
+   dsl_accessor :filter, :default => "pandoc-filter.rb"
+   dsl_accessor :stylesheet, :default => "epub.css"
+   dsl_accessor :metadata, :default => "metadata.dat"
+   dsl_accessor :page_progression_direction, :default => "rtl"
+   dsl_accessor :cover_image
+   dsl_accessor :pandoc_cmd, :default => "pandoc"
 
    def initialize name, book
     @vars = []
@@ -146,7 +146,7 @@ module Xpub
      metadata_option
     ]
     if cover_image
-     option << "--epub-cover-image=" + src_path(cover_image) 
+     option << "--epub-cover-image=" + src_path(cover_image)
     end
     option
    end
@@ -173,12 +173,12 @@ module Xpub
   end
 
   class CallLatexBuilder < CallBuilder
-   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"
+   dsl_accessor :template, :default => "template.tex"
+   dsl_accessor :filter, :default => "pandoc-filter.rb"
+   dsl_accessor :extractbb_cmd, :default => "extractbb"
+   dsl_accessor :pandoc_cmd, :default => "pandoc"
+   dsl_accessor :latex_cmd, :default => "uplatex"
+   dsl_accessor :dvipdfm_cmd, :default => "dvipdfmx"
 
    def initialize name, book
     @vars = []

data/lib/xpub/dsl/checker.rb

@@ -1,6 +1,7 @@
 module Xpub
- class CallBook 
+ class CallBook
   class CallChecker
+   
    def initialize name, book
     @name = name
     @book = book
@@ -11,9 +12,9 @@ module Xpub
 
    def _check option, pattern
     words = {}
-    @book.src_files.each do |file| 
+    @book.src_files.each do |file|
      f = open file.full_path
-     f.each_with_index do |line, index| 
+     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) }
@@ -25,10 +26,10 @@ module Xpub
      f.close
     end
 
-    words.sort.each do |word, infos| 
+    words.sort.each do |word, infos|
      if word
       puts word.color :red
-      infos.each { |info| 
+      infos.each { |info|
        puts "  #{info[:file]}(#{info[:line]})"
       }
      end

data/lib/xpub/dsl/page.rb

@@ -2,6 +2,7 @@ module Xpub
  class CallBook
   class CallLatexBuilder
    class CallLatexOp
+
     def initialize name, book, builder
      @name = name
      @book = book
@@ -24,9 +25,9 @@ module Xpub
    end
 
    class CallImgPageLatexOp < CallLatexOp
-    dsl_accessor :topoffset, :instance=>true, :default => "0in"
-    dsl_accessor :leftoffset, :instance=>true, :default => "0in"
-    dsl_accessor :file, :instance=>true
+    dsl_accessor :topoffset, :default => "0in"
+    dsl_accessor :leftoffset, :default => "0in"
+    dsl_accessor :file
 
     def latex book, builder
      <<"EOS"
@@ -44,7 +45,7 @@ EOS
    end
 
    class CallEmptyPageLatexOp < CallLatexOp
-    dsl_accessor :no_page_number, :instance=>true, :default => false
+    dsl_accessor :no_page_number, :default => false
 
     def latex book, builder
      (no_page_number ? "\\thispagestyle{empty}" : "")  + "　\\clearpage\n"

data/lib/xpub/dsl_accessor.rb

@@ -0,0 +1,20 @@
+module Xpub
+  module DslAccessor
+    def dsl_accessor(name, *arg)
+      define_method("#{name}") do |*iarg|
+        if iarg.empty?
+          if !instance_variable_defined?("@#{name}") && arg[0] && arg[0][:default]
+            instance_variable_set("@#{name}", arg[0][:default])
+          end
+          instance_variable_get("@#{name}")
+        else
+          instance_variable_set("@#{name}", iarg[0])
+        end
+      end
+    end
+  end
+end
+
+class Class
+  include Xpub::DslAccessor
+end

data/lib/xpub/version.rb

@@ -1,3 +1,3 @@
 module Xpub
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/skel/Xpub

@@ -31,7 +31,7 @@ Xpub::book "sample" do
   latex_builder "latex" do
     documentclass "utbook"
     classoption "11pt"
-    classoption "twocolumn" 
+    classoption "twocolumn"
     classoption "twoside"
     classoption "a5j"
     # prepartname "第"
@@ -42,26 +42,26 @@ Xpub::book "sample" do
     # theme "default"
     # template "template.tex"
     # filter "pandoc-filter.rb"
-
+    
     hyoushi_image_page "h01" do
-	  file "sample1.jpg"
-	  topoffset "-0.8mm"
-	  leftoffset "2.1mm"
+      file "sample1.jpg"
+      topoffset "-0.8mm"
+      leftoffset "2.1mm"
     end
     hyoushi_empty_page "h02" do
-	  no_page_number
+      no_page_number true
     end
     hyoushi_inner_title_page "title"
     urahyoushi_empty_page "h03" do
-	  no_page_number
+      no_page_number true
     end
     urahyoushi_image_page "h04" do#
-	  file "sample1.jpg"
-	  topoffset "-0.8mm"
-	  leftoffset "-5mm"
+      file "sample1.jpg"
+      topoffset "-0.8mm"
+      leftoffset "-5mm"
     end
   end
-  
+
   epub_builder "epub" do
     cover_image "sample1.jpg"
   end

data/xpub.gemspec

@@ -22,5 +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'
+  spec.add_dependency 'levenshtein','~> 0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xpub
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Yoshihisa AMAKATA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: dsl_accessor
+  name: levenshtein
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.2.2
 description: Xpub is EPUB and PDF publisher.
 email:
 - amakata@gmail.com
@@ -86,6 +86,7 @@ files:
 - lib/xpub/dsl/checker.rb
 - lib/xpub/dsl/page.rb
 - lib/xpub/dsl/src_file.rb
+- lib/xpub/dsl_accessor.rb
 - lib/xpub/version.rb
 - skel/.gitignore
 - skel/Xpub