ly-hotel 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21ff49c907096602f79746e2bddd55745f2b86c5
-  data.tar.gz: dec4b48e9c89cc94a16f8c6330628d340af7b01e
+  metadata.gz: dec119f6636cebb416ad71f2400949ec8cb8700b
+  data.tar.gz: 71cd2fd95772dbc6ad4a74222406036984f77758
 SHA512:
-  metadata.gz: 55b0c3143f592c4e9a205da85b2fa7f24fa397c2afef57fa111e07bfb88f08b5aa581e116a5b1d4c315228630f36c3fdd0cc0f87914b35338bfe4533c8ee2744
-  data.tar.gz: 5e2251346a5e0fb8cd3859028db23168f33ea3a863fd8963d32facda728775a94688d708ea4e3017b75346845922d0c5385aa31bfb369fcc99e1d12dac61018a
+  metadata.gz: 778303d1c3849082044a551a1e50f5bdd2986ea61cbe30510d30a675e79cd65085ccea84638fac007937ac57fe099cb5d1b7366e9b137a5cf4fdd28dcc3d1e2b
+  data.tar.gz: bba0640eb8ab946c47fb25e1d1eb08ebc8c188323c33caba6a055d175478b2e5fdc64f493635de3fa9db97e03d88bf6675b855766dc2d1e0efd72346021cc049

data/.travis.yml

@@ -2,4 +2,4 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.1
-before_install: gem install bundler -v 1.13.3
+before_install: gem install bundler -v 1.13.6

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in workspace.gemspec
+# Specify your gem's dependencies in ly-hotel.gemspec
 gemspec

data/README.md

@@ -32,10 +32,5 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/krzfyx8g/ly-hotel.git
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+Bug reports and pull requests are welcome on GitHub at https://github.com/krzfyx8g/ly-hotel.
 

data/lib/ly/hotel.rb

@@ -1,124 +1,71 @@
 require "ly/hotel/version"
-require "xmlsimple"
 require "digest/md5"
+require "active_support/core_ext/hash/conversions"
 require "uri"
 require "net/http"
-require "openssl"
-require "base64"
 
 module Ly
   module Hotel
     class Api
+      attr_accessor :req_xml
+      attr_accessor :resp_xml
+      
       def initialize(account_id, password, api_host, version = "20111128102912")
         @account_id = account_id
         @password = password
-        @version = version
         @api_host = api_host
-      end
-
-      def generate_digital_sign(service_name, req_time)
-        token_keys = {
-          "AccountID" => @account_id,
-          "ReqTime" => req_time,
-          "ServiceName" => service_name,
-          "Version" => @version
-        }
-        md5 = Digest::MD5.new
-        md5.update token_keys.map { |k, v| "#{k}=#{v}" }.join("&") << @password
-        md5.hexdigest
+        @version = version
       end
       
