rqrcode_png_bin 0.0.2 → 0.1.0

data/lib/rqrcode_png_bin/app.rb

@@ -1,5 +1,4 @@
 require "optparse"
-require "nkf"
 
 module RqrcodePngBin
   class App
@@ -10,10 +9,11 @@ module RqrcodePngBin
       @file   = nil
       @level  = :m
       @size   = 4
+      @stdin  = nil
 
       parser.parse!(@argv)
     end
-    attr_reader :canvas, :file, :level, :size
+    attr_reader :canvas, :file, :level, :size, :stdin
 
     def run
       if file
@@ -30,17 +30,26 @@ module RqrcodePngBin
     end
 
     def generate_png(str)
-      png = RQRCode::QRCode.new(str, opts).to_img
+      png = RQRCode::QRCode.new(encoded_str(str), opts).to_img
       png = png.resize(*canvas) if canvas
 
       png
     end
 
+    def encoded_str(str)
+      str.encode('SJIS').force_encoding('ASCII-8BIT')
+    end
+
     #
     # [return] String
     #
     def str
-      str = @argv.first
+      if @argv.first
+        @argv.first
+      else
+        @stdin ||= $stdin.gets
+        stdin if stdin.size > 0
+      end
     end
 
     #

data/lib/rqrcode_png_bin/file_reader.rb

@@ -1,9 +1,7 @@
-require "cgi"
-
 module RqrcodePngBin
   class FileReader
     def initialize(file)
-      @file = open(file)
+      @file = open(file, 'r:utf-8')
       @pat  = %r{\A([^\t]+)(?:\t([^\t]+))?\z}
 
       @str  = nil
@@ -16,7 +14,7 @@ module RqrcodePngBin
     def each(&block)
       @file.each_line {|line|
         split!(line.chomp)
-        block.call(@str, @dest)
+        block.call(@str, @dest) if @str and @dest
       }
     end
 
@@ -27,7 +25,7 @@ module RqrcodePngBin
       @pat =~ line
 
       @str  = $1
-      @dest = $2 ? $2 : "#{CGI.escape($1)}.png"
+      @dest = $2 ? $2 : "#{$1.gsub(/\//, '%2F')}.png" if $1
     end
   end
 end

data/lib/rqrcode_png_bin/version.rb

@@ -1,3 +1,3 @@
 module RqrcodePngBin
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/file_reader_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 describe RqrcodePngBin::FileReader do
@@ -12,6 +13,17 @@ describe RqrcodePngBin::FileReader do
       reader.instance_variable_get('@dest')
     }
 
+    context 'empty' do
+      before {
+        reader.split!('')
+      }
+      context '@str' do
+        it { expect(str).to be_nil }
+      end
+      context '@dest' do
+        it { expect(dest).to be_nil }
+      end
+    end
     context 'only string without escape' do
       before {
         reader.split!('abc')
@@ -31,7 +43,7 @@ describe RqrcodePngBin::FileReader do
         it { expect(str).to be == 'http://github.com' }
       end
       context '@dest' do
-        it { expect(dest).to be == 'http%3A%2F%2Fgithub.com.png' }
+        it { expect(dest).to be == 'http:%2F%2Fgithub.com.png' }
       end
     end
     context 'string with filename' do
@@ -45,5 +57,16 @@ describe RqrcodePngBin::FileReader do
         it { expect(dest).to be == 'filename' }
       end
     end
+    context 'japanese string' do
+      before {
+        reader.split!("日本/語")
+      }
+      context '@str' do
+        it { expect(str).to be == '日本/語' }
+      end
+      context '@dest' do
+        it { expect(dest).to be == '日本%2F語.png' }
+      end
+    end
   end
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode_png_bin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - wtnabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-01 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rqrcode_png
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,29 +46,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: command line interface for rqrcode_png
@@ -94,26 +103,33 @@ files:
 homepage: https://github.com/wtnabe/rqrcode_png_bin
 licenses:
 - BSD
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1476981731966827747
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1476981731966827747
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: command line interface for rqrcode_png
 test_files:
 - spec/app_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 3af632bfe45808e81abd4c88cfb19cd0cc842e87
-  data.tar.gz: 49e8deddb8c9236ab199df2fb99de0d51b852b3c
-SHA512:
-  metadata.gz: 25fb3ed536294faaab8a92c736cc0bfad2843721ffb35643862ebed21857b9aceafeefa349e52ef672d7c273320a2b2c84238c4730bb78725724692848a45f92
-  data.tar.gz: df4057489ee9c0673b231bec9935b72ed3b0daf2c551f1c20c36fcdb69972263aced58090ef3b88f5eec28ec81c008d65e42326088d126e076fc0e099cae7283