justimmo_client 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3c0287a3d5ad70f78d68e3a1ab8b749af95c2b2
-  data.tar.gz: 9da6e21aa9e182aa670ffc7e6c6d50819efbc007
+  metadata.gz: 4af966499684afea9e28c2dacb01816d618c4fe3
+  data.tar.gz: 77b692e3404c61651985609698a80ab77867fa17
 SHA512:
-  metadata.gz: 8df8d3e790b0ebcfe9060f55fe551547bdb490e964202a1fbbfb64e2500ae0a0505cde9c938655d145592749587a20f961872f580867101849a6da820ca6ebc8
-  data.tar.gz: 2065f47036e1b8f821141250611b2c70a7820dc637da6b92036b9e823b06580ef413f7584209da235d2ecbb701e14280e0fbd7d91898ba1b77cf03ee2479a55b
+  metadata.gz: 43f05f744a4496eb025f13e65f1993052c3c7e8e5cebc9fe7dfbaa6ec5497ec6e4bd34a0dca35aeb7dd73d357ce5c518e641998467968128c55966e9c211e21c
+  data.tar.gz: '0385a7d9afde08ada26e6f1aa8576765fecd46f19b903eef3e0ab09f2a84bcca15c2b15a170e685b391c4ca08430ca30c7a8d175f9c146380882fabdacaa6bcd'

data/lib/justimmo_client/api/v1/models/country.rb

@@ -16,24 +16,44 @@ module JustimmoClient::V1
     # @!group Instance Method Summary
 
     def initialize(**options)
-      @country = find_country(options[:name])
-      return unless @country
-      options.update(name: @country.name, alpha2: @country.alpha2, alpha3: @country.alpha3)
       super(options)
+      find_country(options[:name])
+      find_country(options[:alpha3])
+      find_country(options[:alpha2])
+      @name   = @country&.name
+      @alpha3 = @country&.alpha3
+      @alpha2 = @country&.alpha2
     end
 
     def alpha2=(code)
-      @alpha2 ||= @country.alpha2
+      find_country(code)
+      @alpha2 ||= @country&.alpha2
     end
 
     def alpha3=(code)
-      @alpha3 ||= @country.alpha3
+      find_country(code)
+      @alpha3 ||= @country&.alpha3
+    end
+
+    def name=(country_name)
+      find_country(country_name)
+      @name ||= @country&.name
     end
 
     def to_s
       name
     end
 
+    def to_h
+      attributes
+    end
+
+    def to_json(options = nil)
+      to_h.to_json(options)
+    end
+
+    alias as_json to_json
+
     def inspect
       "#<#{self.class} #{self}>"
     end
@@ -41,11 +61,14 @@ module JustimmoClient::V1
     private
 
     def find_country(name_or_code)
-      if name_or_code.size <= 3
-        IsoCountryCodes.find(name_or_code)
-      else
-        IsoCountryCodes.search_by_name(name_or_code)
-      end
+      return if name_or_code.nil?
+
+      @country ||=
+        if name_or_code.size <= 3
+          IsoCountryCodes.find(name_or_code)
+        else
+          IsoCountryCodes.search_by_name(name_or_code).first
+        end
     rescue IsoCountryCodes::UnknownCodeError
       nil
     end

data/lib/justimmo_client/api/v1/models/geo_location.rb

@@ -20,8 +20,12 @@ module JustimmoClient::V1
 
     # @!group Instance Method Summary
 
-    def country=(name)
-      @country = Country.new(name: name)
+    def country=(code)
+      @country = Country.new(alpha3: code)
+    end
+
+    def country
+      @country&.alpha3
     end
 
     def floor=(flr)

data/lib/justimmo_client/api/v1/representers/json/country_representer.rb

@@ -6,6 +6,7 @@ module JustimmoClient::V1
       property :id
       property :alpha2
       property :alpha3
+      property :name
 
       collection_representer class: Country
     end

data/lib/justimmo_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JustimmoClient
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: justimmo_client
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Patrick Auernig