relaton-iso-bib 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7186f4c94d9264e4c612ee7f6b78d89186de54e
-  data.tar.gz: 883a9686aeb8bc30b808643c9f20ad142f5d2695
+  metadata.gz: 637ffa327aa126a02134f1bb84d39f2dc431b42e
+  data.tar.gz: dccdaced7cd3ad6ec9a6ca863c3f64bf2e6d64c7
 SHA512:
-  metadata.gz: a495890926f73ab84695d8731808090e15b9b0f78e9ebea55b5ab5128cb1e6e8f4cf14a1f2450007454dbd9ba617203082f71b041c69a6df7da1de9a76fffbd7
-  data.tar.gz: f6f2ede12ef37216211f7d653295909e0b59af1485a23c4710f3f9a7aced71352c0c4043daaafb43241dd4ad2bd0e846a4213baba1c7a6abee4aecae0e41fc5c
+  metadata.gz: fe9f3b30ceb708660084d33fde87934c3f42446d97a6aa15fc8fbd6baf3bf02ac4e3e5cd1c31d378d504fdfba3f16ece1d24b1b91d4366827721950100908d36
+  data.tar.gz: 2cdb6f97d9377e6e08061b97cb931bb04851abd162f1411dc570ff02651e95333bdad4c0df63dbc7ff37cad608c76a57f61a45313ec1fe80727ec175838da800

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-iso-bib (0.3.2)
+    relaton-iso-bib (0.3.3)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
@@ -24,7 +24,7 @@ GEM
     json (2.2.0)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -34,7 +34,7 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.3.2)
+    relaton-bib (0.3.4)
       addressable
       nokogiri (~> 1.10)
     rspec (3.8.0)

data/lib/relaton_iso_bib/editorial_group.rb

@@ -6,13 +6,13 @@ module RelatonIsoBib
     # @return [Array<RelatonIsoBib::IsoSubgroup>]
     attr_reader :technical_committee
 
-    # @return [RelatonIsoBib::IsoSubgroup]
+    # @return [Array<RelatonIsoBib::IsoSubgroup>]
     attr_reader :subcommittee
 
-    # @return [RelatonIsoBib::IsoSubgroup]
+    # @return [Array<RelatonIsoBib::IsoSubgroup>]
     attr_reader :workgroup
 
-    # @return [String]
+    # @return [String, NilClass]
     attr_reader :secretariat
 
     # @param technical_committee [Array<Hash, RelatonIsoBib::IsoSubgroup>]
@@ -44,7 +44,7 @@ module RelatonIsoBib
       @secretariat = args[:secretariat]
     end
 
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
@@ -63,7 +63,16 @@ module RelatonIsoBib
         builder.secretariat secretariat if secretariat
       end
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+    # @return [Hash]
+    def to_hash
+      hash = { technical_committee: technical_committee.map(&:to_hash) }
+      hash[:subcommittee] = subcommittee.map(&:to_hash) if subcommittee&.any?
+      hash[:workgroup] = workgroup.map(&:to_hash) if workgroup&.any?
+      hash[:secretariat] = secretariat if secretariat
+      hash
+    end
   end
 
   # ISO subgroup.
@@ -92,5 +101,13 @@ module RelatonIsoBib
       builder.parent[:type] = type if type
       builder.text name
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { name: name }
+      hash[:type] = type if type
+      hash[:number] = number if number
+      hash
+    end
   end
 end

data/lib/relaton_iso_bib/hash_converter.rb

@@ -44,23 +44,51 @@ module RelatonIsoBib
 
       private
 
+      #
+      # Ovverides superclass's method
+      #
+      # @param ret [Hash]
       def title_hash_to_bib(ret)
         return unless ret[:title]
 
         ret[:title] = array(ret[:title])
-        ret[:title] = ret[:title].map do |t|
-          titleparts = {}
-          titleparts = split_title(t) unless t.is_a?(Hash)
-          if t.is_a?(Hash) && t[:content]
-            titleparts = split_title(t[:content], t[:language], t[:script])
-          end
-          if t.is_a?(Hash) then t.merge(titleparts)
-          else
-            { content: t, language: "en", script: "Latn", format: "text/plain", type: "main" }
+        ret[:title] = ret[:title].reduce([]) do |a, t|
+          if t.is_a?(String)
+            a << split_title(t)
+          elsif t.is_a?(Hash) && t[:type]
+            idx = a.index { |i| i[:language] == t[:language] }
+            title_key = t[:type].sub("-", "_").to_sym
+            if idx
+              a[idx][title_key] = t[:content]
+              a
+            else
+              a << { title_key => t[:content], language: t[:language], script: t[:script] }
+            end
+          elsif t.is_a?(Hash) && t[:content]
+            a << split_title(t[:content], t[:language], t[:script])
           end
         end
       end
 
+      #
+      # Ovverides superclass's method
+      #
+      # @param item [Hash]
+      # @retirn [RelatonIsoBib::IsoBibliographicItem]
+      def bib_item(item)
+        IsoBibliographicItem.new(item)
+      end
+
+      #
+      # Ovverides superclass's method
+      #
+      # @param title [Hash]
+      # @return [RelatonIsoBib::TypedTitleString]
+      def typed_title_strig(title)
+        TypedTitleString.new title
+      end
+
+      # @param ret [Hash]
       def editorialgroup_hash_to_bib(ret)
         eg = ret[:editorialgroup]
         return unless eg
@@ -73,12 +101,14 @@ module RelatonIsoBib
         )
       end
 
+      # @param ret [Hash]
       def ics_hash_to_bib(ret)
         ret[:ics] = ret.fetch(:ics, []).map do |ics|
           ics[:code] ? Ics.new(ics[:code]) : Ics.new(ics)
         end
       end
 
+      # @param ret [Hash]
       def structuredidentifier_hash_to_bib(ret)
         return unless ret[:structuredidentifier]
 

data/lib/relaton_iso_bib/ics.rb

@@ -10,7 +10,7 @@ module RelatonIsoBib
         raise ArgumentError, "wrong arguments (should be string or { fieldcode: [String] }"
       end
 
-      field, group, subgroup = code.split '.' if code
+      field, group, subgroup = code.split "." if code
       super fieldcode: field, groupcode: group, subgroupcode: subgroup
     end
 
@@ -21,5 +21,12 @@ module RelatonIsoBib
         builder.text_ description
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:code] = code if code
+      hash
+    end
   end
-end
+end

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -125,8 +125,8 @@ module RelatonIsoBib
     # @raise [ArgumentError]
     def initialize(**args)
       check_type args[:type]
-      #check_language args.fetch(:language, [])
-      #check_script args.fetch(:script, [])
+      # check_language args.fetch(:language, [])
+      # check_script args.fetch(:script, [])
 
       super_args = args.select do |k|
         %i[id docnumber language script docstatus date abstract contributor
@@ -245,25 +245,35 @@ module RelatonIsoBib
       end
     end
 
+    # @return [Hash]
+    def to_hash
+      hash = super
+      hash[:editorialgroup] = editorialgroup.to_hash if editorialgroup
+      hash[:ics] = ics.map(&:to_hash) if ics&.any?
+      hash[:structuredidentifier] = structuredidentifier.to_hash if structuredidentifier
+      hash[:type] = doctype if doctype
+      hash
+    end
+
     private
 
     # @param language [Array<String>]
     # @raise ArgumentError
-    def check_language(language)
-      language.each do |lang|
-        unless %w[en fr].include? lang
-          raise ArgumentError, "invalid language: #{lang}"
-        end
-      end
-    end
+    # def check_language(language)
+    #   language.each do |lang|
+    #     unless %w[en fr].include? lang
+    #       raise ArgumentError, "invalid language: #{lang}"
+    #     end
+    #   end
+    # end
 
     # @param script [Array<String>]
     # @raise ArgumentError
-    def check_script(script)
-      script.each do |scr|
-        raise ArgumentError, "invalid script: #{scr}" unless scr == "Latn"
-      end
-    end
+    # def check_script(script)
+    #   script.each do |scr|
+    #     raise ArgumentError, "invalid script: #{scr}" unless scr == "Latn"
+    #   end
+    # end
 
     # @param script [String]
     # @raise ArgumentError

data/lib/relaton_iso_bib/structured_identifier.rb

@@ -26,7 +26,7 @@ module RelatonIsoBib
       @project_number = args[:project_number]
       @part = args[:part]
       @subpart = args[:subpart]
-      @prefix = args[:prefix]
+      # @prefix = args[:prefix]
       @type = args[:type]
     end
 
@@ -67,5 +67,16 @@ module RelatonIsoBib
       end
       xml[:type] = type if type
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = {}
+      hash[:tc_document_number] = tc_document_number if tc_document_number
+      hash[:project_number] = project_number if project_number
+      hash[:part] = part if part
+      hash[:subpart] = subpart if subpart
+      hash[:type] = type if type
+      hash
+    end
   end
 end

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler