desmoservice 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18592e41ee622239d6903779ffb2e3b1d380780
-  data.tar.gz: 75691f636a3a99a54fa005be1464d2db310b4e96
+  metadata.gz: 1b32465201fa7ff2a57da0df7cb1eadd2fe50826
+  data.tar.gz: 70579bf743f4bcee48d4180a332f01c306f4560b
 SHA512:
-  metadata.gz: ab1a95e4776cc417f515c9a54f35258d38b15ca3f26f5448e94b1be2c4919f6324e817644b4d30da5427c021c6683a1842a68fe436c2391630ce0ff61206846b
-  data.tar.gz: ea698075b4a1d8205dcdfda99db6aef288df7e0e89b48e28b5551cd1bd48d10be37340ce530ed2729af2da93d6a8c158e2755c28b70e2a18949df3b31e3175bf
+  metadata.gz: 78cec09e1583d2b4200fdd7901283d8eb7e6775e62c080e65dd1f5b9f2794450e31c4994e690972781b50b53fe656450f25a61b4f2f37e5b667928814ee379a0
+  data.tar.gz: 30759e51ce7903b992269c3af062c7859d547fe2232f52fe2f0f5f3001420f22ee42e8cd4f5057a906f5d2eef2a509cf9c77f6248dac49af5f6e9565e871b6bc

data/desmoservice.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'desmoservice'
-  s.version     = '0.2.1'
-  s.date        = '2015-11-09'
+  s.version     = '0.2.2'
+  s.date        = '2016-02-09'
   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/get.rb

@@ -4,7 +4,7 @@ class Get
   def initialize
   end
   
-  def self.families(desmoservice_conf, get_params, http=nil)
+  def self.families(desmoservice_conf, get_params, http: nil, log_handler: nil)
     options = get_params.to_h('familles')
     uri = desmoservice_conf.build_json_uri(options)
     if http.nil?
@@ -16,10 +16,15 @@ class Get
     end
     families = Families.new()
     families.parse_json(json_string)
+    if not log_handler.nil?
+      log_handler.add_log_message(uri.to_s)
+      log_handler.add_log_message(json_string.force_encoding("UTF-8"))
+      log_handler.new_line()
+    end
     return families
   end
   
-  def self.ventilation(desmoservice_conf, get_params, http=nil)
+  def self.ventilation(desmoservice_conf, get_params, http: nil, log_handler: nil)
     options = get_params.to_h('ventilation')
     uri = desmoservice_conf.build_json_uri(options)
     if http.nil?
@@ -31,10 +36,15 @@ class Get
     end
     ventilation = Ventilation.new()
     ventilation.parse_json(json_string)
+    if not log_handler.nil?
+      log_handler.add_log_message(uri.to_s)
+      log_handler.add_log_message(json_string.force_encoding("UTF-8"))
+      log_handler.new_line()
+    end
     return ventilation
   end
   
-  def self.word_distribution(desmoservice_conf, get_params, http=nil)
+  def self.word_distribution(desmoservice_conf, get_params, http: nil, log_handler: nil)
     options = get_params.to_h('lexiedistribution')
     uri = desmoservice_conf.build_json_uri(options)
     if http.nil?
@@ -46,10 +56,15 @@ class Get
     end
     word_distribution = WordDistribution.new()
     word_distribution.parse_json(json_string)
+    if not log_handler.nil?
+      log_handler.add_log_message(uri.to_s)
+      log_handler.add_log_message(json_string.force_encoding("UTF-8"))
+      log_handler.new_line()
+    end
     return word_distribution
   end
   
-  def self.terms(desmoservice_conf, get_params, http=nil)
+  def self.terms(desmoservice_conf, get_params, http: nil, log_handler: nil)
     options = get_params.to_h('terms')
     uri = desmoservice_conf.build_json_uri(options)
     if http.nil?
@@ -61,6 +76,11 @@ class Get
     end
     terms = Terms.new()
     terms.parse_json(json_string)
+    if not log_handler.nil?
+      log_handler.add_log_message(uri.to_s)
+      log_handler.add_log_message(json_string.force_encoding("UTF-8"))
+      log_handler.new_line()
+    end
     return terms
   end
   

data/lib/log_handler.rb

@@ -10,6 +10,10 @@ class LogHandler
   def add_log_message(log_message)
     destination << log_message << "\n"
   end
+  
+  def new_line()
+    destination << "\n"
+  end
 
 end
 

data/lib/post.rb

@@ -6,7 +6,7 @@ class Post
   def initialize
   end
   
-  def self.xml(desmoservice_conf, xml, log_handler=nil, http=nil)
+  def self.xml(desmoservice_conf, xml, http: nil, log_handler: nil)
     uri = desmoservice_conf.build_edition_uri
     if http.nil?
       response = Net::HTTP.post_form(uri, 'desmo' => desmoservice_conf.desmo_name, 'xml' => xml)

data/lib/term.rb

@@ -33,9 +33,9 @@ class Term
       @parent_id = data['familleCode'].to_i
     end
     @parent_localkey = nil
-    if data.has_key?('parentCode')
+    if data.has_key?('parentIdctxt')
       @parent_localkey = data['parentIdctxt']
-    elsif data.has_key?('familleCode')
+    elsif data.has_key?('familleIdctxt')
       @parent_localkey = data['familleIdctxt']
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desmoservice
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Vincent Calame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies: []
 description: Manage the connection to Desmoservice server, convert JSON to ruby objects
   and build XML for edition
@@ -18,7 +18,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README
-- desmoservice-0.2.0.gem
 - lib/ventilation.rb
 - lib/get.rb
 - lib/conf.rb