gurunavi 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6157cc160f887a567fcba87e49ab4a3b8db3dc6a
-  data.tar.gz: 45608c71649ae0d18cde330d1dcbb5c7b179c1b0
+  metadata.gz: 206f37037571a8ecce7e25049890a65f71bb214c
+  data.tar.gz: 6b7dc6614f9e07c6dce0a249622ebb849343d7da
 SHA512:
-  metadata.gz: 12eed5fa3c35f337d71d22529c7dbb23616acdf0100b59328e6eea55def3c65a07b9a3c58ddbc24b2bbaf63ade7469e6c0064ed7c249e165335ae9813c1b40f0
-  data.tar.gz: b85974ef0060f919eaf4845394b541987fcf3e884dc4c3525269f2e0d075e0a24a36678a6538a95cdffc7945c90d66251f46925647e8f222e95bdaea1955d949
+  metadata.gz: 2617d4a5d7b735b7986fb422ab23b1094f8f485a398ccbe94e25000be6a695673cce5a695c5f427bcb9fd125d0fdd005e742639850975cab4248bf5525cd16b9
+  data.tar.gz: 181f27a19020536dd673a0ba235e184961e6b5bad2ac38875becff1bec9fe5d07e997adf2a46fa8621211aefa90a56243ac5cc1083b08434a6d15da74bfb3940

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/gurunavi.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: gurunavi 0.1.1 ruby lib
+# stub: gurunavi 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "gurunavi".freeze
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
     "test/fixtures/prefs/pref_search.json",
     "test/fixtures/rests/foreign_rest_search.json",
     "test/fixtures/rests/rest_search.json",
+    "test/fixtures/rests/rest_search_one_hit_case.json",
     "test/helper.rb",
     "test/test_area_codes.rb",
     "test/test_areas.rb",

data/lib/gurunavi/client.rb

@@ -78,6 +78,18 @@ module Gurunavi
       response_body
     end
 
+    # Helper method to wrap object into array.
+    #
+    # this use case is return a object for Gurunavi API when hit per page is 1.
+    def convert_to_array_if_needed(response_body)
+      unless response_body.instance_of?(Hashie::Array)
+        array = Hashie::Array.new
+        array.push(response_body)
+        return array
+      end
+      response_body
+    end
+
     private
 
       def default_headers

data/lib/gurunavi/rests.rb

@@ -1,3 +1,5 @@
+require 'hashie'
+
 module Gurunavi
   module Rests
 
@@ -6,7 +8,8 @@ module Gurunavi
       response = connection.get do |req|
         req.url "RestSearchAPI/#{@api_version}", options
       end
-      return_error_or_body(response, response.body.rest)
+      response_body = return_error_or_body(response, response.body.rest)
+      convert_to_array_if_needed(response_body)
     end
 
     # Ref: http://api.gnavi.co.jp/api/manual/foreignrestsearch/
@@ -14,8 +17,8 @@ module Gurunavi
       response = connection.get do |req|
         req.url "ForeignRestSearchAPI/#{@api_version}", options
       end
-      return_error_or_body(response, response.body.rest)
+      response_body = return_error_or_body(response, response.body.rest)
+      convert_to_array_if_needed(response_body)
     end
-
   end
 end

data/test/fixtures/rests/rest_search_one_hit_case.json

@@ -0,0 +1,99 @@
+{
+  "@attributes": {
+    "api_version": "20150630"
+  },
+  "total_hit_count": "41",
+  "hit_per_page": "10",
+  "page_offset": "5",
+  "rest": {
+    "@attributes": {
+      "order": "0"
+    },
+    "id": "5213224",
+    "update_date": "2015-08-28 05:35:19",
+    "name": "城門 ",
+    "name_kana": "ジョウモン",
+    "latitude": "36.038486",
+    "longitude": "140.105486",
+    "category": "ホルモン",
+    "url": "http://r.gnavi.co.jp/8ncn7swe0000/?ak=SUQUyeTkNn9iEGa%2FQ4Hr8VjHYUU2FXMOQv7k9OMxwi0%3D",
+    "url_mobile": "http://mobile.gnavi.co.jp/shop/5213224/?ak=SUQUyeTkNn9iEGa%2FQ4Hr8VjHYUU2FXMOQv7k9OMxwi0%3D",
+    "coupon_url": {
+      "pc": {},
+      "mobile": {}
+    },
+    "image_url": {
+      "shop_image1": {},
+      "shop_image2": {},
+      "qrcode": "https://c-r.gnst.jp/tool/qr/?id=5213224&q=6"
+    },
+    "address": "〒305-0853 茨城県つくば市榎戸370-2 ",
+    "tel": "029-838-1600",
+    "tel_sub": {},
+    "fax": {},
+    "opentime": {},
+    "holiday": {},
+    "access": {
+      "line": {},
+      "station": {},
+      "station_exit": {},
+      "walk": {},
+      "note": {}
+    },
+    "parking_lots": {},
+    "pr": {
+      "pr_short": {},
+      "pr_long": {}
+    },
+    "code": {
+      "areacode": "AREA110",
+      "areaname": "関東",
+      "prefcode": "PREF08",
+      "prefname": "茨城県",
+      "areacode_s": "AREAS2820",
+      "areaname_s": "その他つくば",
+      "category_code_l": [
+        "RSFST05000",
+        {
+          "@attributes": {
+            "order": "1"
+          }
+        }
+      ],
+      "category_name_l": [
+        "焼肉・ホルモン",
+        {
+          "@attributes": {
+            "order": "1"
+          }
+        }
+      ],
+      "category_code_s": [
+        "RSFST05002",
+        {
+          "@attributes": {
+            "order": "1"
+          }
+        }
+      ],
+      "category_name_s": [
+        "ホルモン",
+        {
+          "@attributes": {
+            "order": "1"
+          }
+        }
+      ]
+    },
+    "budget": {},
+    "party": {},
+    "lunch": {},
+    "credit_card": {},
+    "e_money": {},
+    "flags": {
+      "mobile_site": "1",
+      "mobile_coupon": "0",
+      "pc_coupon": "0"
+    }
+  }
+}

data/test/test_rests.rb

@@ -13,6 +13,16 @@ class TestGurunavi < Test::Unit::TestCase
       rests.count.should == 10
     end
 
+    should "fetch results type is HashieArray when searching from rest search api with one hit case" do
+      stub_get("https://api.gnavi.co.jp/RestSearchAPI/20150630?format=json&keyid=#{@client.keyid}", "rests/rest_search_one_hit_case.json")
+      rests = @client.rest_search
+
+      rests.count.should == 1
+      rests.each do |rest|
+        rest.id.should == "5213224"
+      end
+    end
+
     should "fetch results when searching from foeign rest search api with hit_per_page options" do
       stub_get("https://api.gnavi.co.jp/ForeignRestSearchAPI/20150630?format=json&hit_per_page=10&keyid=#{@client.keyid}", "rests/foreign_rest_search.json")
       rests = @client.foreign_rest_search(hit_per_page: 10)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gurunavi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - kobayang
@@ -236,6 +236,7 @@ files:
 - test/fixtures/prefs/pref_search.json
 - test/fixtures/rests/foreign_rest_search.json
 - test/fixtures/rests/rest_search.json
+- test/fixtures/rests/rest_search_one_hit_case.json
 - test/helper.rb
 - test/test_area_codes.rb
 - test/test_areas.rb