hamidashi 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a767e6d490ad96dfc9c40f3f89686dfd9e52361
-  data.tar.gz: 444bec65a0b05297c2faddf32175cef233c9e265
+  metadata.gz: a54739c578438bb92798c9a9013558814ae8bab8
+  data.tar.gz: 16a9cbaaba7112a9884bd44dc2cae7bd66e16192
 SHA512:
-  metadata.gz: 5e6c06b86b4e4cd05ae2f2e9325103061645671594a1ce3e2a482b1d7d137b861b54ac067523c6a27ff9b423006bfc15a9fa43be67bd4b2ef0f17fa71b5147f7
-  data.tar.gz: 209c92e74c6fe93a428377f7641ce7c35ccd0e6d7da5da153c42b5844c692544529f449e1cbdf8b9b1ee41a596bac7b68410c3553057c0992a24c983baec3c2b
+  metadata.gz: c411396049bb39b3307a50e0c2af21591084fdfea7a853d89cf3da635d2f4e46f935ea6d13554b82e340171e294b50c7b3e813c1e6b3f92dabe22c3f60740fb9
+  data.tar.gz: 5b9b038f11aabf3eb66dcd97272576c7d44ec0d72085916d46102fbf00b8552f4cd4a7721d64429dcfab3a3c6c3b6c7b4eaf4038e4cc8acd109deea78023c629

data/exe/hamidashi

@@ -19,7 +19,7 @@ Options:
   -h --help          Show this screen.
   --version          Show version.
   --page=<page>      Show specified page [default: 10].
-  --margin=<margin>  Right margin percentage [default: 4.375].
+  --margin=<margin>  Right margin [default: 4.375%].
 DOCOPT
 
 begin
@@ -39,7 +39,14 @@ if opt['--version']
 end
 
 pdf_path  = File.expand_path(opt['<name>'])
-hamidashi = Hamidashi.new(Rational(opt['--margin']), pdf_path)
+
+unless /\A[\d.]+(%|px|)\z/ =~ opt['--margin']
+  puts "margin #{opt['--margin']} is invalid."
+  puts 'example: 42% or 42px or 42'
+  exit 1
+end
+
+hamidashi = Hamidashi.new(opt['--margin'], pdf_path)
 
 if opt['preview']
   preview_path = File.expand_path("hamidashi-preview-#{Time.now.strftime("%Y%m%d%H%M%S")}-" + File.basename(pdf_path, '.pdf') + "-#{opt['--page']}.png")

data/lib/hamidashi.rb

@@ -1,12 +1,10 @@
 require "hamidashi/version"
-require "RMagick"
+require "rmagick"
 
 class Hamidashi
-  attr_reader :percentage
-
-  def initialize(percentage, pdf_path)
-    @percentage = percentage / 100r
-    @pdf_path   = pdf_path
+  def initialize(margin, pdf_path)
+    @margin   = margin
+    @pdf_path = pdf_path
   end
 
   def overflow?(page)
@@ -59,12 +57,26 @@ class Hamidashi
     1
   end
 
+  def fixed_margin?
+    @margin.end_with?('px')
+  end
+
+  def margin_px
+    @margin_width ||= Integer(@margin.sub('px', ''))
+  end
+
+  def margin_percentage
+    @margin_percentage ||= Rational(@margin.sub('%', '')) / 100
+  end
+
   def pdf_image_list
     @pdf_image_list ||= Magick::ImageList.new(@pdf_path)
   end
 
   def right_margin_width(page)
+    return margin_px if fixed_margin?
+
     page_img = pdf_image_list[page]
-    (page_img.columns * percentage).to_i
+    (page_img.columns * margin_percentage).to_i
   end
 end

data/lib/hamidashi/version.rb

@@ -1,3 +1,3 @@
 class Hamidashi
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamidashi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Seiei Miyagi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt