desmoservice 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53601aca065853e7d08dd36b56eb2d752ef83cde
-  data.tar.gz: 8a95a90928090db6a8c5f698157dce99d29284df
+  metadata.gz: c1c3e6944ff6ae401ffcab53b2f0b2532e9d9b13
+  data.tar.gz: f86922c7995c9e9edbad514971b79f0882bb0e97
 SHA512:
-  metadata.gz: 237d9771944a2d164210e4ea116cfe19344c8f88710bdc62dc8d04aa9add3b119d4214d20f926a7e57d6adc6bdea3458c18470fa261fae472084fbec76132b15
-  data.tar.gz: 65986d9863b939bdb97716380fbb241642cfd1fa5d558ff6ce854fe602a46f2554c96e008ce42bab857c122399100e2e6dd822ad592e70361e29d824a18da1ad
+  metadata.gz: 76da1504d2b654f262cc91d1ecb03e02dfd9558b554fe752629bea7d8b1748a2e6a786a0ba305f8d1efcdb40f21ad7bfc05597c74b0486ba54df93eb4694d6fd
+  data.tar.gz: 3131af34125ef66347323ed720ffbcc78774ad2d7d532565db4e52ad95a7ca1770564f1e5d595ac1c0a7e225082dd912acecfc3e3d42bdcb519e21111234a2fa

data/desmoservice.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'desmoservice'
-  s.version     = '0.1.0'
-  s.date        = '2015-09-23'
+  s.version     = '0.1.1'
+  s.date        = '2015-09-25'
   s.license     = 'Ruby'
   s.summary     = 'Read and write access to Desmoservice API'
   s.description = 'Manage the connection to Desmoservice server, convert JSON to ruby objects and build XML for edition'

data/lib/desmoservice.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'json'
 require_relative 'conf'
+require_relative 'error'
 require_relative 'families'
 require_relative 'ventilation'
 require_relative 'term'

data/lib/edition.rb

@@ -21,6 +21,15 @@ class Edition
     @xml << '</lienhierarchique-creation>'
   end
   
+  #arg peut être un entier (id) ou une chaine (localkey)
+  def remove_ligature(inferior_arg=nil)
+    @xml << '<lienhierarchique-remove'
+    Edition.to_attribute(@xml, inferior_arg, 'fils')
+    @xml << '>'
+    yield(LigatureEdit.new(@xml))
+    @xml << '</lienhierarchique-remove>'
+  end
+  
   def change_term(term_arg)
     @xml << '<terme-change'
     Edition.to_attribute(@xml, term_arg)

data/lib/error.rb

@@ -0,0 +1,15 @@
+module Desmoservice
+class Error
+  attr_reader :key, :parameter, :value
+  
+  def initialize(key, parameter = nil, value = nil)
+    @key = key
+    @parameter = parameter
+    @value = value
+  end
+
+  def self.from_json_hash(json_hash)
+    Error.new(json_hash['key'], json_hash['parameter'], json_hash['value'])
+  end
+end
+end

data/lib/get_params.rb

@@ -1,8 +1,8 @@
 module Desmoservice
 class GetParams
 
-  attr_accessor :with_keys, :with_attrs,
-      :family_filter,
+  attr_accessor :with_keys, :with_attrs, :with_parent,
+      :family_filter, :inferiors_only,
       :ventilation_root_id, :ventilation_root_uri, :ventilation_name,
       :ignore_empty_sectors
       
@@ -14,6 +14,7 @@ class GetParams
     @ventilation_root_uri = nil
     @ignore_empty_sectors = nil
     @ventilation_name = 'ventilation:naturelle'
+    @inferiors_only = false
   end
   
   def to_h(type)
@@ -22,14 +23,21 @@ class GetParams
     fields = 'libelles,famille-color'
     fields += ',idctxt,iddesc,grille-name' if @with_keys
     fields += ',attrs' if @with_attrs
+    fields += ',famille-code,parent-code' if @with_parent
+    fields += ',famille-idctxt,parent-idctxt' if (@with_parent and @with_keys)
     result['fields'] = fields
     if not @family_filter.nil?
       if type == 'ventilation'
-        options['conf:limitation.familles.idctxtarray'] = @family_filter
+        result['conf:limitation.familles'] = 'true'
+        result['conf:limitation.familles.idctxtarray'] = @family_filter
       else
         result['selection_idctxt'] = @family_filter
       end
     end
+    if @inferiors_only
+      result['conf:limitation.liens'] = 'true'
+      result['conf:limitation.liens.typearray'] = 'lh_av'
+    end
     if not @ignore_empty_sectors.nil?
       if @ignore_empty_sectors
         result['conf:ignore.empty.secteur'] = 'true'

data/lib/sector.rb

@@ -6,12 +6,26 @@ class Sector < Term
   
   def initialize(data)
     super(data['terme'])
+    @subsectors = Array.new
     @members = Array.new
     if data.has_key?('liaisonArray')
       data['liaisonArray'].each {|v| @members << SectorTerm.new(v)}
     end
   end
   
+  def get_subsector_by_id(id)
+    subsectors.each do |subsector|
+      if subsector.id == id
+        return subsector
+      end
+      subsubsector = subsector.get_subsector_by_id(id)
+      if not subsubsector.nil?
+        return subsubsector
+      end
+    end
+    return nil
+  end
+  
 end
 
 class SectorTerm < Term

data/lib/term.rb

@@ -1,7 +1,7 @@
 module Desmoservice
 
 class Term
-  attr_reader :id, :localkey, :text, :color, :attrs
+  attr_reader :id, :localkey, :text, :color, :attrs, :parent_id, :parent_localkey
   
   def initialize(data)
     @id = data['code']
@@ -26,6 +26,18 @@ class Term
     if data.has_key?('attrs')
       @attrs = data['attrs']
     end
+    @parent_id = nil
+    if data.has_key?('parentCode')
+      @parent_id = data['parentCode'].to_i
+    elsif data.has_key?('familleCode')
+      @parent_id = data['familleCode'].to_i
+    end
+    @parent_localkey = nil
+    if data.has_key?('parentCode')
+      @parent_localkey = data['parentIdctxt']
+    elsif data.has_key?('familleCode')
+      @parent_localkey = data['familleIdctxt']
+    end
   end
   
   def localkey?

data/lib/ventilation.rb

@@ -1,7 +1,7 @@
 module Desmoservice
 class Ventilation
   
-  attr_reader :root, :sectors
+  attr_reader :root, :sectors, :error
   
   def initialize
     @sectors = Array.new
@@ -10,6 +10,7 @@ class Ventilation
   def parse_json(json_string)
     data = JSON.parse(json_string)
     if data.has_key?('ventilation')
+      @error = nil
       ventilation = data['ventilation']
       if ventilation.has_key?('secteurArray')
         ventilation['secteurArray'].each {|v| @sectors << Sector.new(v)}
@@ -17,8 +18,32 @@ class Ventilation
       if ventilation.has_key?('root')
         @root  = Term.new(ventilation['root'])
       end
+    else 
+      if data.has_key?('error')
+        @error = Error.from_json_hash(data['error'])
+      else
+        @error = Error.new("responseError", "response", json_string)
+      end
     end
   end
+  
+  def has_error?
+    return (not error.nil?)
+  end
+  
+  def get_sector_by_id(id)
+    @sectors.each do |sector|
+      if sector.id == id
+        return sector
+      end
+      subsector = sector.get_subsector_by_id(id)
+      if not subsector.nil?
+        return subsector
+      end
+    end
+    return nil
+  end
+  
 end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desmoservice
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Vincent Calame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Manage the connection to Desmoservice server, convert JSON to ruby objects
   and build XML for edition
@@ -29,6 +29,7 @@ files:
 - lib/log_handler.rb
 - lib/desmoservice.rb
 - lib/sector.rb
+- lib/error.rb
 - lib/post.rb
 - lib/word_distribution.rb
 - LICENSE