justimmo_client 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6889b2849895ac84cbda9609a4d40847104acd88
-  data.tar.gz: a90c60aef5e69d154704b24a15b13f7eef656f0c
+  metadata.gz: 862c14b5638385085dd28a49b7516615bad161cb
+  data.tar.gz: f9a71e5c7282b4e935faa15afc6f4756d7842d1d
 SHA512:
-  metadata.gz: 7168d63aa6ff0d8c4901f0893c78b268840457d048caffb9d271c6e658f4ed030caa779dcf1299eb88cae19d9d18e4d3ad1142f02e4c652e24e14853a78fffc0
-  data.tar.gz: 48f3d5ba3187aa261ea3ae2f72cf946ce9c616e8abbeb1c40734c2d2bacd58a7fd686e3288c5d3b0c8727206946fbff40c0c6742fe90945ae065397760c8b5a2
+  metadata.gz: 87d97beb7c5aff8c95bdb2e85c4726e7586e22c85665cdd9dcd9d18dd2e6a701af4180d261b88a6e180d13de80be2bb04517bdcefe7cdf57227915b708bd8f1f
+  data.tar.gz: d443e4e059747c07a2266ea72087fa2691d2e6c3b854e158f82c3441a664ae240fade67435444019b013a9776ed7e6018bd03d8cf2cb7c919b6fe633d683b0b9

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

@@ -27,6 +27,10 @@ module JustimmoClient::V1
 
     # @!group Instance Method Summary
 
+    def image
+      picture
+    end
+
     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,       IsoCountryCodes::Code
     attribute :zip_code,      Integer
     attribute :latitude,      Float
     attribute :longitude,     Float

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

@@ -30,6 +30,7 @@ module JustimmoClient::V1
     attribute :videos,                Array
     attribute :images360,             Array
     attribute :links,                 Array
+    attribute :construction_year,     Integer
     attribute :available,             DateTime
     attribute :created_at,            DateTime
     attribute :updated_at,            DateTime

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

@@ -68,6 +68,8 @@ module JustimmoClient::V1
     end
 
     def commission
+      return nil unless @commission
+
       if purcase?
         (get / 100 * @commission) * 1.20
       else
@@ -76,6 +78,7 @@ module JustimmoClient::V1
     end
 
     def rent_vat
+      return nil unless rent? && rent_net
       rent_net / 100 * @rent_vat
     end
 
@@ -83,8 +86,12 @@ module JustimmoClient::V1
       @purcase || @rent
     end
 
+    def to_f
+      get.to_f
+    end
+
     def to_s
-      on_demand? ? "on demand" : "#{get} #{get.symbol}"
+      on_demand? ? "on demand" : get.format
     end
 
     def inspect

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

@@ -7,6 +7,6 @@ module JustimmoClient::V1
     # @!macro [attach] attribute
     #   @return [$2]
     attribute :id,   Integer
-    attribute :name, String
+    attribute :name, Symbol
   end
 end

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

@@ -20,5 +20,23 @@ module JustimmoClient::V1
     attribute :living,     Boolean
     attribute :business,   Boolean
     attribute :investment, Boolean
+
+    # @!group Instance Method Summary
+
+    def to_a
+      tmp = []
+      tmp << :living if living?
+      tmp << :business if business?
+      tmp << :investment if investment?
+      tmp
+    end
+
+    def to_s
+      to_a.join(", ")
+    end
+
+    def map(&block)
+      to_a.map(&block)
+    end
   end
 end

data/lib/justimmo_client/api/v1/representers/xml/realty_detail_representer.rb

@@ -20,6 +20,10 @@ module JustimmoClient::V1
           parse_filter: ->(_fragment, options) { options[:doc].css("user_defined_simplefield[feldname=aktualisiert_am]").text }
       end
 
+      nested :zustand_angaben do
+        property :construction_year, as: :baujahr
+      end
+
       property :geo,
         decorator: GeoLocationRepresenter,
         class: GeoLocation

data/lib/justimmo_client/api/v1/representers/xml/realty_type_representer.rb

