ogc-gml 1.0.0 → 1.0.1

data/lib/ogc/gml/topo_solid.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- topo_solid_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "code"
 require_relative "code_with_authority"
@@ -13,15 +12,15 @@ require_relative "solid_property"
 
 module Ogc
   module Gml
-    class DirectedFaceProperty < Shale::Mapper
+    class DirectedFaceProperty < Lutaml::Model::Serializable
     end
 
-    class TopoSolid < Shale::Mapper
-      attribute :id, Shale::Type::Value
-      attribute :aggregation_type, Shale::Type::String
-      attribute :universal, Shale::Type::Boolean, default: -> { "false" }
+    class TopoSolid < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :aggregation_type, :string
+      attribute :universal, :boolean, default: -> { false }
       attribute :meta_data_property, MetaDataProperty, collection: true
-      attribute :description, Shale::Type::String
+      attribute :description, :string
       attribute :description_reference, Reference
       attribute :identifier, CodeWithAuthority
       attribute :name, Code, collection: true

data/lib/ogc/gml/topo_solid_property.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
-# --- topo_solid_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "topo_solid"
 
 module Ogc
   module Gml
-    class TopoSolidProperty < Shale::Mapper
-      attribute :nil_reason, Shale::Type::Value
-      attribute :remote_schema, Shale::Type::Value
-      attribute :owns, Shale::Type::Boolean, default: -> { "false" }
+    class TopoSolidProperty < Lutaml::Model::Serializable
+      attribute :nil_reason, :string
+      attribute :remote_schema, :string
+      attribute :owns, :boolean, default: -> { false }
       attribute :topo_solid, TopoSolid
 
       xml do

data/lib/ogc/gml/topo_surface.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- topo_surface_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "code"
 require_relative "code_with_authority"
@@ -11,11 +10,11 @@ require_relative "reference"
 
 module Ogc
   module Gml
-    class TopoSurface < Shale::Mapper
-      attribute :id, Shale::Type::Value
-      attribute :aggregation_type, Shale::Type::String
+    class TopoSurface < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :aggregation_type, :string
       attribute :meta_data_property, MetaDataProperty, collection: true
-      attribute :description, Shale::Type::String
+      attribute :description, :string
       attribute :description_reference, Reference
       attribute :identifier, CodeWithAuthority
       attribute :name, Code, collection: true

data/lib/ogc/gml/topo_surface_property.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-# --- topo_surface_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "topo_surface"
 
 module Ogc
   module Gml
-    class TopoSurfaceProperty < Shale::Mapper
-      attribute :owns, Shale::Type::Boolean, default: -> { "false" }
+    class TopoSurfaceProperty < Lutaml::Model::Serializable
+      attribute :owns, :boolean, default: -> { false }
       attribute :topo_surface, TopoSurface
 
       xml do

data/lib/ogc/gml/topo_volume.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- topo_volume_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "code"
 require_relative "code_with_authority"
@@ -11,11 +10,11 @@ require_relative "reference"
 
 module Ogc
   module Gml
-    class TopoVolume < Shale::Mapper
-      attribute :id, Shale::Type::Value
-      attribute :aggregation_type, Shale::Type::String
+    class TopoVolume < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :aggregation_type, :string
       attribute :meta_data_property, MetaDataProperty, collection: true
-      attribute :description, Shale::Type::String
+      attribute :description, :string
       attribute :description_reference, Reference
       attribute :identifier, CodeWithAuthority
       attribute :name, Code, collection: true

data/lib/ogc/gml/topo_volume_property.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-# --- topo_volume_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "topo_volume"
 
 module Ogc
   module Gml
-    class TopoVolumeProperty < Shale::Mapper
-      attribute :owns, Shale::Type::Boolean, default: -> { "false" }
+    class TopoVolumeProperty < Lutaml::Model::Serializable
+      attribute :owns, :boolean, default: -> { false }
       attribute :topo_volume, TopoVolume
 
       xml do

data/lib/ogc/gml/transformation.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- transformation_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "abstract_general_parameter_value_property"
 require_relative "code"

data/lib/ogc/gml/transformation_property.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-# --- transformation_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "transformation"
 
 module Ogc
   module Gml
-    class TransformationProperty < Shale::Mapper
-      attribute :nil_reason, Shale::Type::Value
-      attribute :remote_schema, Shale::Type::Value
+    class TransformationProperty < Lutaml::Model::Serializable
+      attribute :nil_reason, :string
+      attribute :remote_schema, :string
       attribute :transformation, Transformation
 
       xml do

data/lib/ogc/gml/triangle.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-# --- triangle_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "shell_property"
 
 module Ogc
   module Gml
-    class Triangle < Shale::Mapper
-      attribute :interpolation, Shale::Type::String
+    class Triangle < Lutaml::Model::Serializable
+      attribute :interpolation, :string
       attribute :exterior, ShellProperty
 
       xml do

data/lib/ogc/gml/unit_definition.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- unit_definition_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "code"
 require_relative "code_with_authority"
@@ -13,7 +12,7 @@ require_relative "abstract_topology"
 module Ogc
   module Gml
     class UnitDefinition < AbstractTopology
-      attribute :remarks, Shale::Type::String
+      attribute :remarks, :string
       attribute :quantity_type, StringOrRef
       attribute :quantity_type_reference, Reference
       attribute :catalog_symbol, Code

data/lib/ogc/gml/unit_of_measure.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-# --- unit_of_measure_type.rb ---
-require "shale"
+require "lutaml/model"
 
 module Ogc
   module Gml
-    class UnitOfMeasure < Shale::Mapper
-      attribute :uom, Shale::Type::Value
+    class UnitOfMeasure < Lutaml::Model::Serializable
+      attribute :uom, :string
 
       xml do
         root "unitOfMeasure"

data/lib/ogc/gml/user_defined_cs.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- user_defined_cs_type.rb ---
-require "shale"
+require "lutaml/model"
 require_relative "abstract_coordinate_system"
 
 module Ogc

data/lib/ogc/gml/user_defined_cs_property.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-# --- user_defined_cs_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "user_defined_cs"
 
 module Ogc
   module Gml
-    class UserDefinedCSProperty < Shale::Mapper
-      attribute :nil_reason, Shale::Type::Value
-      attribute :remote_schema, Shale::Type::Value
+    class UserDefinedCSProperty < Lutaml::Model::Serializable
+      attribute :nil_reason, :string
+      attribute :remote_schema, :string
       attribute :user_defined_cs, UserDefinedCS
 
       xml do

data/lib/ogc/gml/value_array.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- value_array_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "code"
 require_relative "code_with_authority"
@@ -12,13 +11,13 @@ require_relative "value_property"
 
 module Ogc
   module Gml
-    class ValueArray < Shale::Mapper
-      attribute :id, Shale::Type::Value
-      attribute :aggregation_type, Shale::Type::String
-      attribute :code_space, Shale::Type::Value
-      attribute :uom, Shale::Type::Value
+    class ValueArray < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :aggregation_type, :string
+      attribute :code_space, :string
+      attribute :uom, :string
       attribute :meta_data_property, MetaDataProperty, collection: true
-      attribute :description, Shale::Type::String
+      attribute :description, :string
       attribute :description_reference, Reference
       attribute :identifier, CodeWithAuthority
       attribute :name, Code, collection: true

data/lib/ogc/gml/value_array_property.rb

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
-# --- value_array_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "abstract_geometry"
 require_relative "abstract_time_object"
 
 module Ogc
   module Gml
-    class ValueArrayProperty < Shale::Mapper
-      attribute :owns, Shale::Type::Boolean, default: -> { "false" }
-      attribute :abstract_value, Shale::Type::Value, collection: true
+    class ValueArrayProperty < Lutaml::Model::Serializable
+      attribute :owns, :boolean, default: -> { false }
+      attribute :abstract_value, :string, collection: true
       attribute :abstract_geometry, AbstractGeometry, collection: true
       attribute :abstract_time_object, AbstractTimeObject, collection: true
-      attribute :null, Shale::Type::Value, collection: true
+      attribute :null, :string, collection: true
 
       xml do
         root "valueComponents"

data/lib/ogc/gml/value_property.rb

@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
-# --- value_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "abstract_geometry"
 require_relative "abstract_time_object"
 
 module Ogc
   module Gml
-    class ValueProperty < Shale::Mapper
-      attribute :nil_reason, Shale::Type::Value
-      attribute :remote_schema, Shale::Type::Value
-      attribute :owns, Shale::Type::Boolean, default: -> { "false" }
-      attribute :abstract_value, Shale::Type::Value
+    class ValueProperty < Lutaml::Model::Serializable
+      attribute :nil_reason, :string
+      attribute :remote_schema, :string
+      attribute :owns, :boolean, default: -> { false }
+      attribute :abstract_value, :string
       attribute :abstract_geometry, AbstractGeometry
       attribute :abstract_time_object, AbstractTimeObject
-      attribute :null, Shale::Type::Value
+      attribute :null, :string
 
       xml do
         root "valueComponent"

data/lib/ogc/gml/vector.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-# --- vector_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "direct_position"
 
 module Ogc
   module Gml
-    class Vector < Shale::Mapper
+    class Vector < Lutaml::Model::Serializable
       attribute :content, DirectPosition
 
       xml do

data/lib/ogc/gml/version.rb

@@ -2,6 +2,6 @@
 
 module Ogc
   module Gml
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/ogc/gml/vertical_crs.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- vertical_crs_type.rb ---
-require "shale"
+require "lutaml/model"
 require_relative "vertical_cs_property"
 require_relative "vertical_datum_property"
 require_relative "abstract_crs"

data/lib/ogc/gml/vertical_crs_property.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-# --- vertical_crs_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "vertical_crs"
 
 module Ogc
   module Gml
-    class VerticalCRSProperty < Shale::Mapper
-      attribute :nil_reason, Shale::Type::Value
-      attribute :remote_schema, Shale::Type::Value
+    class VerticalCRSProperty < Lutaml::Model::Serializable
+      attribute :nil_reason, :string
+      attribute :remote_schema, :string
       attribute :vertical_crs, VerticalCRS
 
       xml do

data/lib/ogc/gml/vertical_cs.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- vertical_cs_type.rb ---
-require "shale"
+require "lutaml/model"
 require_relative "abstract_coordinate_system"
 
 module Ogc

data/lib/ogc/gml/vertical_cs_property.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-# --- vertical_cs_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "vertical_cs"
 
 module Ogc
   module Gml
-    class VerticalCSProperty < Shale::Mapper
-      attribute :nil_reason, Shale::Type::Value
-      attribute :remote_schema, Shale::Type::Value
+    class VerticalCSProperty < Lutaml::Model::Serializable
+      attribute :nil_reason, :string
+      attribute :remote_schema, :string
       attribute :vertical_cs, VerticalCS
 
       xml do

data/lib/ogc/gml/vertical_datum.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# --- vertical_datum_type.rb ---
-require "shale"
+require "lutaml/model"
 require_relative "abstract_datum"
 
 module Ogc

data/lib/ogc/gml/vertical_datum_property.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-# --- vertical_datum_property_type.rb ---
-require "shale"
+require "lutaml/model"
 
 require_relative "vertical_datum"
 
 module Ogc
   module Gml
-    class VerticalDatumProperty < Shale::Mapper
-      attribute :nil_reason, Shale::Type::Value
-      attribute :remote_schema, Shale::Type::Value
+    class VerticalDatumProperty < Lutaml::Model::Serializable
+      attribute :nil_reason, :string
+      attribute :remote_schema, :string
       attribute :vertical_datum, VerticalDatum
 
       xml do

data/lib/ogc/gml.rb

@@ -1,18 +1,22 @@
 # frozen_string_literal: true
 
+require "lutaml/model"
+
+Lutaml::Model::Config.configure do |config|
+  require "lutaml/model/xml_adapter/nokogiri_adapter"
+  config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
+end
+
 require_relative "gml/version"
 
 module Ogc
   module Gml
     class Error < StandardError; end
+
     # Your code goes here...
   end
 end
 
-require 'shale'
-require 'shale/adapter/nokogiri'
-Shale.xml_adapter = Shale::Adapter::Nokogiri
-
 require_relative "gml/abstract_continuous_coverage"
 require_relative "gml/abstract_coordinate_operation"
 require_relative "gml/abstract_coordinate_system"
@@ -330,7 +334,6 @@ require_relative "gml/value_array_property"
 require_relative "gml/value_array"
 require_relative "gml/value_property"
 require_relative "gml/vector"
-require_relative "gml/version"
 require_relative "gml/vertical_crs_property"
 require_relative "gml/vertical_crs"
 require_relative "gml/vertical_cs_property"

data/ogc-gml.gemspec

@@ -4,14 +4,14 @@ require_relative "lib/ogc/gml/version"
 
 Gem::Specification.new do |spec|
   spec.name = "ogc-gml"
-  spec.version       = Ogc::Gml::VERSION
-  spec.authors       = ["Ribose Inc."]
-  spec.email         = ["open.source@ribose.com'"]
+  spec.version = Ogc::Gml::VERSION
+  spec.authors = ["Ribose Inc."]
+  spec.email = ["open.source@ribose.com'"]
 
-  spec.summary       = "OGC GML data model parser"
-  spec.description   = "OGC GML data model parser"
-  spec.homepage      = "https://github.com/lutaml/ogc-gml"
-  spec.license       = "MIT"
+  spec.summary = "OGC GML data model parser"
+  spec.description = "OGC GML data model parser"
+  spec.homepage = "https://github.com/lutaml/ogc-gml"
+  spec.license = "MIT"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -25,14 +25,14 @@ Gem::Specification.new do |spec|
       .split("\x0")
       .reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.7.0"
 
+  spec.add_runtime_dependency "lutaml-model"
   spec.add_runtime_dependency "nokogiri"
-  spec.add_runtime_dependency "shale"
 
   spec.add_development_dependency "equivalent-xml"
   spec.add_development_dependency "pry", "~> 0.12.2"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ogc-gml
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-15 00:00:00.000000000 Z
+date: 2024-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shale
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,16 +129,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- README.md
+- README.adoc
 - Rakefile
 - bin/console
 - bin/setup

data/.github/workflows/main.yml

@@ -1,27 +0,0 @@
-name: Ruby
-
-on:
-  push:
-    branches:
-      - main
-
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }}
-    strategy:
-      matrix:
-        ruby:
-          - '3.2.2'
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Run the default task
-      run: bundle exec rake

data/README.md

@@ -1,35 +0,0 @@
-# Ogc::Gml
-
-TODO: Delete this and the text below, and describe your gem
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ogc/gml`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-## Installation
-
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
-Install the gem and add to the application's Gemfile by executing:
-
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
-
-If bundler is not being used to manage dependencies, install the gem by executing:
-
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ogc-gml. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/ogc-gml/blob/main/CODE_OF_CONDUCT.md).
-
-## Code of Conduct
-
-Everyone interacting in the Ogc::Gml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/ogc-gml/blob/main/CODE_OF_CONDUCT.md).