nabeta-wcapi 0.0.1 → 0.0.1.1

data/lib/wcapi/client.rb

@@ -46,10 +46,10 @@ module WCAPI
     end
 
     def GetRecord(opts={})
-      if opts[:type] == 'oclc'
-        @base = URI.parse "http://www.worldcat.org/webservices/catalog/content/" + opts[:id]
-      else
+      if opts[:type] == 'isbn'
 	      @base = URI.parse 'http://www.worldcat.org/webservices/catalog/content/isbn/' + opts[:id]
+      else
+        @base = URI.parse "http://www.worldcat.org/webservices/catalog/content/" + opts[:id]
       end
       opts.delete(:type)
       opts.delete(:id)

data/lib/wcapi/open_search_response.rb

@@ -9,7 +9,7 @@ module WCAPI
       if doc.index('rss')
         parse_rss(doc)
       else
-	parse_atom(doc)
+	      parse_atom(doc)
       end
     end
 
@@ -27,16 +27,17 @@ module WCAPI
 
       begin
         require 'xml/libxml'
-        _parser = LibXML::XML::Parser.new()
-        _parser.string = xml
-        doc = LibXML::XML::Document.new()
-        doc = _parser.parse
+        #_parser = LibXML::XML::Parser.new()
+        #_parser.string = xml
+        #doc = LibXML::XML::Document.new()
+        #doc = _parser.parse
+        doc = LibXML::XML::Document.string(xml)
       rescue
- 	begin
-	   require 'rexml/document'
-           doc = REXML::Document.new(xml)
+ 	      begin
+	        require 'rexml/document'
+          doc = REXML::Document.new(xml)
         rescue
-   	   #likely some kind of xml error 
+   	      #likely some kind of xml error 
         end
       end
 
@@ -54,34 +55,34 @@ module WCAPI
 
       nodes = xpath_all(doc, "//item", namespaces)
       nodes.each { |item |
-         _title = xpath_get_text(xpath_first(item, "title")) 
-         if xpath_first(item, "author/name", namespaces) != nil 
-            xpath_all(item, "author/name", namespaces).each { |i|
-              _author.push(xpath_get_text(i))
-           }
-         end
-         if xpath_first(item, "link", namespaces) != nil 
+        _title = xpath_get_text(xpath_first(item, "title")) 
+        if xpath_first(item, "author/name", namespaces) != nil 
+           xpath_all(item, "author/name", namespaces).each { |i|
+             _author.push(xpath_get_text(i))
+          }
+        end
+        if xpath_first(item, "link", namespaces) != nil 
            _link = xpath_get_text(xpath_first(item, "link", namespaces)) 
-         end
+        end
 
-         if _link != ''
+        if _link != ''
            _id = _link.slice(_link.rindex("/")+1, _link.length-_link.rindex("/"))
-         end 
-         if xpath_first(item, "content:encoded", namespaces) != nil 
-            _citation = xpath_get_text(xpath_first(item, "content:encoded", namespaces))
-         end
+        end 
+        if xpath_first(item, "content:encoded", namespaces) != nil 
+          _citation = xpath_get_text(xpath_first(item, "content:encoded", namespaces))
+        end
 
-         if xpath_first(item, "description", namespaces) != nil
-	    _summary = xpath_get_text(xpath_first(item, "description", namespaces))
-	 end
-         _rechash = {:title => _title, :author => _author, :link => _link, :id => _id, :citation => _citation, 
-		     :summary => _summary, :xml => item.to_s}
-         _record.push(_rechash)
+        if xpath_first(item, "description", namespaces) != nil
+          _summary = xpath_get_text(xpath_first(item, "description", namespaces))
+        end
+        _rechash = {:title => _title, :author => _author, :link => _link, :id => _id, :citation => _citation, 
+		    :summary => _summary, :xml => item.to_s}
+        _record.push(_rechash)
       }
       @records = _record
-   end
+    end
 
-   def parse_atom(xml)
+    def parse_atom(xml)
       _title = ""
       #this is an array
       _author = Array.new()
@@ -105,7 +106,7 @@ module WCAPI
            require 'rexml/document'
            doc = REXML::Document.new(xml)
         rescue
-           #likely some kind of xml error
+          #likely some kind of xml error
         end
       end
 
@@ -125,13 +126,13 @@ module WCAPI
          _title = xpath_get_text(xpath_first(item, "*[local-name() = 'title']"))
  	 _tmpauthor = xpath_first(item, "*[local-name() = 'author']")
 
-         if _tmpauthor != nil
-            if xpath_first(item, "*[local-name() = 'author']/*[local-name() = 'name']") != nil
-              xpath_all(item, "*[local-name() = 'author']/*[local-name() = 'name']").each { |i|
-                _author.push(xpath_get_text(i))
-              }
-            end
- 	 end
+        if _tmpauthor != nil
+          if xpath_first(item, "*[local-name() = 'author']/*[local-name() = 'name']") != nil
+            xpath_all(item, "*[local-name() = 'author']/*[local-name() = 'name']").each { |i|
+              _author.push(xpath_get_text(i))
+           }
+           end
+        end
 
          if xpath_first(item, "*[local-name() = 'id']") != nil
            _link = xpath_get_text(xpath_first(item, "*[local-name() = 'id']"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nabeta-wcapi
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.1.1
 platform: ruby
 authors: 
 - Kosuke Tanabe