shale 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6782c72ce484d19c953642fee3503647013602cbbbb09f993f4d3a4739901b28
-  data.tar.gz: 9859301452b89ad78fd4a336a5af1e1415d0aa72679d19c273d75b9a93514799
+  metadata.gz: 36678c1f4afd6e0cf2d6a9a9e4b5becebf11e76404cb50dba7dc5269b5ca42cc
+  data.tar.gz: 51c6c94abafe1767c579c270e3c3cb4da2ca79a2a29a9d28ea6bfe09bc4b53fb
 SHA512:
-  metadata.gz: 888390259e517dc27a323497b5a7a7f5db850c6f7545970d4e8cfbedc71d8b1a138f9bdbcf0b72dab883d5f5ba6a9d1f484c7ba3d7b2fa7d48299df7882a3f4a
-  data.tar.gz: fb87b01bc61faf271f06faed140221e31eb8d894b64dc68d0afb4883c3e3943f54e464c969b6f939271405f3b14646288b327d8bf561da047dabd46075823717
+  metadata.gz: ea21dff00b6ea2663d20f9f377140250f78c29214a93f226047fe29d47680ae526652010ae268e4cf694ca1877cd8d19bfe8f0bbd767fa871fa80afaefee1c83
+  data.tar.gz: 414d45b7bcd2477bc276eee17c598efba40350e0234c32f783c73217bee65ae4260d07e8a7bcfc7f48e1f76c9af4852de1c1c109c5b807e99a945305e2de6286

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## [0.3.1] - 2022-04-29
+
+### Changed
+- Rename `id` -> `$id` and add info about supported JSON Schema dialect
+
+## [0.3.0] - 2022-04-29
+
+### Added
+- Support for XML namespaces
+- Add option to pretty print JSON and XML and to include XML declaration
+- Add support for generating JSON and XML Schema
+
+### Changed
+- Various fixes to documentation
+- Rename `hash` -> `hsh` (`hash` is used internally by Ruby)
+- Rename `Shale::Type::Base` -> `Shale::Type::Value`
+- Use ISO 8601 format for date and time in JSON, YAML and XML
+
+## [0.2.2] - 2022-03-06
+
+### Fixed
+- Fix handling of blank attributes in XML format
+- Fix incorrect types in README examples
+
 ## [0.2.1] - 2022-02-06
 
 ### Fixed

data/README.md

@@ -24,8 +24,35 @@ Or install it yourself as:
 $ gem install shale
 ```
 
+## Contents
+
+* [Simple use case](#user-content-simple-use-case)
+* [Creating objects](#creating-objects)
+* [Converting JSON to object](#converting-json-to-object)
+* [Converting object to JSON](#converting-object-to-json)
+* [Converting YAML to object](#converting-yaml-to-object)
+* [Converting object to YAML](#converting-object-to-yaml)
+* [Converting Hash to object](#converting-hash-to-object)
+* [Converting object to Hash](#converting-object-to-hash)
+* [Converting XML to object](#converting-xml-to-object)
+* [Converting object to XML](#converting-object-to-xml)
+* [Mapping JSON keys to object attributes](#mapping-json-keys-to-object-attributes)
+* [Mapping YAML keys to object attributes](#mapping-yaml-keys-to-object-attributes)
+* [Mapping Hash keys to object attributes](#mapping-hash-keys-to-object-attributes)
+* [Mapping XML elements and attributes to object attributes](#mapping-xml-elements-and-attributes-to-object-attributes)
+* [Using XML namespaces](#using-xml-namespaces)
+* [Using methods to extract and generate data](#using-methods-to-extract-and-generate-data)
+* [Pretty printing and XML declaration](#pretty-printing-and-xml-declaration)
+* [Supported types](#supported-types)
+* [Writing your own type](#writing-your-own-type)
+* [Adapters](#adapters)
+* [Generating JSON Schema](#generating-json-schema)
+* [Generating XML Schema](#generating-xml-schema)
+
 ## Usage
 
+Documentation with interactive examples is available at [Shale website](https://www.shalerb.org)
+
 ### Simple use case
 
 ```ruby
@@ -40,7 +67,7 @@ end
 class Person < Shale::Mapper
   attribute :first_name, Shale::Type::String
   attribute :last_name, Shale::Type::String
-  attribute :age, Shale::Type::Date
+  attribute :age, Shale::Type::Integer
   attribute :married, Shale::Type::Boolean, default: -> { false }
   attribute :hobbies, Shale::Type::String, collection: true
   attribute :address, Address
@@ -264,7 +291,7 @@ class Person < Shale::Mapper
   attribute :first_name, Shale::Type::String
   attribute :last_name, Shale::Type::String
 
-  hash do
+  hsh do
     map 'firstName', to: :first_name
     map 'lastName', to: :last_name
   end
@@ -291,7 +318,7 @@ end
 class Person < Shale::Mapper
   attribute :first_name, Shale::Type::String
   attribute :last_name, Shale::Type::String
-  attribute :age, Shale::Type::Date
+  attribute :age, Shale::Type::Integer
   attribute :hobbies, Shale::Type::String, collection: true
   attribute :address, Address
 
@@ -327,6 +354,74 @@ DATA
 - `map_attribute` - map element's attribute to attribute
 - `map_content` - map first text node to attribute
 
+### Using XML namespaces
+
+:warning: **Ox doesn't support XML namespaces**
+
+To map namespaced elements and attributes use `namespace` and `prefix` properties on
+`map_element` and `map_attribute`
+
+```ruby
+class Person < Shale::Mapper
+  attribute :first_name, Shale::Type::String
+  attribute :last_name, Shale::Type::String
+  attribute :age, Shale::Type::Integer
+
+  xml do
+    root 'person'
+
+    map_element 'first_name', to: :first_name, namespace: 'http://ns1.com', prefix: 'ns1'
+    map_element 'last_name', to: :last_name, namespace: 'http://ns2.com', prefix: 'ns2'
+    map_attribute 'age', to: :age, namespace: 'http://ns2.com', prefix: 'ns2'
+  end
+end
+
+person = Person.from_xml(<<~DATA)
+<person xmlns:ns1="http://ns1.com" xmlns:ns2="http://ns2.com" ns2:age="50">
+  <ns1:first_name>John</ns1:first_name>
+  <ns2:last_name>Doe</ns2:last_name>
+</person>
+DATA
+```
+
+To define default namespace for all elements use `namespace` declaration
+(this will define namespace only on elements, if you want to define namespace on an attribute
+explicitly declare it on `map_attribute`).
+
+```ruby
+class Person < Shale::Mapper
+  attribute :first_name, Shale::Type::String
+  attribute :middle_name, Shale::Type::String
+  attribute :last_name, Shale::Type::String
+  attribute :age, Shale::Type::Integer
+  attribute :hobby, Shale::Type::String
+
+  xml do
+    root 'person'
+    namespace 'http://ns1.com', 'ns1'
+
+    map_element 'first_name', to: :first_name
+
+    # undeclare namespace on 'middle_name' element
+    map_element 'middle_name', to: :middle_name, namespace: nil, prefix: nil
+
+    # overwrite default namespace
+    map_element 'last_name', to: :last_name, namespace: 'http://ns2.com', prefix: 'ns2'
+
+    map_attribute 'age', to: :age
+    map_attribute 'hobby', to: :hobby, namespace: 'http://ns1.com', prefix: 'ns1'
+  end
+end
+
+person = Person.from_xml(<<~DATA)
+<ns1:person xmlns:ns1="http://ns1.com" xmlns:ns2="http://ns2.com" age="50" ns1:hobby="running">
+  <ns1:first_name>John</ns1:first_name>
+  <middle_name>Joe</middle_name>
+  <ns2:last_name>Doe</ns2:last_name>
+</ns1:person>
+DATA
+```
+
 ### Using methods to extract and generate data
 
 If you need full controll over extracting and generating data from/to document,
@@ -421,6 +516,36 @@ DATA
 #  @city="London">
 ```
 
+### Pretty printing and XML declaration
+
+If you need formatted output you can pass `:pretty` parameter to `#to_json` and `#to_xml`
+
+```ruby
+person.to_json(:pretty)
+
+# =>
+#
+# {
+#   "name": "John Doe",
+#   "address": {
+#     "city": "London"
+#   }
+# }
+```
+
+You can also add an XML declaration by passing `:declaration` to `#to_xml`
+
+```ruby
+person.to_xml(:pretty, :declaration)
+
+# =>
+#
+# <?xml version="1.0"?>
+# <Person>
+#   <Address city="London"/>
+# </Person>
+```
+
 ### Supported types
 
 Shale supports these types out of the box:
@@ -434,12 +559,12 @@ Shale supports these types out of the box:
 
 ### Writing your own type
 
-To add your own type extend it from `Shale::Type::Base` and implement `.cast` class method.
+To add your own type extend it from `Shale::Type::Value` and implement `.cast` class method.
 
 ```ruby
-require 'shale/type/base'
+require 'shale/type/value'
 
-class MyIntegerType < Shale::Type::Base
+class MyIntegerType < Shale::Type::Value
   def self.cast(value)
     value.to_i
   end
@@ -463,7 +588,7 @@ Shale.json_adapter = MultiJson
 Shale.yaml_adapter = MyYamlAdapter
 ```
 
-For XML, Shale provides adapters for most popular Ruby XML parsers:
+Shale provides adapters for most popular Ruby XML parsers:
 
 ```ruby
 require 'shale'
@@ -484,6 +609,148 @@ require 'shale/adapter/ox'
 Shale.xml_adapter = Shale::Adapter::Ox
 ```
 
+### Generating JSON Schema
+
+To generate JSON Schema from you Shale data model use:
+
+:warning: Shale only supports **[Draft 2020-12](https://json-schema.org/draft/2020-12/schema)** JSON Schema
+
+```ruby
+require 'shale/schema'
+
+Shale::Schema.to_json(Person, id: 'http://foo.bar/schema/person', description: 'My description', pretty: true)
+
+# =>
+#
+# {
+#   "$schema": "https://json-schema.org/draft/2020-12/schema",
+#   "$id": "http://foo.bar/schema/person",
+#   "description": "My description",
+#   "$ref": "#/$defs/Person",
+#   "$defs": {
+#     "Address": {
+#       "type": [
+#         "object",
+#         "null"
+#       ],
+#       "properties": {
+#         "city": {
+#           "type": [
+#             "string",
+#             "null"
+#           ]
+#         }
+#       }
+#     },
+#     "Person": {
+#       "type": "object",
+#       "properties": {
+#         "name": {
+#           "type": [
+#             "string",
+#             "null"
+#           ]
+#         },
+#         "address": {
+#           "$ref": "#/$defs/Address"
+#         }
+#       }
+#     }
+#   }
+# }
+```
+
+You can also use a command line tool to do it:
+
+```
+$ shaleb -i data_model.rb -c Person -p
+```
+
+If you want to convert your own types to JSON Schema types use:
+
+```ruby
+require 'shale'
+require 'shale/schema'
+
+class MyEmailType < Shale::Type::Value
+  ...
+end
+
+class MyEmailJSONType < Shale::Schema::JSON::Base
+  def as_type
+    { 'type' => 'string', 'format' => 'email' }
+  end
+end
+
+Shale::Schema::JSON.register_json_type(MyEmailType, MyEmailJSONType)
+```
+
+### Generating XML Schema
+
+To generate XML Schema from your Shale data model use:
+
+```ruby
+require 'shale/schema'
+
+Shale::Schema.to_xml(Person, pretty: true)
+
+# =>
+#
+# {
+#   'schema0.xsd' => '
+#     <xs:schema
+#       elementFormDefault="qualified"
+#       attributeFormDefault="qualified"
+#       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+#       xmlns:foo="http://foo.com"
+#     >
+#       <xs:import namespace="http://foo.com" schemaLocation="schema1.xsd"/>
+#       <xs:element name="person" type="Person"/>
+#       <xs:complexType name="Person">
+#         <xs:sequence>
+#           <xs:element name="name" type="xs:string" minOccurs="0"/>
+#           <xs:element ref="foo:address" minOccurs="0"/>
+#         </xs:sequence>
+#       </xs:complexType>
+#     </xs:schema>',
+#
+#   'schema1.xsd' => '
+#     <xs:schema
+#       elementFormDefault="qualified"
+#       attributeFormDefault="qualified"
+#       targetNamespace="http://foo.com"
+#       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+#       xmlns:foo="http://foo.com"
+#     >
+#       <xs:element name="address" type="foo:Address"/>
+#       <xs:complexType name="Address">
+#         <xs:sequence>
+#           <xs:element name="city" type="xs:string" minOccurs="0"/>
+#         </xs:sequence>
+#       </xs:complexType>
+#     </xs:schema>'
+# }
+```
+
+You can also use a command line tool to do it:
+
+```
+$ shaleb -i data_model.rb -c Person -p -f xml
+```
+
+If you want to convert your own types to XML Schema types use:
+
+```ruby
+require 'shale'
+require 'shale/schema'
+
+class MyEmailType < Shale::Type::Value
+  ...
+end
+
+Shale::Schema::XML.register_xml_type(MyEmailType, 'myEmailXMLType')
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/kgiszczak/shale.

data/exe/shaleb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'optparse'
+
+base_path = File.expand_path('../lib', __dir__)
+
+if File.exist?(base_path)
+  require_relative '../lib/shale/schema'
+else
+  require 'shale/schema'
+end
+
+params = {}
+
+ARGV << '-h' if ARGV.empty?
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: shaleb [options]\nexample: shaleb -i data_model.rb -c MyRoot"
+
+  opts.on('-i INPUT', '--input', 'Input file')
+  opts.on('-o OUTPUT', '--output', 'Output file (defaults to STDOUT)')
+  opts.on('-c CLASS', '--class CLASS', 'Shale model class name')
+  opts.on('-f FORMAT', '--format FORMAT', 'Schema format: JSON (default), XML')
+  opts.on('-p', '--pretty', 'Pretty print generated schema')
+
+  opts.on('-v', '--version', 'Show version') do
+    puts "shaleb version #{Shale::VERSION}"
+    exit
+  end
+end.parse!(into: params)
+
+input_path = File.expand_path(params[:input], Dir.pwd)
+
+unless File.exist?(input_path)
+  puts "File '#{input_path}' does not exist"
+  exit
+end
+
+unless params[:class]
+  puts 'Model class is required'
+  exit
+end
+
+require input_path
+
+klass = Object.const_get(params[:class])
+
+if params[:format] == 'xml'
+  if params[:output]
+    base_name = File.basename(params[:output], File.extname(params[:output]))
+    schemas = Shale::Schema.to_xml(klass, base_name, pretty: params[:pretty])
+
+    schemas.map do |name, xml|
+      File.write(File.expand_path(name, Dir.pwd), xml)
+    end
+  else
+    schemas = Shale::Schema.to_xml(klass, pretty: params[:pretty])
+
+    output = schemas.map do |name, xml|
+      "<!-- #{name} -->\n#{xml}\n"
+    end.join("\n")
+
+    puts output
+  end
+else
+  schema = Shale::Schema.to_json(klass, pretty: params[:pretty])
+
+  if params[:output]
+    output_path = File.expand_path(params[:output], Dir.pwd)
+    File.write(output_path, schema)
+  else
+    puts schema
+  end
+end

data/lib/shale/adapter/json.rb

@@ -22,12 +22,17 @@ module Shale
       # Serialize Hash into JSON
       #
       # @param [Hash] obj Hash object
+      # @param [Array<Symbol>] options
       #
       # @return [String]
       #
       # @api private
-      def self.dump(obj)
-        ::JSON.generate(obj)
+      def self.dump(obj, *options)
+        if options.include?(:pretty)
+          ::JSON.pretty_generate(obj)
+        else
+          ::JSON.generate(obj)
+        end
       end
     end
   end

data/lib/shale/adapter/nokogiri.rb

@@ -26,12 +26,29 @@ module Shale
       # Serialize Nokogiri document into XML
       #
       # @param [::Nokogiri::XML::Document] doc Nokogiri document
+      # @param [Array<Symbol>] options
       #
       # @return [String]
       #
       # @api private
-      def self.dump(doc)
-        doc.to_xml
+      def self.dump(doc, *options)
+        save_with = ::Nokogiri::XML::Node::SaveOptions::AS_XML
+
+        if options.include?(:pretty)
+          save_with |= ::Nokogiri::XML::Node::SaveOptions::FORMAT
+        end
+
+        unless options.include?(:declaration)
+          save_with |= ::Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
+        end
+
+        result = doc.to_xml(save_with: save_with)
+
+        unless options.include?(:pretty)
+          result = result.sub(/\n/, '')
+        end
+
+        result
       end
 
       # Create Shale::Adapter::Nokogiri::Document instance
@@ -45,18 +62,27 @@ module Shale
       #
       # @api private
       class Document
+        # Initialize object
+        #
+        # @api private
+        def initialize
+          @doc = ::Nokogiri::XML::Document.new
+          @namespaces = {}
+        end
+
         # Return Nokogiri document
         #
         # @return [::Nokogiri::XML::Document]
         #
         # @api private
-        attr_reader :doc
+        def doc
+          if @doc.root
+            @namespaces.each do |prefix, namespace|
+              @doc.root.add_namespace(prefix, namespace)
+            end
+          end
 
-        # Initialize object
-        #
-        # @api private
-        def initialize
-          @doc = ::Nokogiri::XML::Document.new
+          @doc
         end
 
         # Create Nokogiri element
@@ -70,6 +96,16 @@ module Shale
           ::Nokogiri::XML::Element.new(name, @doc)
         end
 
+        # Add XML namespace to document
+        #
+        # @param [String] prefix
+        # @param [String] namespace
+        #
+        # @api private
+        def add_namespace(prefix, namespace)
+          @namespaces[prefix] = namespace if prefix && namespace
+        end
+
         # Add attribute to Nokogiri element
         #
         # @param [::Nokogiri::XML::Element] element Nokogiri element
@@ -115,7 +151,7 @@ module Shale
           @node = node
         end
 
-        # Return fully qualified name of the node in the format of
+        # Return name of the node in the format of
         # namespace:name when the node is namespaced or just name when it's not
         #
         # @return [String]
@@ -124,11 +160,11 @@ module Shale
         #   node.name # => Bar
         #
         # @example with namespace
-        #   node.name # => foo:Bar
+        #   node.name # => http://foo:Bar
         #
         # @api private
         def name
-          [@node.namespace&.prefix, @node.name].compact.join(':')
+          [@node.namespace&.href, @node.name].compact.join(':')
         end
 
         # Return all attributes associated with the node
@@ -138,7 +174,7 @@ module Shale
         # @api private
         def attributes
           @node.attribute_nodes.each_with_object({}) do |node, hash|
-            name = [node.namespace&.prefix, node.name].compact.join(':')
+            name = [node.namespace&.href, node.name].compact.join(':')
             hash[name] = node.value
           end
         end

data/lib/shale/adapter/ox.rb

@@ -22,12 +22,24 @@ module Shale
       # Serialize Ox document into XML
       #
       # @param [::Ox::Document, ::Ox::Element] doc Ox document
+      # @param [Array<Symbol>] options
       #
       # @return [String]
       #
       # @api private
-      def self.dump(doc)
-        ::Ox.dump(doc)
+      def self.dump(doc, *options)
+        opts = { indent: -1, with_xml: false }
+
+        if options.include?(:pretty)
+          opts[:indent] = 2
+        end
+
+        if options.include?(:declaration)
+          doc[:version] = '1.0'
+          opts[:with_xml] = true
+        end
+
+        ::Ox.dump(doc, opts).sub(/\A\n/, '')
       end
 
       # Create Shale::Adapter::Ox::Document instance
@@ -66,6 +78,18 @@ module Shale
           ::Ox::Element.new(name)
         end
 
+        # Add XML namespace to document
+        #
+        # Ox doesn't support XML namespaces so this method does nothing.
+        #
+        # @param [String] prefix
+        # @param [String] namespace
+        #
+        # @api private
+        def add_namespace(prefix, namespace)
+          # :noop:
+        end
+
         # Add attribute to Ox element
         #
         # @param [::Ox::Element] element Ox element
@@ -111,8 +135,8 @@ module Shale
           @node = node
         end
 
-        # Return fully qualified name of the node in the format of
-        # namespace:name when the node is namespaced or just name when it's not
+        # Return name of the node in the format of
+        # prefix:name when the node is namespaced or just name when it's not
         #
         # @return [String]
         #