rubyMorphbank 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/request.rb

@@ -27,20 +27,18 @@ class Request
       :keywords => ''
     }.merge!(options)
 
-    # check for legal parameters
+    # Check for legal parameters
     opt.keys.each do |p|
       raise RubyMorphbankError, "#{p} is not a valid parameter" if !VALID_OPTIONS[opt[:version]].include?(p)
     end 
 
-
     # TODO: add some proper sanitation?!
     opt[:keywords].gsub!(/\s+/, '+') if opt[:keywords].length > 0
 
-
     # create the request 
     @request_url = SERVICES_URI + "method=#{opt[:method]}" +
     opt.keys.sort{|a,b| a.to_s <=> b.to_s}.collect{
-      |k| ( (URI_PARAMS.include?(k) && (!opt[k].nil? || opt[k].empty?)) ? "&#{k.to_s}=#{opt[k]}" : '')
+      |k| ( (URI_PARAMS.include?(k) && ( !opt[k].nil? || (opt[k] && opt[k].empty?)) ) ? "&#{k.to_s}=#{opt[k]}" : '')
     }.join
 
     # and some housekeepers
@@ -51,7 +49,4 @@ class Request
     Response.new(self)
   end
 
-  # .root.elements.each(xpath){}.map do |row|
-
-    ## REXML::XPath.match(@xml, '//object/width').collect{|e| e.text.to_s}
 end

data/lib/rubyMorphbank.rb

@@ -41,32 +41,32 @@ module RubyMorphbank
 
 end
 
+# Modified from http://snippets.dzone.com/posts/show/6181
 
 ## Base/REXML extension ##
 
-# modified from http://snippets.dzone.com/posts/show/6181
-
-# convert an array into a hash
-class Array
-  def to_h
-    Hash[*self]
-  end
-end
-
 # neither of these extensions is particularly good, they don't recurse etc.
 class REXML::Document
   def record(xpath)
     self.root.elements.each(xpath + '/*'){}.inject([]) do |r,node|
       r << node.name.to_s << node.text.to_s.strip
-    end.to_h
+    end.make_a_hash
   end
 
   def records(xpath)
     self.root.elements.each(xpath){}.map do |row|
       row.elements.each{}.inject([]) do |r,node|
         r << node.name.to_s << node.text.to_s.strip
-      end.to_h
+      end.make_a_hash
     end
   end
 end
 
+# Patch to convert arrays to hashes.  Not the best solution at all.
+class Array
+  def make_a_hash # don't use to_<foo>, conflicts with other nasty patchwork (e.g. Alchemist gem) 
+    Hash[*self]
+  end
+end
+
+

data/rubyMorphbank.gemspec

@@ -0,0 +1,48 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rubyMorphbank}
+  s.version = "0.2.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["mjy"]
+  s.date = %q{2011-07-25}
+  s.description = %q{Uses the Morphbank API to query and return results from the Morphbank database.}
+  s.email = %q{diapriid@gmail.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "init.rb",
+    "lib/request.rb",
+    "lib/response.rb",
+    "lib/rubyMorphbank.rb",
+    "rubyMorphbank.gemspec",
+    "test/helper.rb",
+    "test/test_rubyMorphbank.rb"
+  ]
+  s.homepage = %q{http://github.com/mjy/rubyMorphbank}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.7.2}
+  s.summary = %q{Simple Morphbank (http://morphbank.net) services accessor.}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+  end
+end
+

data/test/test_rubyMorphbank.rb

@@ -11,14 +11,13 @@ class TestRubyMorphbank < Test::Unit::TestCase
   end
 
   should "return an hash object using get_metadata_for_one_image" do
-    # WARNING: this XML to hash is not a terribly useful conversion, the process drops all children and attributes
+    # WARNING: this XML2Hash is not a terribly useful conversion, the process drops all children and attributes
     hash = metadata_hash_for_one_image(195815) # It's fixed data, not the best test, but if it's gone something is seriously wrong anyways
     assert_equal '1360', hash['width']
   end
 
 end
 
-
 class TestRequest < Test::Unit::TestCase
 
   should "return a properly formatted request url with no options" do
@@ -29,7 +28,6 @@ class TestRequest < Test::Unit::TestCase
 
 end
 
-
 class TestResponse < Test::Unit::TestCase
 
   should "return initialize with a unparameterized request" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyMorphbank
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - mjy
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -05:00
-default_executable: 
+date: 2011-07-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -39,7 +41,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - README.rdoc
 - Rakefile
 - VERSION
@@ -47,38 +48,41 @@ files:
 - lib/request.rb
 - lib/response.rb
 - lib/rubyMorphbank.rb
+- rubyMorphbank.gemspec
 - test/helper.rb
 - test/test_rubyMorphbank.rb
-has_rdoc: true
 homepage: http://github.com/mjy/rubyMorphbank
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Simple Morphbank (http://morphbank.net) services accessor.
-test_files: 
-- test/helper.rb
-- test/test_rubyMorphbank.rb
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC