nissen-collect 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQ3Y2QxZTU2ZGZhOTE0ZWQwNTg2ODI5Njc5MDI2MGMzNDBiMDZkNA==
+    NzQ5ZTI4ZDYxODk3NGY3NGY1ODRiMjUxY2U3NjMyZmJhZjdlOTYxZA==
   data.tar.gz: !binary |-
-    ZTkyODBkMTRmZDA1MzFmNjJlZTUyMjExMDdiNzYxOTYwMWQzNTM1NA==
+    MTNhNzIwNDU0OWZhMWI0NTc0NGZkNThlNGQ3OTRhZjRjOGJjZmQ0Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2I2NWVmY2Q1ODIwZWY5NDA1ZGI0NmMyZGU4NjAwYWUzNjIxNzIyM2JjZWM4
-    ZDg1ZGMyZjJhMjE4YjhiNThiMDBlNWE1NzUyYTRhYmJjZTRiMTNkNzM5ODkx
-    ZGJlMWJkZmFhZjc5YmI2ODJiNzJlZmUzZDg1MTg5MmQ0ZTUzZGE=
+    MjEyNDYxZDhmODJiYWQ1YTEzNzdmM2Q3ZmJlZTFiZWE1YThlMjQ5MzBjYjNl
+    MDYxNmEzNjE4ZDYzM2E0ZDU0NmQxNTU2MzkzZDQ0Yzg1ZDFmMTgxYjNjMjhm
+    ZmZlMjJlNDhlZjFiZWFmYjhjYjUyMDAyMmUxZTg2MWIxMmU1MDM=
   data.tar.gz: !binary |-
-    NjlmZjA5ZWYxYzM1MGRhZDI2NDMwYmVjOTljZTUwODQxZGMzNTMzMGU5ZDg3
-    MGNhMmIzMzMwNDFkNGI2M2JkZWQ1NGIwYzk3YTY4OTNkMzFiYWEyMTE4ODkw
-    M2Y2ZWRlMTA1YjUzNWJiNGM2MDk3Mzg3MTM2OTgyZjMzY2QyMDM=
+    M2I3ZjJlNmI3YmUxYTdkMTNkN2E0MDAwZTI1YmIwOTg0MWFhNGIzM2Q1YTRm
+    NzNhYjc1ZmU4NGIwYWY3YTVhYzNmYTBhYjc1Y2RhYWJmODY0MTEyNDRkMTIy
+    YTM5OTBlNGY3Njg1MjVkNWQxY2E3NjU3Y2IwYTgwMmQxMmIwOTQ=

data/lib/nissen-collect/action.rb

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+module NissenCollect
+
+  class Action
+
+    # 環境変数を設定する
+    def initialize
+      @@shopInfo = {
+        :shopInfo=>{
+          :shopCode=> ENV['NISSEN_COLLECT_SHOPCODE'],
+          :shopPassword=> ENV['NISSEN_COLLECT_PASSWORD'],
+          :terminalId=> ENV['NISSEN_COLLECT_TERMINALID']
+        }
+      }
+    end
+
+  end
+
+end

data/lib/nissen-collect/body/deliveries.yml

@@ -2,20 +2,20 @@
 deliveries:
   delivery:
     deliveryCustomer:
-    fullName:
-    firstName:
-    lastName:
-    fullKanaName:
-    firstKanaName:
-    lastKanaName:
-    zipCode:
-    address1:
-    address2:
-    address3:
-    companyName:
-    departmentName:
-    tel:
-    email:
+      fullName:
+      firstName:
+      lastName:
+      fullKanaName:
+      firstKanaName:
+      lastKanaName:
+      zipCode:
+      address1:
+      address2:
+      address3:
+      companyName:
+      departmentName:
+      tel:
+      email:
   details:
     detail:
       detailId:

data/lib/nissen-collect/cancel.rb

@@ -1,20 +1,22 @@
 # -*- encoding: utf-8 -*-
 module NissenCollect
 
-  class Cancel
-    attr_accessor :body
+  class Cancel < Action
+    attr_accessor :transaction
     @@transaction_path = 'direct/autocancel.do'
 
     # @bodyを初期化する
     # @param [Hash] body 生成時引数
-    def initialize body=nil
-      @body = body ? body : [SHOPINFO,TRANSACTION].inject {|union,hash| union.merge hash}
+    def initialize
+      super
+      @transaction = TRANSACTION
     end
 
     # APIコールを行う
     def call
+      body = [@@shopInfo,@transaction].inject {|union,hash| union.merge hash}
       connect = NissenCollect::Client.new
-      connect.request('get',@@transaction_path,@body)
+      connect.request('get',@@transaction_path,body)
     end
 
   end

data/lib/nissen-collect/getauthor.rb

@@ -1,20 +1,22 @@
 # -*- encoding: utf-8 -*-
 module NissenCollect
 
-  class Getauthor
-    attr_accessor :body
+  class Getauthor < Action
+    attr_accessor :buyer
     @@transaction_path = 'direct/autogetauthor.do'
 
     # @bodyを初期化する
     # @param [Hash] body 生成時引数
-    def initialize body=nil
-      @body = body ? body : [SHOPINFO,BUYER].inject {|union,hash| union.merge hash}
+    def initialize
+      super
+      @buyer = BUYER
     end
 
     # APIコールを行う
     def call
+      body = [@@shopInfo,@buyer].inject {|union,hash| union.merge hash}
       connect = NissenCollect::Client.new
-      connect.request('get',@@transaction_path,@body)
+      connect.request('get',@@transaction_path,body)
     end
 
   end

data/lib/nissen-collect/modifytransaction.rb

@@ -1,20 +1,23 @@
 # -*- encoding: utf-8 -*-
 module NissenCollect
 
-  class Modifytransaction
-    attr_accessor :body
+  class Modifytransaction < Action
+    attr_accessor :buyer,:deliveries
     @@transaction_path = 'direct/automodifytransaction.do'
 
     # @bodyを初期化する
     # @param [Hash] body 生成時引数
-    def initialize body=nil
-      @body = body ? body : [SHOPINFO,BUYER,DELIVERIES].inject {|union,hash| union.merge hash}
+    def initialize
+      super
+      @buyer = BUYER
+      @deliveries = DELIVERIES
     end
 
     # APIコールを行う
     def call
+      body = [@@shopInfo,@buyer,@deliveries].inject {|union,hash| union.merge hash}
       connect = NissenCollect::Client.new
-      connect.request('get',@@transaction_path,@body)
+      connect.request('get',@@transaction_path,body)
     end
 
   end

data/lib/nissen-collect/pdrequest.rb

@@ -1,20 +1,23 @@
 # -*- encoding: utf-8 -*-
 module NissenCollect
 
-  class Pdrequest
-    attr_accessor :body
+  class Pdrequest < Action
+    attr_accessor :transaction,:pdrequest
     @@transaction_path = 'direct/autotransaction.do'
 
     # @bodyを初期化する
     # @param [Hash] body 生成時引数
-    def initialize body=nil
-      @body = body ? body : [SHOPINFO,TRANSACTION,PDREQUEST].inject {|union,hash| union.merge hash}
+    def initialize
+      super
+      @transaction = TRANSACTION
+      @pdrequest = PDREQUEST
     end
 
     # APIコールを行う
     def call
+      body = [@@shopInfo,@transaction,@pdrequest].inject {|union,hash| union.merge hash}
       connect = NissenCollect::Client.new
-      connect.request('get',@@transaction_path,@body)
+      connect.request('get',@@transaction_path,body)
     end
 
   end

data/lib/nissen-collect/transaction.rb

@@ -1,20 +1,24 @@
 # -*- encoding: utf-8 -*-
 module NissenCollect
 
-  class Transaction
-    attr_accessor :body
+  class Transaction < Action
+    attr_accessor :httpInfo,:buyer,:deliveries
     @@transaction_path = 'direct/autotransaction.do'
 
     # @bodyを初期化する
     # @param [Hash] body 生成時引数
