rx_nav 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2c59070713b04541c769ff646e41b604a6bf346
-  data.tar.gz: 0a97e79e7f9702a0f3723be29bc44acbf61a8bef
+  metadata.gz: e6633b0bda99be55c44b3d152c66cc9094a79a73
+  data.tar.gz: ae06ac9f8c9a1d918f25f831c63d081579e83661
 SHA512:
-  metadata.gz: 210aea05d43b00d1fb5187f0c03d5236dbab72ec0c53f3e66d12e19ed7f9e445422c08e2f0d9bd6c4059fca4183b9c3f2db6e982422cef38a74166e4d7271066
-  data.tar.gz: a064ff45a78dcccd3777933609bfd133e02a96e6ccc39d54ef3734e10bc62c57c459fc1d01123ef55075d81eeb3e1c0b6f8213466da6026631486022f7706b26
+  metadata.gz: 3ce7dfe514871db74d52f3325404601012dcba1b5e554d01c51611d38a14fa118c12e62aaaa744d95fdeeca3ae81402c545065306608821fcdca02e67bfc2bb6
+  data.tar.gz: 4f5acd0857e68c6812d7af19d0a8e6c99d44c90cb2a54677b47bedab39a3ed8bdda07151f67f86cedee19ff30f0e430ab567ba0d9d6030b5755a79f237e8d3ef

data/lib/rx_nav/concept.rb

@@ -5,10 +5,12 @@ module RxNav
 
     def name
       name = self.display_name ||
+             self.synonym ||
              self.full_name ||
              self.full_generic_name ||
-             self.concept_name
-      name ? name.capitalize : nil
+             self.concept_name ||
+             @table[:name]
+      name ? titleize_str(name) : nil
     end
 
     def kind
@@ -79,8 +81,12 @@ module RxNav
       str.split("_")[0...-1].map(&:capitalize).join(" ") if str.is_a? String
     end
 
+    def titleize_str str
+      str.gsub(/\w+/) { |w| w.capitalize } if str.is_a? String
+    end
+
     def merge_concept concept
-      if concept_hash.empty?
+      if concept_hash.nil? || concept_hash.empty?
         return false
       else
         concept_hash.each do |k,v|

data/lib/rx_nav/rx_norm.rb

@@ -35,18 +35,26 @@ module RxNav
         query = "/drugs?name=#{name}"
         drugs = []
         dg = get_response_hash(query)[:drug_group]
+        return nil if dg[:concept_group].nil?
         dg[:concept_group].each do |cg|
-          drugs << {
-            name: dg[:name],
-            concepts: cg[:concept_properties].map { |c| RxNav::Concept.new(c) }
-          }
+          props = cg[:concept_properties]
+          if props.nil?
+            next
+          else
+            concepts = props.kind_of?(Array) ? props.map { |c| RxNav::Concept.new(c) } : RxNav::Concept.new(props)
+            drugs << {
+              name: dg[:name],
+              concepts: concepts
+            }
+          end
         end
         return drugs
       end
 
       def spelling_suggestions name
         query = "/spellingsuggestions?name=#{name}"
-        get_response_hash(query)[:suggestion_group][:suggestion_list][:suggestion]
+        data = get_response_hash(query)[:suggestion_group][:suggestion_list]
+        data ? data[:suggestion] : nil
       end
 
       def status id

data/lib/rx_nav/version.rb

@@ -1,3 +1,3 @@
 module RxNav
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rx_nav
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jonathan Bender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby wrappers for the RxNav RESTful APIs
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -96,17 +96,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby-based way of interacting with the RxNav APIs (http://rxnav.nlm.nih.gov/APIsOverview.html)