justimmo_client 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d91fd1ec8ab9bb56ad3aa5f310447739f072c5e
-  data.tar.gz: 95f6f01ca3c687af8436dba6f26d389a73e830f2
+  metadata.gz: 9cfd5491bed0810ae55db2737e4b792c04966d6f
+  data.tar.gz: 5b3560ac4d3c240c33db62ab5812139bb4ac27b5
 SHA512:
-  metadata.gz: 6d35db0035a7f905558190aa9e03d06ff75ab7e83661ac26c602aa89a3ae3798d417431f4c55faf401b9dfb9f128bfb85912a2179482c8c2062f7dabbe894554
-  data.tar.gz: 06daf92f1fcfe2b70f983ccc071a94322260ee5407aa97f1570a7a704bd3f02683232879dc66d73c268a17fdccb9d7f17065166c99ff788398c01658b4b01d11
+  metadata.gz: e57be8e672d31c7ba436234bff8524baaa893ec69a0c60994c4a2da78fb5e8886c4088ee0aac2cf55a2c2fdad1e8e48d4ff0185222c302a0647d53ad44390c6c
+  data.tar.gz: 508c6a5368a493d5b463f2c472c99f909d1c5a8bc8de4daa80237bd90f6c8fb1c213b2a10e9eeff2a108df5029e864c897f3bf4527336c87c70357006c053c6d

data/.simplecov

@@ -0,0 +1,10 @@
+SimpleCov.start do
+  add_filter "/bin/"
+  add_filter "/cache/"
+  add_filter "/examples/"
+  add_filter "/spec/"
+  add_group "V1/Models",       "lib/justimmo_client/api/v1/models"
+  add_group "V1/Representers", "lib/justimmo_client/api/v1/representers"
+  add_group "V1/Requests",     "lib/justimmo_client/api/v1/requests"
+  add_group "V1/Interfaces",   "lib/justimmo_client/api/v1/interfaces"
+end

data/lib/justimmo_client/api/v1/interfaces/justimmo_interface.rb

@@ -4,6 +4,7 @@ module JustimmoClient::V1
   module JustimmoInterface
     include JustimmoClient::Caching
     include JustimmoClient::Logging
+    include JustimmoClient::API
 
     def cache_key(endpoint, params = {})
       key = Digest::SHA256.new

data/lib/justimmo_client/api/v1/interfaces/realty_interface.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "nokogiri"
 
 module JustimmoClient::V1
   # Public realty query interface
@@ -64,9 +65,10 @@ module JustimmoClient::V1
           representer(:realty, :json).for_collection.new([]).from_json(cached)
         end,
         on_miss: -> do
-          model = Struct.new(:realties).new
-          xml_response = request(:realty).list(options)
-          represented = representer(:realty_list).new(model).from_xml(xml_response).realties
+          doc = Nokogiri::XML(request(:realty).list(options))
+          doc.at_css("query-result").remove
+          xml_response = doc.to_xml
+          represented = representer(:realty).for_collection.new([]).from_xml(xml_response)
           new_cache = representer(:realty, :json).for_collection.new(represented).to_json
           [represented, new_cache]
         end
@@ -84,8 +86,7 @@ module JustimmoClient::V1
         end,
         on_miss: -> do
           xml_response = request(:realty).detail(id, lang: lang)
-          model = Struct.new(:realty).new
-          represented = representer(:realty_detail).new(model).from_xml(xml_response).realty
+          represented = representer(:realty).for_collection.new([]).from_xml(xml_response).first
           new_cache = representer(:realty, :json).new(represented).to_json
           [represented, new_cache]
         end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "uri"
+
+module JustimmoClient::V1
+  class Attachment < JustimmoBase
+    BASE_URL = "https://files.justimmo.at/public"
+
+    private_constant :BASE_URL
+
+    attribute :category, Symbol
+    attribute :origin,   Symbol
+    attribute :title,    String
+    attribute :format,   String
+    attribute :type,     String
+    attribute :file,     String
+
+    def url=(value)
+      path = URI.parse(value).path.sub("/public/", "")
+      @type, size, file = path.split("/")
+      @format ||= ::File.extname(file).tr(".", "")
+      @file = ::File.basename(file, ".#{@format}")
+      @size = size.start_with?("user") ? :user_big : :big
+    end
+
+    def url(size = nil)
+      size ||= @size
+      "#{BASE_URL}/#{@type}/#{size}/#{file}.#{format}"
+    end
+
+    alias to_s url
+    alias [] url
+
+    def inspect
+      "#<#{self.class} #{self}>"
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module JustimmoClient::V1
 
     # @!macro [attach] attribute
     #   @return [$2]