@@ -5,8 +5,25 @@ module JustimmoClient::V1
     class RealtyTypeRepresenter < JustimmoRepresenter
       self.representation_wrap = :objektart
 
+      TRANSLATION_MAPPING = {
+        "Zimmer" => :room,
+        "Wohnung" => :apartment,
+        "Haus" => :house,
+        "Grundstück" => :property,
+        "Büro / Praxis" => :office,
+        "Einzelhandel" => :retail,
+        "Gastgewerbe" => :hospitality,
+        "Industrie / Gewerbe" => :business,
+        "Land und Forstwirtschaft" => :agriculture,
+        "Sonstige / Sonderobjekte" => :other,
+        "Freizeitimmobilie gewerblich" => :recreational_property_business,
+        "Zinshaus / Renditeobjekt" => :yield,
+        "Parken" => :parking
+      }.freeze
+
       property :id
-      property :name
+      property :name,
+        parse_filter: ->(fragment, **) { TRANSLATION_MAPPING[fragment] }
 
       collection_representer class: RealtyType
     end

data/lib/justimmo_client/api/v1/requests/realty_request.rb

@@ -15,8 +15,6 @@ module JustimmoClient::V1
       price: :preis,
       zip_code: :plz,
       price_per_sqm: :preis_per_m2,
-      type: :objektart,
-      subtype: :subobjektart,
       tag: :tagname,
       rooms: :zimmer,
       area: :flaeche,
@@ -38,7 +36,10 @@ module JustimmoClient::V1
       location: :ort,
       all: :alle,
       rent: :miete,
-      purcase: :kauf
+      purcase: :kauf,
+      type: :objektart,
+      sub_type: :subobjektart,
+      system_type: :realty_type
     }.freeze
 
     module_function
@@ -172,7 +173,13 @@ module JustimmoClient::V1
           f.add :price_per_sqm_min
           f.add :price_per_sqm_max
           f.add :type_id
-          f.add :subtype_id
+          f.add :type do |key, *values|
+            values = [values].flatten.map(&:to_sym)
+            log.debug(values)
+            types = JustimmoClient::Realty.types
+            [:type_id, types.select { |x| values.include?(x.name) }.map(&:id)]
+          end
+          f.add :sub_type_id
           f.add :tag
           f.add :zip_code
           f.add :zip_code_min
@@ -195,7 +202,7 @@ module JustimmoClient::V1
           f.add :federal_state_id
           f.add :status_id
           f.add :project_id
-          f.add :type
+          f.add :system_type
           f.add :parent_id
           f.add :rent, type: :bool
           f.add :purcase, type: :bool

data/lib/justimmo_client/option_parser.rb

@@ -100,7 +100,7 @@ module JustimmoClient
 
       coerced =
         case @options.dig(key, :type)
-        when :bool then i_to_bool(value)
+        when :bool then bool_to_i(value)
         else mapping(value)
         end
 
@@ -113,8 +113,12 @@ module JustimmoClient
       { "#{api_param}#{min}": range.first, "#{api_param}#{max}": range.last }
     end
 
-    def i_to_bool(value)
-      value ? 1 : 0
+    def bool_to_i(value)
+      case value
+      when "true" then 1
+      when "false" then 0
+      else value ? 1 : 0
+      end
     end
   end
 end

data/lib/justimmo_client/realty.rb

@@ -21,6 +21,7 @@ module JustimmoClient
     # @option options [Float] :price_per_sqm_min
     # @option options [Float] :price_per_sqm_max
     # @option options [Integer] :type_id
+    # @option options [Symbol, String, Array<Symbol, String>] :type
     # @option options [Integer] :sub_type_id
     # @option options [Symbol, String] :tag
     # @option options [String, Integer] :zip_code
@@ -47,7 +48,7 @@ module JustimmoClient
     # @option options [Boolean] :purcase
     # @option options [Integer] :owner_id
     # @option options [Integer] :project_id
-    # @option options [Symbol, String] :type
+    # @option options [String] :system_type
     # @option options [Integer] :parent_id
     # @option options [DateTime] :updated_at_min
     # @option options [DateTime] :updated_at_max

data/lib/justimmo_client/version.rb

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

metadata

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