-    def initialize body=nil
-      @body = body ? body : [SHOPINFO,HTTPINFO,BUYER,DELIVERIES].inject {|union,hash| union.merge hash}
+    def initialize
+      super
+      @httpInfo = HTTPINFO
+      @buyer = BUYER
+      @deliveries = DELIVERIES
     end
 
     # APIコールを行う
     def call
+      body = [@@shopInfo,@httpInfo,@buyer,@deliveries].inject {|union,hash| union.merge hash}
       connect = NissenCollect::Client.new
-      connect.request('get',@@transaction_path,@body)
+      connect.request('get',@@transaction_path,body)
     end
 
   end

data/lib/nissen-collect/version.rb

@@ -1,4 +1,4 @@
 module NissenCollect
   # nissen-collect version
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/nissen-collect.rb

@@ -4,6 +4,7 @@ require 'faraday'
 require 'active_support/core_ext'
 require 'erb'
 require 'nissen-collect/version'
+require 'nissen-collect/action.rb'
 require 'nissen-collect/transaction.rb'
 require 'nissen-collect/getauthor.rb'
 require 'nissen-collect/modifytransaction.rb'
@@ -13,7 +14,6 @@ require 'nissen-collect/cancel.rb'
 # nissen collect APIwrapper
 module NissenCollect
   ROOT_HOST = 'https://collect-operation.nissen.co.jp/'
-  SHOPINFO = HashWithIndifferentAccess.new(YAML.load(ERB.new(File.read(File.expand_path('../nissen-collect/body/shopInfo.yml',__FILE__))).result))
   HTTPINFO = HashWithIndifferentAccess.new(YAML.load_file(File.expand_path('../nissen-collect/body/httpInfo.yml', __FILE__)))
   BUYER = HashWithIndifferentAccess.new(YAML.load_file(File.expand_path('../nissen-collect/body/buyer.yml', __FILE__)))
   DELIVERIES = HashWithIndifferentAccess.new(YAML.load_file(File.expand_path('../nissen-collect/body/deliveries.yml', __FILE__)))
@@ -51,10 +51,6 @@ module NissenCollect
     def request method, target_path, params
       request_setup = request_setup(target_path, params.to_xml(root:'request'))
       connection.send(method.to_sym, &request_setup).env
-      rescue Faraday::Error::ClientError
-        raise Twitter::Error::ClientError
-      rescue JSON::ParserError
-        raise Twitter::Error::ParserError
     end
   end
 

data/nissen-collect.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
   gem.add_development_dependency 'rspec', '~> 2.4'
-  gem.add_development_dependency 'yard', '~> 0.8'
+  gem.add_development_dependency 'yard', '>= 0.8'
   gem.add_dependency 'faraday', '~> 0.8'
-  gem.add_dependency 'activesupport', '~> 3.0'
+  gem.add_dependency 'activesupport', '>= 3.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nissen-collect
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - yu1ch1
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
@@ -42,14 +42,14 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
@@ -70,14 +70,14 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 description: transaction,getauthor,modifytransaction,pdrequest,cancel
@@ -99,11 +99,11 @@ files:
 - README.rdoc
 - Rakefile
 - lib/nissen-collect.rb
+- lib/nissen-collect/action.rb
 - lib/nissen-collect/body/PdRequest.yml
 - lib/nissen-collect/body/buyer.yml
 - lib/nissen-collect/body/deliveries.yml
 - lib/nissen-collect/body/httpInfo.yml
-- lib/nissen-collect/body/shopInfo.yml
 - lib/nissen-collect/body/transaction.yml
 - lib/nissen-collect/cancel.rb
 - lib/nissen-collect/getauthor.rb

data/lib/nissen-collect/body/shopInfo.yml

@@ -1,5 +0,0 @@
-#注文情報登録API リクエストパラメータ
-shopInfo:
-  shopCode: <%= ENV['NISSEN_COLLECT_SHOPCODE'] %>
-  shopPassword: <%= ENV['NISSEN_COLLECT_PASSWORD'] %>
-  terminalId: <%= ENV['NISSEN_COLLECT_TERMINALID'] %>