activeresource-google_spreadsheets 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee5a88e671575377719e758fbb016246e7a57442
-  data.tar.gz: 9a23675af46c1f18dc10a790ace9ee1cf131bede
+  metadata.gz: bc8450a6fc8c17123d28bebb4e79a9b8489960ae
+  data.tar.gz: 234cc37021b32622df1d6c561d04cff6335fc4f9
 SHA512:
-  metadata.gz: e9067064a7a0d96b896d5baf966aee497ed628c3b4fa9e37ecfad81c80a2e5a25afdf7fa72be15c9ae16d1215c896d1d5a943119250d2e7a0a4dce37340892de
-  data.tar.gz: 1e2f0d7ed3ab42e91028b858583fb4e38fab015d662b5b9622b7ca054db123dc763643b34dd010f67d627f93e2c79058e1ad3d23ea0ea1a82983ba98133b2be0
+  metadata.gz: 3a8df26c102d2d96c2e895dbfec5c51a55372cd4fbfe04fcd2659c169f2eba6975427c80fea76f890fb5f86a347bb569bca3faec27e48d5dd8da908635f9aff9
+  data.tar.gz: 4fb29be10cc47974968510d35fd4fdd627d40fa6a38fdb00adb037003fe9a48abbbe305f24258a266a5e15fb7b3ddcaff993b8241c243d4f7f2f176dab6c825d

data/lib/google_spreadsheets/enhanced/namespace_preservable.rb

@@ -1,5 +1,3 @@
-require 'nokogiri'
-
 module GoogleSpreadsheets
   module Enhanced
     module NamespacePreservable
@@ -22,57 +20,14 @@ module GoogleSpreadsheets
                 { :namespaces => { 'gsx' => 'http://schemas.google.com/spreadsheets/2006/extended' } })
         end
 
-        private
-
-        # convert to Hash from XML including namespace
-        # https://gist.github.com/baroquebobcat/1603671
-        def hash_from_xml_with_namespace(xml_io)
-          begin
-            result = Nokogiri::XML(xml_io)
-            { result.root.name => xml_node_to_hash(result.root) }
-          rescue Exception => e
-            # raise your custom exception here
-            raise
-          end
-        end
-
-        def xml_node_to_hash(node)
-          # If we are at the root of the document, start the hash
-          if node.element?
-            result_hash = {}
-
-            node.attributes.each do |key, attr|
-              result_hash[attr.namespaced_name] = prepare(attr.value)
-            end
-
-            node.children.each do |child|
-              result = xml_node_to_hash(child)
-              if child.is_a? Nokogiri::XML::Text
-                unless child.next_sibling || child.previous_sibling
-                  return prepare(result)
-                end
-              elsif result_hash[child_name = child.namespaced_name]
-                result_hash[child_name] = [result_hash[child_name]] unless result_hash[child_name].is_a?(Object::Array)
-                result_hash[child_name] << prepare(result)
-              else
-                result_hash[child_name] = prepare(result)
-              end
-            end
-
-            result_hash
-          else
-            prepare(node.content.to_s)
-          end
-        end
-
-        def prepare(data)
-          if data.is_a?(String) && data.to_i.to_s == data
-            data.to_i
-          elsif data == {}
-            ''
-          else
-            data
-          end
+        begin
+          require 'nokogiri'
+          require 'google_spreadsheets/enhanced/namespace_preservable/nokogiri_parser'
+          include NokogiriParser
+        rescue LoadError => e
+          $stderr.puts "You don't have nokogiri installed in your application, so this runs with rexml. If you want to use nokogiri, please add it to your Gemfile and run bundle install"
+          require 'google_spreadsheets/enhanced/namespace_preservable/rexml_parser'
+          include RexmlParser
         end
       end
 
@@ -126,9 +81,3 @@ module GoogleSpreadsheets
     end
   end
 end
-
-class Nokogiri::XML::Node
-  def namespaced_name
-    (namespace.try(:prefix).present? ? "#{namespace.prefix}:" : '') + name
-  end
-end

data/lib/google_spreadsheets/enhanced/namespace_preservable/nokogiri_parser.rb

@@ -0,0 +1,58 @@
+module GoogleSpreadsheets
+  module Enhanced
+    module NamespacePreservable
+      module NokogiriParser
+        # convert to Hash from XML including namespace
+        # https://gist.github.com/baroquebobcat/1603671
+        def hash_from_xml_with_namespace(xml_io)
+          result = Nokogiri::XML(xml_io)
+          { result.root.name => xml_node_to_hash(result.root) }
+        end
+
+        private
+        def xml_node_to_hash(node)
+          # If we are at the root of the document, start the hash
+          if node.element?
+            result_hash = {}
+
+            node.attributes.each do |key, attr|
+              result_hash[namespaced_name_from_node(attr)] = prepare(attr.value)
+            end
+
+            node.children.each do |child|
+              result = xml_node_to_hash(child)
+              if child.is_a? Nokogiri::XML::Text
+                unless child.next_sibling || child.previous_sibling
+                  return prepare(result)
+                end
+              elsif result_hash[child_name = namespaced_name_from_node(child)]
+                result_hash[child_name] = [result_hash[child_name]] unless result_hash[child_name].is_a?(::Array)
+                result_hash[child_name] << prepare(result)
+              else
+                result_hash[child_name] = prepare(result)
+              end
+            end
+
+            result_hash
+          else
+            prepare(node.content.to_s)
+          end
+        end
+
+        def prepare(data)
+          if data.is_a?(String) && data.to_i.to_s == data
+            data.to_i
+          elsif data == {}
+            ''
+          else
+            data
+          end
+        end
+
+        def namespaced_name_from_node(node)
+          (node.namespace.try(:prefix).present? ? "#{node.namespace.prefix}:" : '') + node.name
+        end
+      end
+    end
+  end
+end

data/lib/google_spreadsheets/enhanced/namespace_preservable/rexml_parser.rb

@@ -0,0 +1,52 @@
+require 'rexml/document'
+
+module GoogleSpreadsheets
+  module Enhanced
+    module NamespacePreservable
+      module RexmlParser
+        def hash_from_xml_with_namespace(xml_io)
+          rexml = REXML::Document.new(xml_io)
+          { rexml.root.name => xml_node_to_hash(rexml.root) }
+        end
+
+        private
+        def xml_node_to_hash(node)
+          if node.node_type == :element
+            result_hash = {}
+
+            node.attributes.each do |name, attr|
+              result_hash[name] = prepare(attr)
+            end
+
+            node.each_child do |child|
+              result = xml_node_to_hash(child)
+              if child.node_type == :text
+                unless child.next_sibling_node || child.previous_sibling_node
+                  return prepare(result)
+                end
+              elsif result_hash[child_name = child.expanded_name]
+                result_hash[child_name] = [result_hash[child_name]] unless result_hash[child_name].is_a?(Array)
+                result_hash[child_name] << prepare(result)
+              else
+                result_hash[child_name] = prepare(result)
+              end
+            end
+            result_hash
+          else
+            prepare(node.value)
+          end
+        end
+
+        def prepare(data)
+          if data.is_a?(String) && data.to_i.to_s == data
+            data.to_i
+          elsif data == {}
+            ''
+          else
+            data
+          end
+        end
+      end
+    end
+  end
+end

data/lib/google_spreadsheets/version.rb

@@ -1,3 +1,3 @@
 module GoogleSpreadsheets
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-google_spreadsheets
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Chihiro Ito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -87,6 +87,8 @@ files:
 - lib/google_spreadsheets/enhanced.rb
 - lib/google_spreadsheets/enhanced/collection.rb
 - lib/google_spreadsheets/enhanced/namespace_preservable.rb
+- lib/google_spreadsheets/enhanced/namespace_preservable/nokogiri_parser.rb
+- lib/google_spreadsheets/enhanced/namespace_preservable/rexml_parser.rb
 - lib/google_spreadsheets/enhanced/row.rb
 - lib/google_spreadsheets/enhanced/spreadsheet.rb
 - lib/google_spreadsheets/enhanced/syncing.rb