-    attribute :id, Integer
+    attribute :id,               Integer
     attribute :country_id,       Integer
     attribute :region_id,        Integer
     attribute :zip_code,         Integer

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

@@ -9,36 +9,45 @@ module JustimmoClient::V1
     # @!macro [attach] attribute
     #   @return [$2]
     attribute :id,     Integer
-    attribute :alpha2, String
-    attribute :alpha3, String
+    attribute :alpha2, String, default: ""
+    attribute :alpha3, String, default: ""
+    attribute :name,   String, default: ""
 
     # @!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)
-      @country = nil
     end
 
     def alpha2=(code)
-      @country ||= IsoCountryCodes.find(code)
       @alpha2 ||= @country.alpha2
     end
 
     def alpha3=(code)
-      @country ||= IsoCountryCodes.find(code)
       @alpha3 ||= @country.alpha3
     end
 
-    def name
-      @country&.name
-    end
-
     def to_s
-      @country&.name || ""
+      name
     end
 
     def inspect
       "#<#{self.class} #{self}>"
     end
+
+    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
+    rescue IsoCountryCodes::UnknownCodeError
+      nil
+    end
   end
 end

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

@@ -6,31 +6,38 @@ module JustimmoClient::V1
 
     # @!macro [attach] attribute
     #   @return [$2]
-    attribute :id,          Integer
-    attribute :number,      Integer
-    attribute :email,       String
-    attribute :phone,       String
-    attribute :mobile,      String
-    attribute :fax,         String
-    attribute :last_name,   String
-    attribute :first_name,  String
-    attribute :salutation,  String
-    attribute :company,     String
-    attribute :street,      String
-    attribute :zip_code,    Integer
-    attribute :location,    String
+    attribute :id,             Integer
+    attribute :number,         Integer
+    attribute :email,          String
+    attribute :phone,          String
+    attribute :mobile,         String
+    attribute :fax,            String
+    attribute :last_name,      String
+    attribute :first_name,     String
+    attribute :salutation,     String
+    attribute :company,        String
+    attribute :street,         String
+    attribute :zip_code,       Integer
+    attribute :location,       String
     attribute :email_feedback, String
-    attribute :website,     String
-    attribute :picture,     Image
-    attribute :attachment,  Image
-    attribute :position,    String
+    attribute :website,        String
+    attribute :position,       String
+    attribute :attachments,    Array[Attachment], default: []
 
     # @!group Instance Method Summary
 
-    def image
-      picture
+    def images
+      attachments.select { |x| x.type == "pic" }
     end
 
+    alias pictures images
+
+    def image(index = 0)
+      images[index]
+    end
+
+    alias picture image
+
     def full_name(surname_first: false, with_salutation: true)
       name = [first_name, last_name]
       name.reverse! if surname_first

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

@@ -10,7 +10,7 @@ module JustimmoClient::V1
     #   @return [$2]
     attribute :proximity,     String
     attribute :federal_state, String
-    attribute :country,       String
+    attribute :country,       Country
     attribute :zip_code,      Integer
     attribute :latitude,      Float
     attribute :longitude,     Float
@@ -20,10 +20,8 @@ module JustimmoClient::V1
 
     # @!group Instance Method Summary
 
-    def country=(iso3_or_name)
-      @country = IsoCountryCodes.find(iso3_or_name).name
-    rescue IsoCountryCodes::UnknownCodeError
-      @country = iso3_or_name
+    def country=(name)
+      @country = Country.new(name: name)
     end
 
     def floor=(flr)

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

@@ -10,6 +10,7 @@ module JustimmoClient::V1
 
     # :nodoc:
     include Virtus.model do |mod|
+      mod.nullify_blank = true
       mod.coercer.config.string.boolean_map = { "0" => false, "1" => true }
     end
   end

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

@@ -8,43 +8,40 @@ module JustimmoClient::V1
     #   @return [$2]
     attribute :id,                    Integer
     attribute :number,                Integer
-    attribute :title,                 String
+    attribute :title,                 String, default: ""
     attribute :description,           String, default: ""
-    attribute :teaser,                String, default: ""
-    attribute :usage,                 RealtyUsage
-    attribute :marketing,             RealtyMarketing
+    attribute :teaser,                Array[String], default: []
     attribute :type_id,               Integer
     attribute :sub_type_id,           Integer
-    attribute :geo,                   GeoLocation
-    attribute :area,                  RealtyArea
-    attribute :room_count,            RealtyRoomCount
-    attribute :price,                 RealtyPrice
     attribute :status_id,             Integer
