rqrcode_png_bin 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d8b25f22649cad03bed2e0f29707bf991912827
-  data.tar.gz: a5025faa9e43d92d5d6ccaa20271df1cda94b735
+  metadata.gz: bb970ba18e7c0c2d194a661f91c5b18be86f9b9f
+  data.tar.gz: aec91a7e72a9e9b0c9d35ff1f38e72ee4b9afd95
 SHA512:
-  metadata.gz: 89311896686672e9570234011c54ed1a1da183207939cdd7b2d45c8b10f6aadfc1829c4225c42275b2c4c9776178ed46dcd66913a6cddf3173d1a8f9aa1a3f2c
-  data.tar.gz: 30fa3402075dad4fe69ddd2b3390a50b3db4df885bcaa499e64a76b9b870dbc200aeaa8b7b5be047cb98ef4ad238001dd015000f45df612c255aac6256fceed6
+  metadata.gz: e1ce4c77f9c5f6f3f40c1be2848546e41af9319cd2152bf855927557d78ab15815ce77e277fd4dd0e0aefcae0a453ecac8ea3fd90f1a624159cfad15df645cd3
+  data.tar.gz: 78dd22051997a54305d70dc1e5b65c1ae7c9ec1984b6ccc862b405fd0b5bdf83ad237f63b9bacf18334d6e8cfa6077c8e611071ce5965ffd2c4219f6e256eebf

data/lib/rqrcode_png_bin/app.rb

@@ -5,15 +5,18 @@ module RqrcodePngBin
     def initialize(argv = [])
       @argv   = argv
 
+      @border_modules = 4
       @canvas = nil
       @file   = nil
       @level  = :m
+      @mode   = nil
+      @px_per_module = nil
       @size   = 4
       @stdin  = nil
 
       parser.parse!(@argv)
     end
-    attr_reader :canvas, :file, :level, :size, :stdin
+    attr_reader :border_modules, :canvas, :file, :level, :mode, :px_per_module, :size, :stdin
 
     def run
       if file
@@ -30,10 +33,7 @@ module RqrcodePngBin
     end
 
     def generate_png(str)
-      options = {}
-      options[:size] = canvas.first if canvas
-
-      RQRCode::QRCode.new(encoded_str(str), opts).as_png(options)
+      RQRCode::QRCode.new(encoded_str(str), opts).as_png(png_opts)
     end
 
     def encoded_str(str)
@@ -60,6 +60,20 @@ module RqrcodePngBin
         :size  => @size,
         :level => @level
       }
+
+      h[:mode] = @mode if @mode
+
+      h
+    end
+
+    def png_opts
+      h = {}
+
+      h[:size]           = canvas if canvas
+      h[:border_modules] = border_modules
+      h[:module_px_size] = px_per_module  if px_per_module
+
+      h
     end
 
     #
@@ -70,13 +84,18 @@ module RqrcodePngBin
         opt.version = VERSION
         opt.banner  = "Usage: rqrcode_png [option] string"
 
-        opt.on('-c', '--canvas CANVAS (ex 200x200)') {|v|
-          re = %r{\A([0-9]+)x([0-9]+)\z}
-
-          if v =~ re
-            @canvas = [$1.to_i, $2.to_i]
+        opt.on('-b', '--border-modules BORDER') {|v|
+          if v =~ /\A[0-9]+\z/
+            @border_modules = v.to_i
+          else
+            raise ArgumentError, "option border modules should be integer"
+          end
+        }
+        opt.on('-c', '--canvas CANVAS (ex 200)') {|v|
+          if v =~ /\A[0-9]+\z/
+            @canvas = v.to_i
           else
-            raise ArgumentError, "option canvas should match #{re}"
+            raise ArgumentError, "option canvas should match be integer"
           end
         }
         opt.on('-f', '--from-file FILE') {|v|
@@ -86,7 +105,7 @@ module RqrcodePngBin
             raise ArgumentError, "file you specified '#{v}' does not exist"
           end
         }
-        opt.on('-l', '--level LEVEL (default m)') {|v|
+        opt.on('-l', '--level l|m|q|h (default m)') {|v|
           options = %w(l m q h)
 
           if options.include?(v)
@@ -95,6 +114,22 @@ module RqrcodePngBin
             raise ArgumentError, "option level should be included #{options}"
           end
         }
+        opt.on('-m', '--mode MODE') {|v|
+          options = %w(number alphanumeric byte_8bit)
+
+          if options.include?(v)
+            @mode = v.to_sym
+          else
+            raise ArgumentError, "option mode should be included #{options}"
+          end
+        }
+        opt.on('-p', '--pixels-per-module PIXELS') {|v|
+          if v =~ /\A[0-9]+\z/
+            @px_per_module = v.to_i
+          else
+            raise ArgumentError, "option pixels per module should be integer"
+          end
+        }
         opt.on('-s', '--size SIZE (default 4)') {|v|
           re = %r{\A[0-9]+\z}
 

data/lib/rqrcode_png_bin/version.rb

@@ -1,3 +1,3 @@
 module RqrcodePngBin
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/spec/app_spec.rb

@@ -7,6 +7,23 @@ describe RqrcodePngBin::App do
   end
 
   describe '#parser' do
+    context 'border modules' do
+      context 'nil' do
+        it {
+          expect(app.border_modules).to be(4)
+        }
+      end
+      context '4' do
+        it {
+          expect(app(%w(-b 4)).border_modules).to be(4)
+        }
+      end
+      context 'a' do
+        it {
+          expect {app(%w(-b a)).border_modules}.to raise_error(ArgumentError)
+        }
+      end
+    end
     context 'canvas' do
       context 'nil' do
         it {
@@ -15,7 +32,7 @@ describe RqrcodePngBin::App do
       end
       context '200x200' do
         it {
-          expect(app(%w(-c 200x200)).canvas).to be == [200, 200]
+          expect(app(%w(-c 200)).canvas).to be(200)
         }
       end
       context 'abc' do
@@ -58,6 +75,40 @@ describe RqrcodePngBin::App do
         }
       end
     end
+    context 'mode' do
+      context 'nil' do
+        it {
+          expect(app.mode).to be_nil
+        }
+      end
+      context 'number' do
+        it {
+          expect(app(%w(-m number)).mode).to be(:number)
+        }
+      end
+      context 'foo' do
+        it {
+          expect {app(%w(-m foo))}.to raise_error(ArgumentError)
+        }
+      end
+    end
+    context 'px_per_module' do
+      context 'nil' do
+        it {
+          expect(app.px_per_module).to be_nil
+        }
+      end
+      context '10' do
+        it {
+          expect(app(%w(-p 10)).px_per_module).to be(10)
+        }
+      end
+      context 'a' do
+        it {
+          expect {app(%w(-p a))}.to raise_error(ArgumentError)
+        }
+      end
+    end
     context 'size' do
       context 'nil' do
         it {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode_png_bin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - wtnabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rqrcode