-      def generate_req_time
-        Time.now.getgm.getlocal("+08:00").strftime("%Y-%m-%d %H:%M:%S.%L")
-      end
-
-      def credit_card_encrypt(key, data)
-        cipher = OpenSSL::Cipher::AES.new(128, :ECB)
-        cipher.encrypt
-        cipher.key = key
-        Base64.encode64(cipher.update(data) << cipher.final)
-      end
-
-      def request_xml(service_name, body = {}, req_time = generate_req_time, digital_sign = generate_digital_sign(service_name, req_time), options = {})
-        req = {
+      def request(handler, service_name, body = {}, timeout = 7)
+        request = {
           "header" => {
             "version" => @version,
             "accountID" => @account_id,
             "serviceName" => service_name,
-            "digitalSign" => digital_sign,
+            "digitalSign" => digital_sign(service_name, req_time = req_time()),
             "reqTime" => req_time
           },
           "body" => body
         }
-        XmlSimple.xml_out(req, options)
-      end
-
-      def request(handler, req_xml, timeout = nil)
+        @req_xml = request.to_xml(root: 'request', indent: 0, skip_types: true)
         uri = URI.parse "%s/handlers/%sHandler.ashx" % [@api_host, handler]
-        res = Net::HTTP.start(uri.hostname, uri.port) do |http|
-          http.read_timeout = timeout
+        resp = Net::HTTP.start(uri.hostname, uri.port) do |http|
           req = Net::HTTP::Post.new(uri, "Content-Type" => "text/xml; charset=UTF-8")
-          req.body = req_xml
+          req.body = @req_xml
+          http.read_timeout = timeout
           http.request(req)
         end
-        res.body.force_encoding("UTF-8")
+        @resp_xml = resp.body.force_encoding("UTF-8")
+        response = Hash.from_xml(@resp_xml)
+        raise Error.new(response["response"]["header"]["rspDesc"], response["response"]["header"]["rspCode"]) unless response["response"]["header"]["rspCode"] == "0000"
+        response['response']['body']
       end
-
-      def service_request(handler, service_name, req_data = {}, req_options = {}, resp_options = {})
-        
-        # Current request time
-        req_time = generate_req_time
-        
-        # Generate digitalSign
-        digital_sign = generate_digital_sign(service_name, req_time)
-        
-        # Request & Response, Xml conversion options.
-        if req_options.empty? || resp_options.empty?
-          options = xml_options(handler, service_name)
-          req_options = options[0] if req_options.empty?
-          resp_options = options[1] if resp_options.empty?
-        end
-        
-        # Encrypted credit card information.
-        if "#{handler} #{service_name}" == "hotel/Order SubmitHotelOrder" && req_data.has_key?("creditCardInfo")
-          req_data["creditCardInfo"].each do |k, v|
-            req_data["creditCardInfo"][k] = credit_card_encrypt(digital_sign, v)
-          end
+      
+      private
+        def req_time(time = Time.now)
+          time.getgm.getlocal("+08:00").strftime("%Y-%m-%d %H:%M:%S.%L")
         end
         
-        # Request
-        req_xml = request_xml(service_name, req_data, req_time, digital_sign, req_options)
-        resp_xml = request(handler, req_xml)
-        result = XmlSimple.xml_in(resp_xml, resp_options)
-        
-        # Exception handling.
-        raise Error.new(result["header"]["rspDesc"], req_xml, resp_xml) unless result["header"]["rspCode"] == "0000"
-        
-        return result["body"], req_xml, resp_xml
-      end
-    
-      def xml_options(handler, service_name)
-        req_options = {"RootName" => "request", "AttrPrefix" => true, "SuppressEmpty" => nil, "NoIndent" => false}
-        resp_options = {"ForceArray" => false, "SuppressEmpty" => false}
-        puts "#{handler} #{service_name}"
-        case "#{handler} #{service_name}"
-          when "hotel/Order GetCardTypeList"
-            resp_options.merge!("GroupTags" => {"cardTypeList" => "cardType"})
-          when "hotel/Query GetHotelRoomsWithGuaranteePolicy"
-            resp_options.merge!("ForceArray" => %w(hotelRoomInfo pricePolicyInfo hotelBookPolicy), "GroupTags" => {"pricePolicyList" => "pricePolicyInfo", "hotelBookPolicyList" => "hotelBookPolicy"})
+        def digital_sign(service_name, req_time = req_time())
+          token = {
+            "AccountID" => @account_id,
+            "ReqTime" => req_time,
+            "ServiceName" => service_name,
+            "Version" => @version
+          }
+          md5 = Digest::MD5.new
+          md5.update token.map { |k, v| "#{k}=#{v}" }.join("&") << @password
+          md5.hexdigest
         end
-        return req_options, resp_options
-      end
     end
     
     class Error < StandardError
-      attr_reader :req_xml
-      attr_reader :resp_xml
-
-      def initialize(message, req_xml, resp_xml)
+      attr_reader :code
+      
+      def initialize(message, code = nil)
         super(message)
-        @req_xml = req_xml
-        @resp_xml = resp_xml
+        @code = code
       end
     end
   end

data/lib/ly/hotel/version.rb

@@ -1,5 +1,5 @@
 module Ly
   module Hotel
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
-end
+end

data/ly-hotel.gemspec

@@ -6,13 +6,12 @@ require 'ly/hotel/version'
 Gem::Specification.new do |spec|
   spec.name          = "ly-hotel"
   spec.version       = Ly::Hotel::VERSION
-  spec.authors       = ["UVzxV6cy"]
-  spec.email         = ["uvzxv6cy@emailsmail.com"]
+  spec.authors       = ["knc74jEs"]
+  spec.email         = ["knc74jes@emailsmail.com"]
 
-  spec.summary       = "Ly hotel API"
-  spec.description   = "This is a Ly hotel API"
-  spec.homepage      = "https://github.com/krzfyx8g/ly-hotel.git"
-  spec.license       = "MIT"
+  spec.summary       = %q{}
+  spec.description   = %q{LY.com hotel APIs}
+  spec.homepage      = "https://github.com/krzfyx8g/ly-hotel"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -33,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "xml-simple", "~> 1.1", ">= 1.1.5"
+  spec.add_development_dependency "rails", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ly-hotel
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
-- UVzxV6cy
+- knc74jEs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,28 +53,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: xml-simple
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.5
-description: This is a Ly hotel API
+        version: '5.0'
+description: LY.com hotel APIs
 email:
-- uvzxv6cy@emailsmail.com
+- knc74jes@emailsmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -82,7 +76,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
@@ -90,9 +83,8 @@ files:
 - lib/ly/hotel.rb
 - lib/ly/hotel/version.rb
 - ly-hotel.gemspec
-homepage: https://github.com/krzfyx8g/ly-hotel.git
-licenses:
-- MIT
+homepage: https://github.com/krzfyx8g/ly-hotel
+licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: 
@@ -114,5 +106,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Ly hotel API
+summary: ''
 test_files: []

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Kezeal
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.