-    attribute :floor,                 String
     attribute :openimmo_id,           String
-    attribute :contact,               Employee
-    attribute :description_furniture, Array[String]
-    attribute :furniture,             Array[String]
-    attribute :images,                Array[Image]
-    attribute :documents,             Array
-    attribute :videos,                Array
-    attribute :images360,             Array
-    attribute :links,                 Array
+    attribute :description_furniture, Array[String], default: []
+    attribute :furniture,             Array[String], default: []
+    attribute :attachments,           Array[Attachment], default: []
+    attribute :documents,             Array, default: []
+    attribute :videos,                Array, default: []
+    attribute :images360,             Array, default: []
+    attribute :links,                 Array, default: []
     attribute :construction_year,     Integer
     attribute :available,             DateTime
     attribute :created_at,            DateTime
     attribute :updated_at,            DateTime
+    attribute :contact,               Employee
+    attribute :usage,                 RealtyUsage
+    attribute :marketing,             RealtyMarketing
+    attribute :geo,                   GeoLocation
+    attribute :area,                  RealtyArea
+    attribute :room_count,            RealtyRoomCount
+    attribute :price,                 RealtyPrice
 
     # @!group Instance Method Summary
 
-    def initialize(**options)
-      super(options)
-      @area       = RealtyArea.new
-      @room_count = RealtyRoomCount.new
-      @geo        = GeoLocation.new
-      @usage      = RealtyUsage.new
-      @marketing  = RealtyMarketing.new
-      @price      = RealtyPrice.new
+    def images
+      attachments.select { |x| x.type == "pic" }
+    end
+
+    def title_image
+      attachments.select { |x| x.category == :title_image }.first
     end
 
     # @param date [String]
@@ -52,7 +49,7 @@ module JustimmoClient::V1
     def available=(date)
       @available = DateTime.parse(date) unless date.nil?
     rescue ArgumentError
-      log.error("Failed to convert date: #{date}")
+      log.debug("Failed to convert date: #{date}")
       @available = date
     end
 
@@ -60,24 +57,24 @@ module JustimmoClient::V1
       @description =
         if @teaser.empty?
           parts = desc.partition("</ul>\n")
-          @teaser = parts[0..1].join
-          parts.last.empty? ? @teaser : parts.last
+          self.teaser = parts[0..1].join
+          parts.last
         else
           desc
         end
     end
 
-    def add_image(url, **options)
-      @images ||= []
-      image = Image.new
-      image.add_url(url, options)
-      @images << image
+    def teaser=(tea)
+      @teaser =
+        case tea
+        when Array then tea
+        when String then tea&.gsub(/<\/?(ul|li)>/, "")&.strip&.split("\n")
+        else []
+        end
     end
 
     def type
-    end
-
-    def sub_type
+      @type ||= RealtyInterface.types.select { |x| x.id == type_id }.first
     end
   end
 end

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require "monetize"
+
+module JustimmoClient::V1
+  class Money < Virtus::Attribute
+    def coerce(value)
+      ::Monetize.parse(value)
+    end
+  end
+
+  class Currency < Virtus::Attribute
+    include JustimmoClient::Logging
+
+    def coerce(value)
+      ::Money::Currency.new(value)
+    rescue ::Money::Currency::UnknownCurrency
+      ::Money.default_currency
+    end
+  end
+
+  class RealtyCost < JustimmoBase
+    attribute :currency, Currency
+    attribute :amount,   Money
+
+    def /(other)
+      amount / other
+    end
+
+    def *(other)
+      amount * other
+    end
+
+    def +(other)
+      amount + ::Money.new(other)
+    end
+
+    def -(other)
+      amount - ::Money.new(other)
+    end
+
+    def zero?
+      amount.zero?
+    end
+
+    def to_s
+      amount.format
+    end
+
+    def to_f
+      amount.to_f
+    end
+
+    def to_h
+      { currency: currency.id, amount: amount.to_f }
+    end
+
+    def to_json(*args)
+      to_h.to_json(args)
+    end
+
+    alias as_json to_json
+
+    def inspect
+      "#<#{self.class} #{self}>"
+    end
+  end
+end

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

@@ -12,10 +12,7 @@ module JustimmoClient::V1
     # @!group Instance Method Summary
 
     def to_a
-      tmp = []
-      tmp << :buy if buy?
-      tmp << :rent if rent?
-      tmp
+      attributes.select { |_k, v| v }.keys
     end
 
     def map(&block)