druzy-mvc 1.3.1.1 → 1.4.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e7ddf306fddcdb9f82844e2d03065d0205f09ef7
4
- data.tar.gz: 2cefa84f7d77623f19783489febe1092df8b756c
3
+ metadata.gz: 207110a3d37aada391bc0f741dcd5b73aa306ef2
4
+ data.tar.gz: c4fa1aa304948d5dd311b5cd6c74cdae13773e11
5
5
  SHA512:
6
- metadata.gz: badf2b0f1747cce261c679f416e18484e92df5d5048db619976ea3e77f736a6c2c26fae4ec792577f07dbb92ae7a5ac12edee7ef1524f4d72c4de3a3e4f51670
7
- data.tar.gz: 6eb841208c201b55f31b12f5bf46c1916b74ccde4cbe27d99ffe18d5a40a1fd490b0d413ac6070f14ee2e340ab48eb6fdae4100639a399fb593e808e5fe41be7
6
+ metadata.gz: 9aba1b18bf626981a0fe5742d3547c9e624c722930ba382ec1642b7b7fcb9eccb34b08329c54e272a6d9067203ba33c631200dee802bd9cdd8cf781d1093c6e6
7
+ data.tar.gz: dd5da193e6de1fc74d7c11b2a1b15c96bc4b5542244e25e3d859da458c04206e85cc584eafa722e23f9d0ddc878999a90d48f676e38d78c9e899b2801afd80fc
@@ -1,7 +1,7 @@
1
1
  require_relative '../mvc'
2
2
 
3
- require 'json'
4
3
  require 'open3'
4
+ require 'xmlsimple'
5
5
 
6
6
  module Druzy
7
7
  module MVC
@@ -16,13 +16,14 @@ module Druzy
16
16
  @stdin , @stdout, @sterr = Open3.popen3('java -cp '+@dir_java+' '+@name_java_class)
17
17
 
18
18
  Thread.new do
19
- hash = JSON.parse(@stdout.gets)
20
- while hash['action'] != 'exit' do
21
- hash['kwargs'] ||= {}
19
+ hash = XmlSimple.xml_in(@stdout.gets, :ForceArray = false, :KeyToSymbol => true)
20
+
21
+ while hash[:action] != 'exit' do
22
+ hash[:kwargs] ||= {}
22
23
  Thread.new do
23
- @controller.notify_action(self,hash['action'].to_sym,hash['kwargs'])
24
+ @controller.notify_action(self,hash[:action],hash[:kwargs])
24
25
  end
25
- hash = JSON.parse(@stdout.gets)
26
+ hash = XmlSimple.xml_in(@stdout.gets, :ForceArray = false, :KeyToSymbol => true)
26
27
  end
27
28
  @stdin.close
28
29
  @sterr.close
@@ -31,11 +32,11 @@ module Druzy
31
32
  end
32
33
 
33
34
  def display
34
- @stdin.puts({:action => 'display'}.to_json)
35
+ @stdin.puts(XmlSimple.xml_out({:action => 'display'}, :RootName => 'root', :AttrPrefix => true, :NoIndent => true))
35
36
  end
36
37
 
37
38
  def close
38
- @stdin.puts({:action => 'exit'}.to_json)
39
+ @stdin.puts(XmlSimple.xml_out({:action => 'exit'}, :RootName => 'root', :AttrPrefix => true, :NoIndent => true))
39
40
  end
40
41
 
41
42
  end
@@ -1,5 +1,5 @@
1
1
  module Druzy
2
2
  module MVC
3
- VERSION = "1.3.1.1"
3
+ VERSION = "1.4.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,15 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: druzy-mvc
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1.1
4
+ version: 1.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Le Greneur
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-09 00:00:00.000000000 Z
11
+ date: 2017-02-10 00:00:00.000000000 Z
12
12
  dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: xml-simple
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - '='
18
+ - !ruby/object:Gem::Version
19
+ version: 1.1.5
20
+ type: :runtime
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - '='
25
+ - !ruby/object:Gem::Version
26
+ version: 1.1.5
13
27
  - !ruby/object:Gem::Dependency
14
28
  name: bundler
15
29
  requirement: !ruby/object:Gem::Requirement