xml2json 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c99a07dc793e5b44c80d5b881da7bb9928f00e75
-  data.tar.gz: 59f76e15d40e937517a4410658923dbc4ab82fb4
+  metadata.gz: 21d104b9244a5fb10324e6682a639c7a067e0b42
+  data.tar.gz: bbdb5b6fd3edad22b522ee7e73c1b9f4829f139d
 SHA512:
-  metadata.gz: 207b147d1b2da7b38458f41f69ee154d7447dacc373fc83255c1506b61036c6c4ea48741d7004eeaa97851eacc1729d9f9df59bd6e31f4721500d86354c791dd
-  data.tar.gz: d9f4cf5219d558eae10e83cb5c7c3782fe8f73a1a574ba6a9d6f8cc1efd711401dc35aa95971844dbe58fa4136662daa450529d3c4f349170bc6ce4be605daca
+  metadata.gz: a6fc5074758d79c43bf7ea43fb1116736a2209362cae89f0c78cd06ba032ddd3fe80acee8edb9584cab08e32744a25b15ec23f98f915d36e9421f71ad54dc75e
+  data.tar.gz: 4ed364926a5fc79574412bf5fcedebc4aa18b3242be82b95d1a359135ec318f4da5f011edd656f8b693357291d2fab122715f9937b3d790b199366fd748bf267

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.2

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1.1
+  - 2.1.0
+  - 2.0.0

data/README.md

@@ -1,6 +1,6 @@
 # xml2json
 
-[![Code Climate](https://codeclimate.com/github/monksoftware/xml2json.png)](https://codeclimate.com/github/monksoftware/xml2json) [![Gem Version](https://badge.fury.io/rb/xml2json.svg)](http://badge.fury.io/rb/xml2json)
+[![Code Climate](https://codeclimate.com/github/monksoftware/xml2json.png)](https://codeclimate.com/github/monksoftware/xml2json) [![Gem Version](https://badge.fury.io/rb/xml2json.svg)](http://badge.fury.io/rb/xml2json) [![Dependency Status](https://gemnasium.com/monksoftware/xml2json.svg)](https://gemnasium.com/monksoftware/xml2json) [![Build Status](https://travis-ci.org/monksoftware/xml2json.svg?branch=master)](https://travis-ci.org/monksoftware/xml2json)
 
 Transforms XML into JSON
 

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => [:spec]

data/lib/xml2json.rb

@@ -1,6 +1,7 @@
 require 'nokogiri'
 require 'json'
 require 'active_support/inflector'
+require_relative './xml2json/configuration'
 
 module XML2JSON
   class InvalidXML < StandardError; end
@@ -47,7 +48,7 @@ module XML2JSON
 
       if hash.has_key?(key)
         node_to_nodes!(hash, child)
-        hash.delete(key)
+        hash.delete(key) unless key == pluralized_key
         hash[pluralized_key] << parse_node(child)
       else
         if hash.has_key?(pluralized_key)
@@ -81,16 +82,6 @@ module XML2JSON
     end
   end
 
-  class Configuration
-    attr_accessor :attributes_key, :namespaces_key, :text_key
-
-    def initialize
-      self.attributes_key = '_attributes'
-      self.namespaces_key = '_namespaces'
-      self.text_key = '_text'
-    end
-  end
-
   def self.configuration
     @configuration ||= Configuration.new
   end

data/lib/xml2json/configuration.rb

@@ -0,0 +1,9 @@
+class Configuration
+  attr_accessor :attributes_key, :namespaces_key, :text_key
+
+  def initialize
+    self.attributes_key = '_attributes'
+    self.namespaces_key = '_namespaces'
+    self.text_key = '_text'
+  end
+end

data/lib/xml2json/version.rb

@@ -1,3 +1,3 @@
 module XML2JSON
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/xml2json_spec.rb

@@ -41,19 +41,19 @@ describe XML2JSON do
     end
 
     it "handles multiple elements" do
-      xml = '<a><x><b>Primo</b><b>Secondo</b></x></a>'
+      xml = '<a><x><b>First</b><b>Second</b></x></a>'
       expect(XML2JSON.parse_to_hash(xml)).to(
-        eq({ "a" => { "x" => { "bs" => [ "Primo", "Secondo" ] } } })
+        eq({ "a" => { "x" => { "bs" => [ "First", "Second" ] } } })
       )
 
-      xml = '<a><b><x>Primo</x></b><b><x>Secondo</x></b></a>'
+      xml = '<a><b><x>First</x></b><b><x>Second</x></b></a>'
       expect(XML2JSON.parse_to_hash(xml)).to(
-        eq({ "a" => { "bs" => [ { "x" => "Primo" }, { "x" => "Secondo" } ] } })
+        eq({ "a" => { "bs" => [ { "x" => "First" }, { "x" => "Second" } ] } })
       )
 
-      xml = '<a><b><x>Primo</x></b><b><x>Secondo</x></b><b><x>Terzo</x></b></a>'
+      xml = '<a><b><x>First</x></b><b><x>Second</x></b><b><x>Third</x></b></a>'
       expect(XML2JSON.parse_to_hash(xml)).to(
-        eq({ "a" => { "bs" => [ { "x" => "Primo" }, { "x" => "Secondo" }, { "x" => "Terzo" }] } })
+        eq({ "a" => { "bs" => [ { "x" => "First" }, { "x" => "Second" }, { "x" => "Third" }] } })
       )
     end
 
@@ -63,9 +63,9 @@ describe XML2JSON do
         eq({"r" => {"a" => { "_attributes" => {"url" => "www.google.it"}}}})
       )
 
-      xml = '<r><a url="www.google.it"><b>ciao</b></a></r>'
+      xml = '<r><a url="www.google.it"><b>Hello</b></a></r>'
       expect(XML2JSON.parse_to_hash(xml)).to(
-        eq({"r" => {"a" => { "_attributes" => {"url" => "www.google.it"}, "b" => "ciao"}}})
+        eq({"r" => {"a" => { "_attributes" => {"url" => "www.google.it"}, "b" => "Hello"}}})
       )
 
       xml = '<r><a url="www.google.it"></a><a url="www.google.com"></a></r>'
@@ -73,9 +73,9 @@ describe XML2JSON do
         eq({"r" => {"as" => [{ "_attributes" => {"url" => "www.google.it"}},{ "_attributes" => {"url" => "www.google.com"}}]}})
       )
 
-      xml = '<r><a url="www.google.it"><b>ciao</b></a><a url="www.google.com"><b>ciao</b></a></r>'
+      xml = '<r><a url="www.google.it"><b>Hello</b></a><a url="www.google.com"><b>Hello</b></a></r>'
       expect(XML2JSON.parse_to_hash(xml)).to(
-        eq({"r" => {"as" => [{ "_attributes" => {"url" => "www.google.it"}, "b" => "ciao"},{ "_attributes" => {"url" => "www.google.com"}, "b" => "ciao"}]}})
+        eq({"r" => {"as" => [{ "_attributes" => {"url" => "www.google.it"}, "b" => "Hello"},{ "_attributes" => {"url" => "www.google.com"}, "b" => "Hello"}]}})
       )
     end
 
@@ -118,9 +118,16 @@ describe XML2JSON do
 
     context "pluralize" do
       it "pluralizes keys name when multiple nodes" do
-        xml = '<root><item>Primo</item><item>Secondo</item></root>'
+        xml = '<root><item>First</item><item>Second</item></root>'
         expect(XML2JSON.parse_to_hash(xml)).to(
-          eq({ "root" => { "items" => [ "Primo", "Secondo"] } })
+          eq({ "root" => { "items" => [ "First", "Second"] } })
+        )
+      end
+
+      it "works with already plural keys names" do
+        xml = '<root><items>First</items><items>Second</items></root>'
+        expect(XML2JSON.parse_to_hash(xml)).to(
+          eq({ "root" => { "items" => [ "First", "Second"] } })
         )
       end
     end

data/xml2json.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rake", "~> 10.1"
   spec.add_dependency "nokogiri", "~> 1.6"
-  spec.add_dependency "activesupport", "~> 4.1"
+  spec.add_dependency "activesupport", "~> 4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml2json
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Giuseppe Modarelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 description: Turn XML into JSON
 email:
 - giuseppe.modarelli@gmail.com
@@ -78,10 +92,13 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - lib/xml2json.rb
+- lib/xml2json/configuration.rb
 - lib/xml2json/version.rb
 - spec/fixtures/atom.json
 - spec/fixtures/atom.xml