netprint 0.1.1 → 0.3.4

data/spec/netprint/agent_spec.rb

@@ -7,59 +7,130 @@ describe Agent do
   before do
     @agent = Agent.new('user_id', 'password')
 
-    stub_request(:get, 'https://www.printing.ne.jp/cgi-bin/mn.cgi?i=user_id&p=password').
-      to_return(open(File.expand_path(File.dirname(__FILE__) + '/../list.html')).read)
+    stub_request(:get, 'https://www.printing.ne.jp/usr/web/NPCM0010.seam').
+      to_return(read_fixture_file('login.html'))
+
+    stub_request(:post, 'https://www.printing.ne.jp/usr/web/NPCM0010.seam').
+      with(body: {
+             'NPCM0010' => 'NPCM0010',
+             'NPCM0010:login-btn' => 'ログイン',
+             'NPCM0010:userIdOrMailads-txt' => 'user_id',
+             'NPCM0010:password-pwd' => 'password',
+             'controlParamKey' => 'foo',
+             'javax.faces.ViewState' => 'bar'
+           }
+          ).
+      to_return(read_fixture_file('list_empty.html'))
   end
 
-  it 'should login' do
-    @agent.should_not be_login
+  it 'logins' do
+    expect(@agent).not_to be_login
 
     @agent.login
 
-    @agent.should be_login
+    expect(@agent).to be_login
   end
 
   shared_examples_for '#upload' do
-    it 'should upload' do
-      stub_request(:get, 'https://www.printing.ne.jp/cgi-bin/mn.cgi?c=0&m=1&s=qwertyuiopoiuytrewq').
-        to_return(open(File.expand_path(File.dirname(__FILE__) + '/../upload.html')).read)
-      stub_request(:post, 'https://www.printing.ne.jp/cgi-bin/mn.cgi?c=0&m=1&s=qwertyuiopoiuytrewq').
-        to_return(open(File.expand_path(File.dirname(__FILE__) + '/../list.html')).read)
-      stub_request(:get, 'https://www.printing.ne.jp/cgi-bin/mn.cgi?c=0&m=0&s=qwertyuiopoiuytrewq').
-        to_return(open(File.expand_path(File.dirname(__FILE__) + '/../list.html')).read)
+    it 'uploads' do
+      stub_request(:post, 'https://www.printing.ne.jp/usr/web/auth/NPFL0010.seam').
+        with(body: {
+               'NPFL0010' => 'NPFL0010',
+               'display-max-rows' => '10',
+               'create-document' => '',
+               'controlParamKey' => 'xxx',
+               'javax.faces.ViewState' => 'yyy'
+             }
+            ).
+        to_return(read_fixture_file('upload.html'))
+
+      stub_request(:post, 'https://www.printing.ne.jp/usr/web/auth/NPFL0020.seam').
+        to_return(read_fixture_file('list_processing.html'))
+
+      stub_request(:post, 'https://www.printing.ne.jp/usr/web/auth/NPFL0010.seam').
+        with(body: {
+               'NPFL0010' => 'NPFL0010',
+               'display-max-rows' => '10',
+               'reload' => '',
+               'controlParamKey' => 'xxx',
+               'javax.faces.ViewState' => 'yyy'
+             }
+            ).
+        to_return(read_fixture_file('list_processed.html'))
 
       filename = File.expand_path(pdf_filename)
       @agent.login
 
       code = @agent.upload(filename)
-      code.should match(/^[0-9A-Z]{8}$/)
+      expect(code).to match(/^[0-9A-Z]{8}$/)
     end
 
-    it 'should handle registration error' do
-      stub_request(:get, 'https://www.printing.ne.jp/cgi-bin/mn.cgi?c=0&m=1&s=qwertyuiopoiuytrewq').
-        to_return(open(File.expand_path(File.dirname(__FILE__) + '/../upload.html')).read)
-      stub_request(:post, 'https://www.printing.ne.jp/cgi-bin/mn.cgi?c=0&m=1&s=qwertyuiopoiuytrewq').
-        to_return(open(File.expand_path(File.dirname(__FILE__) + '/../list.html')).read)
-      stub_request(:get, 'https://www.printing.ne.jp/cgi-bin/mn.cgi?c=0&m=0&s=qwertyuiopoiuytrewq').
-        to_return(open(File.expand_path(File.dirname(__FILE__) + '/../error.html')).read)
+    it 'handles registration error' do
+      stub_request(:post, 'https://www.printing.ne.jp/usr/web/auth/NPFL0010.seam').
+        with(body: {
+               'NPFL0010' => 'NPFL0010',
+               'display-max-rows' => '10',
+               'create-document' => '',
+               'controlParamKey' => 'xxx',
+               'javax.faces.ViewState' => 'yyy'
+             }
+            ).
+        to_return(read_fixture_file('upload.html'))
+
+      stub_request(:post, 'https://www.printing.ne.jp/usr/web/auth/NPFL0020.seam').
+        to_return(read_fixture_file('list_processing.html'))
+
+      stub_request(:post, 'https://www.printing.ne.jp/usr/web/auth/NPFL0010.seam').
+        with(body: {
+               'NPFL0010' => 'NPFL0010',
+               'display-max-rows' => '10',
+               'reload' => '',
+               'controlParamKey' => 'xxx',
+               'javax.faces.ViewState' => 'yyy'
+             }
+            ).
+        to_return(read_fixture_file('list_error.html'))
 
       filename = File.expand_path(pdf_filename)
       @agent.login
 
-      lambda {
+      expect {
         @agent.upload(filename)
-      }.should raise_error(RegistrationError)
+      }.to raise_error(RegistrationError)
+    end
+
+    it 'handles upload error' do
+      stub_request(:post, 'https://www.printing.ne.jp/usr/web/auth/NPFL0010.seam').
+        with(body: {
+               'NPFL0010' => 'NPFL0010',
+               'display-max-rows' => '10',
+               'create-document' => '',
+               'controlParamKey' => 'xxx',
+               'javax.faces.ViewState' => 'yyy'
+             }
+            ).
+        to_return(read_fixture_file('upload.html'))
+
+      stub_request(:post, 'https://www.printing.ne.jp/usr/web/auth/NPFL0020.seam').
+        to_return(read_fixture_file('upload_error.html'))
+
+      filename = File.expand_path(pdf_filename)
+      @agent.login
+
+      expect {
+        @agent.upload(filename)
+      }.to raise_error(UploadError, 'error message')
     end
   end
 
   context 'filename is ASCII only' do
-    let(:pdf_filename) { File.dirname(__FILE__) + '/../foo.pdf' }
+    let(:pdf_filename) { fixture_file('foo.pdf') }
 
     it_should_behave_like '#upload'
   end
 
   context 'filename has non-ASCII characters' do
-    let(:pdf_filename) { File.dirname(__FILE__) + '/../あいうえお.pdf' }
+    let(:pdf_filename) { fixture_file('あいうえお.pdf') }
 
     it_should_behave_like '#upload'
   end

data/spec/netprint/options_spec.rb

@@ -13,13 +13,13 @@ describe Options do
     context 'default' do
       it do
         form = Object.new
-        form.should be_checked('papersize',    PAPERSIZE::A4)
-        form.should be_checked('color',        COLOR::BW)
-        form.should be_checked('number',       CODE_TYPE::ALNUM)
-        form.should be_checked('secretcodesw', '0')
-        form.should be_checked('mailsw',       '0')
+        expect(form).to be_checked('yus-size', PAPERSIZE::A4)
+        expect(form).to be_checked('iro-cl', COLOR::BW)
+        expect(form).to be_checked('yyk-type-cl', CODE_TYPE::ALNUM)
+        expect(form).to be_checked('pin-num-set-fl', '0')
+        expect(form).to be_checked('notice-onoff', '0')
 
-        form.should_not_receive(:[]=)
+        expect(form).not_to receive(:[]=)
 
         subject.apply(form)
       end
@@ -30,13 +30,13 @@ describe Options do
 
       it do
         form = Object.new
-        form.should be_checked('papersize',    PAPERSIZE::A4)
-        form.should be_checked('color',        COLOR::BW)
-        form.should be_checked('number',       CODE_TYPE::ALNUM)
-        form.should be_checked('secretcodesw', '1')
-        form.should be_checked('mailsw',       '0')
+        expect(form).to be_checked('yus-size', PAPERSIZE::A4)
+        expect(form).to be_checked('iro-cl', COLOR::BW)
+        expect(form).to be_checked('yyk-type-cl', CODE_TYPE::ALNUM)
+        expect(form).to be_checked('pin-num-set-fl', '1')
+        expect(form).to be_checked('notice-onoff', '0')
 
-        form.should_receive(:[]=).with('secretcode', '0123')
+        expect(form).to receive(:[]=).with('pin-no', '0123')
 
         subject.apply(form)
       end
@@ -47,13 +47,13 @@ describe Options do
 
       it do
         form = Object.new
-        form.should be_checked('papersize',    PAPERSIZE::A4)
-        form.should be_checked('color',        COLOR::BW)
-        form.should be_checked('number',       CODE_TYPE::ALNUM)
-        form.should be_checked('secretcodesw', '0')
-        form.should be_checked('mailsw',       '1')
+        expect(form).to be_checked('yus-size', PAPERSIZE::A4)
+        expect(form).to be_checked('iro-cl', COLOR::BW)
+        expect(form).to be_checked('yyk-type-cl', CODE_TYPE::ALNUM)
+        expect(form).to be_checked('pin-num-set-fl', '0')
+        expect(form).to be_checked('notice-onoff', '1')
 
-        form.should_receive(:[]=).with('mailaddr', 'test@example.com')
+        expect(form).to receive(:[]=).with('mail-adr-to-tx', 'test@example.com')
 
         subject.apply(form)
       end
@@ -64,13 +64,13 @@ describe Options do
 
       it do
         form = Object.new
-        form.should be_checked('papersize',    PAPERSIZE::B4)
-        form.should be_checked('color',        COLOR::BW)
-        form.should be_checked('number',       CODE_TYPE::ALNUM)
-        form.should be_checked('secretcodesw', '0')
-        form.should be_checked('mailsw',       '0')
+        expect(form).to be_checked('yus-size', PAPERSIZE::B4)
+        expect(form).to be_checked('iro-cl', COLOR::BW)
+        expect(form).to be_checked('yyk-type-cl', CODE_TYPE::ALNUM)
+        expect(form).to be_checked('pin-num-set-fl', '0')
+        expect(form).to be_checked('notice-onoff', '0')
 
-        form.should_not_receive(:[]=)
+        expect(form).not_to receive(:[]=)
 
         subject.apply(form)
       end
@@ -81,13 +81,13 @@ describe Options do
 
       it do
         form = Object.new
-        form.should be_checked('papersize',    PAPERSIZE::A4)
-        form.should be_checked('color',        COLOR::COLOR)
-        form.should be_checked('number',       CODE_TYPE::ALNUM)
-        form.should be_checked('secretcodesw', '0')
-        form.should be_checked('mailsw',       '0')
+        expect(form).to be_checked('yus-size', PAPERSIZE::A4)
+        expect(form).to be_checked('iro-cl', COLOR::COLOR)
+        expect(form).to be_checked('yyk-type-cl', CODE_TYPE::ALNUM)
+        expect(form).to be_checked('pin-num-set-fl', '0')
+        expect(form).to be_checked('notice-onoff', '0')
 
-        form.should_not_receive(:[]=)
+        expect(form).not_to receive(:[]=)
 
         subject.apply(form)
       end
@@ -98,13 +98,13 @@ describe Options do
 
       it do
         form = Object.new
-        form.should be_checked('papersize',    PAPERSIZE::A4)
-        form.should be_checked('color',        COLOR::BW)
-        form.should be_checked('number',       CODE_TYPE::NUM)
-        form.should be_checked('secretcodesw', '0')
-        form.should be_checked('mailsw',       '0')
+        expect(form).to be_checked('yus-size', PAPERSIZE::A4)
+        expect(form).to be_checked('iro-cl', COLOR::BW)
+        expect(form).to be_checked('yyk-type-cl', CODE_TYPE::NUM)
+        expect(form).to be_checked('pin-num-set-fl', '0')
+        expect(form).to be_checked('notice-onoff', '0')
 
-        form.should_not_receive(:[]=)
+        expect(form).not_to receive(:[]=)
 
         subject.apply(form)
       end
@@ -123,14 +123,14 @@ describe Options do
 
       it do
         form = Object.new
-        form.should be_checked('papersize',    PAPERSIZE::B5)
-        form.should be_checked('color',        COLOR::SELECT_WHEN_PRINT)
-        form.should be_checked('number',       CODE_TYPE::NUM)
-        form.should be_checked('secretcodesw', '1')
-        form.should be_checked('mailsw',       '1')
-
-        form.should_receive(:[]=).with('secretcode', '0987')
-        form.should_receive(:[]=).with('mailaddr',   'foo@example.com')
+        expect(form).to be_checked('yus-size', PAPERSIZE::B5)
+        expect(form).to be_checked('iro-cl', COLOR::SELECT_WHEN_PRINT)
+        expect(form).to be_checked('yyk-type-cl', CODE_TYPE::NUM)
+        expect(form).to be_checked('pin-num-set-fl', '1')
+        expect(form).to be_checked('notice-onoff', '1')
+
+        expect(form).to receive(:[]=).with('pin-no', '0987')
+        expect(form).to receive(:[]=).with('mail-adr-to-tx',   'foo@example.com')
 
         subject.apply(form)
       end

data/spec/spec_helper.rb

@@ -9,7 +9,6 @@ require 'webmock/rspec'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -18,13 +17,21 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  def fixture_file(name)
+    File.expand_path(File.dirname(__FILE__) + '/fixtures/' + name)
+  end
+
+  def read_fixture_file(name)
+    open(fixture_file(name)).read
+  end
 end
 
 RSpec::Matchers.define :be_checked do |name, value|
   match do |form|
     radiobutton = Object.new
-    radiobutton.should_receive(:check)
+    expect(radiobutton).to receive(:check)
 
-    form.should_receive(:radiobutton_with).with(:name => name, :value => value).and_return(radiobutton)
+    expect(form).to receive(:radiobutton_with).with(:name => name, :value => value).and_return(radiobutton)
   end
 end

metadata

@@ -1,84 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: netprint
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.3.4
 platform: ruby
 authors:
 - youpy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.9.0
 - !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: netprint
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: webmock
   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: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,41 +62,22 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
-- !ruby/object:Gem::Dependency
-  name: addressable
-  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: docopt
   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'
 description: A library to upload file to netprint
@@ -131,8 +88,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -143,55 +101,52 @@ files:
 - lib/netprint/constants.rb
 - lib/netprint/error.rb
 - lib/netprint/options.rb
-- lib/netprint/url.rb
 - lib/netprint/version.rb
 - netprint.gemspec
-- spec/error.html
-- spec/foo.pdf
-- spec/list.html
+- spec/fixtures/foo.pdf
+- spec/fixtures/list_empty.html
+- spec/fixtures/list_error.html
+- spec/fixtures/list_processed.html
+- spec/fixtures/list_processing.html
+- spec/fixtures/login.html
+- spec/fixtures/upload.html
+- spec/fixtures/upload_error.html
+- spec/fixtures/あいうえお.pdf
 - spec/netprint/agent_spec.rb
 - spec/netprint/options_spec.rb
-- spec/netprint/url_spec.rb
 - spec/spec_helper.rb
-- spec/upload.html
-- spec/あいうえお.pdf
 homepage: ''
 licenses: []
+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: -3601402640496916733
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3601402640496916733
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library to upload file to netprint
 test_files:
-- spec/error.html
-- spec/foo.pdf
-- spec/list.html
+- spec/fixtures/foo.pdf
+- spec/fixtures/list_empty.html
+- spec/fixtures/list_error.html
+- spec/fixtures/list_processed.html
+- spec/fixtures/list_processing.html
+- spec/fixtures/login.html
+- spec/fixtures/upload.html
+- spec/fixtures/upload_error.html
+- spec/fixtures/あいうえお.pdf
 - spec/netprint/agent_spec.rb
 - spec/netprint/options_spec.rb
-- spec/netprint/url_spec.rb
 - spec/spec_helper.rb
-- spec/upload.html
-- spec/あいうえお.pdf