gdsapi-v2-ruby 0.1.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ff2a9d3f5c0b12dda418eb41bc168c4f4513e44
-  data.tar.gz: 4e5473b5c5a5981b4c4cb6c62f63d25305d3b6a2
+  metadata.gz: 0052cbbae7288138715bddeb75ad007bf8de07e6
+  data.tar.gz: 8b77e9103fa3276566c3e8bb6579702affa48620
 SHA512:
-  metadata.gz: 4cde6b233ead8939f2ef22ace8f9e57774de549731051515bc4a8d2da076b645cdee4355ed577375d564cd253c5d147d101dc514932f74f9b52da72d9592cf79
-  data.tar.gz: b5017a76bea5b7dcf8b715c169a118c58d8bb7e05990663ba70ad39c9165988ca163e351b1b1a41de2fbb86d8434e2c7b83e79bc4e4ad614be5420a9454544f9
+  metadata.gz: ef1a717d1bee8c09d686056c8ba6433bf96efec5196cd9f281d92c93e385fa7367b2ba5f8d8fd43ba8bca64a65317b144fe9b9b8bffd72df8f6efd946f389e68
+  data.tar.gz: 16636adb70824406126c67fe8517d189f383a0f3b1dd20359018f01b927aad3e4eb0e0c5289b0b4e1844282e3bb5e51f8e5c89a875cf559b96e47281fa1b2e84

data/lib/gdsapi.rb

@@ -12,6 +12,8 @@ require 'gdsapi/methods/get_points'
 require 'gdsapi/structs/country'
 require 'gdsapi/structs/location'
 require 'gdsapi/structs/point'
+require 'gdsapi/structs/type'
+require 'gdsapi/structs/sub_type'
 
 # This provides core package manifesto
 ## Possible error definitions are provided here

data/lib/gdsapi/methods/get_countries.rb

@@ -17,16 +17,10 @@ module Gdsapi
         return [] if body.empty?
 
         countries = body['countries']
-        types = body['types']
         attributes = body['attributes']
-        countries.map do |country|
-          args = {
-            id: country['id'],
-            name: country['name'],
-            type: types.find { |type| type['id'] == country['type_id'] },
-            attributes: match_attributes(country['attributes'], attributes),
-          }
-          Gdsapi::Structs::Country.new args
+        countries.map! do |country|
+          country[:attributes] = match_attributes(country['attributes'], attributes)
+          Gdsapi::Structs::Country.new country.symbolize_keys
         end
       end
 

data/lib/gdsapi/methods/get_locations.rb

@@ -18,24 +18,16 @@ module Gdsapi
         types = body['types']
         attributes = body['attributes']
         sub_types = body['subTypes']
-        grouped_locations = locations.group_by { |location| location['mod'] }
-        parsed_locations = grouped_locations.map do |mod, hash_locations|
-          parsed_locations = hash_locations.map do |location|
-            args = {
-                id: location['id'],
-                name: location['name'],
-                latitude: location['latitude'],
-                longitude: location['longitude'],
-                parent: location['parent'],
-                type: types.find { |type| type['id'] == location['type_id'] },
-                sub_type: sub_types.find { |sub_type| sub_type['id'] == location['sub_type_id'] },
-                attributes: match_attributes(location['attributes'], attributes),
-            }
-            Gdsapi::Structs::Location.new args
+        grouped_locations = locations.group_by { |location| modes[location['mod']] }
+        grouped_locations.each_value do |hash_locations|
+          hash_locations.map! do |location|
+            location[:attributes] = match_attributes(location['attributes'], attributes)
+            Gdsapi::Structs::Location.new location.symbolize_keys
           end
-          [modes[mod], parsed_locations]
         end
-        Hash[parsed_locations]
+        grouped_locations[:types] = types.map { |t| Gdsapi::Structs::Type.new(t.symbolize_keys) }
+        grouped_locations[:sub_types] = sub_types.map { |st| Gdsapi::Structs::SubType.new(st.symbolize_keys) }
+        grouped_locations
       end
 
       def path

data/lib/gdsapi/structs.rb

@@ -10,8 +10,6 @@ module Gdsapi
                    name: Structs::Coercible::String,
                    values: Structs::Array.member(Structs::Coercible::String)))
 
-    Type = Structs::Hash.symbolized(id: Structs::Coercible::Int, name: Structs::Coercible::String)
-
     Parent = Structs::Hash.symbolized(id: Structs::Coercible::Int)
   end
 end

data/lib/gdsapi/structs/country.rb

@@ -7,7 +7,7 @@ module Gdsapi
     class Country < ::Dry::Struct
       attribute :id, Structs::Coercible::Int
       attribute :name, Structs::Coercible::String
-      attribute :type, Type.optional
+      attribute :type_id, Structs::Coercible::Int
       attribute :attributes, Attributes.optional
 
       def attribute_by_id(id)

data/lib/gdsapi/structs/location.rb

@@ -5,13 +5,15 @@
 module Gdsapi
   module Structs
     class Location < ::Dry::Struct
+     constructor_type(:schema)
+      
       attribute :id, Structs::Coercible::Int
       attribute :name, Structs::Coercible::String
       attribute :latitude, Structs::Coercible::Float
       attribute :longitude, Structs::Coercible::Float
       attribute :parent, Parent.optional
-      attribute :type, Type.optional
-      attribute :sub_type, Type.optional
+      attribute :type_id, Structs::Coercible::Int
+      attribute :sub_type_id, Structs::Coercible::Int.optional
       attribute :attributes, Attributes.optional
 
       def attribute_by_id(id)

data/lib/gdsapi/structs/sub_type.rb

@@ -0,0 +1,12 @@
+## SubType struct
+## Used when syncing geodata with GDS
+## See [[Gdsapi::Methods::GetPoints]] for details
+## Also see [http://demo.gillbus.com/v2/doc.html#получение-географии-получение-списка-остановок-get] for schema definition
+module Gdsapi
+  module Structs
+    class SubType < ::Dry::Struct
+      attribute :id, Structs::Coercible::Int
+      attribute :name, Structs::Coercible::String
+    end
+  end
+end

data/lib/gdsapi/structs/type.rb

@@ -0,0 +1,12 @@
+## Type struct
+## Used when syncing geodata with GDS
+## See [[Gdsapi::Methods::GetPoints]] for details
+## Also see [http://demo.gillbus.com/v2/doc.html#получение-географии-получение-списка-остановок-get] for schema definition
+module Gdsapi
+  module Structs
+    class Type < ::Dry::Struct
+      attribute :id, Structs::Coercible::Int
+      attribute :name, Structs::Coercible::String
+    end
+  end
+end

data/lib/gdsapi/version.rb

@@ -1,3 +1,3 @@
 module Gdsapi
-  VERSION = "0.1.5"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdsapi-v2-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors:
 - Mike Yurchenkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -180,6 +180,8 @@ files:
 - lib/gdsapi/structs/country.rb
 - lib/gdsapi/structs/location.rb
 - lib/gdsapi/structs/point.rb
+- lib/gdsapi/structs/sub_type.rb
+- lib/gdsapi/structs/type.rb
 - lib/gdsapi/version.rb
 homepage: https://busfor.ru
 licenses: