rx_nav 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28775ac88a7af9bdf70f04d10dd3d7f35848f2b7
-  data.tar.gz: 38f2c0a2c804905b4438cbcb160a5490ff70a969
+  metadata.gz: c2c59070713b04541c769ff646e41b604a6bf346
+  data.tar.gz: 0a97e79e7f9702a0f3723be29bc44acbf61a8bef
 SHA512:
-  metadata.gz: d5273bc556ad65e44a1a406d992a17ad239e5ecd9a20e55a4f3ad24db9697cbf7fa00ec4f64d9bbecfad82123bf23b4449d041c66ff632d89ceeac9cf2c3bdc6
-  data.tar.gz: 9143f1a3ead0607d154cadde8bd71179c1955ad3fbaf6355e8338b6deaaad7b0266e88b83ee84e9ccce0e880f5a272dbb2c773d031ba9bcf8fbf0e1ecf8d5244
+  metadata.gz: 210aea05d43b00d1fb5187f0c03d5236dbab72ec0c53f3e66d12e19ed7f9e445422c08e2f0d9bd6c4059fca4183b9c3f2db6e982422cef38a74166e4d7271066
+  data.tar.gz: a064ff45a78dcccd3777933609bfd133e02a96e6ccc39d54ef3734e10bc62c57c459fc1d01123ef55075d81eeb3e1c0b6f8213466da6026631486022f7706b26

data/lib/rx_nav.rb

@@ -4,13 +4,13 @@ require 'nokogiri'
 require 'ostruct'
 
 # Core of the API responses
-require_relative 'rx_nav/concept'
-require_relative 'rx_nav/interaction'
+require 'rx_nav/concept'
+require 'rx_nav/interaction'
 
 # Individual APIs
-require_relative 'rx_nav/ndfrt'
-require_relative 'rx_nav/rx_norm'
-require_relative 'rx_nav/rx_terms'
+require 'rx_nav/ndfrt'
+require 'rx_nav/rx_norm'
+require 'rx_nav/rx_terms'
 
 module RxNav
 

data/lib/rx_nav/concept.rb

@@ -16,45 +16,80 @@ module RxNav
       kind ? titleize_kind(self.concept_kind) : nil
     end
 
+    def nui
+      self.concept_nui
+    end
+
     def to_s
       name
     end
 
+    # Supplementary calls to fetch info from other DBs
+    # Note: these methods return false if no information was found
+    
     def get_terms_info
+      rxcui = get_rxcui
+      info = RxNav::RxTerms.get_info(rxcui)
+      merge_concept info
+    end
+
+    def get_ndfrt_info
+      nui = get_nui
+      info = RxNav::NDFRT.get_info(nui)
+      merge_concept info
+    end
+
+    def get_norm_info
+      rxcui = get_rxcui
+      info = RxNav::RxNorm.properties rxcui
+      info.quantity = RxNav::RxNorm.quantity rxcui
+      info.strength = RxNav::RxNorm.strength rxcui
+      merge_concept info
+    end
+
+    private
+
+    def get_rxcui
+      # Terms use the rxcui for the lookup
       if self.rxcui.nil?
+        # Fail if we have a concept without any IDs (that are written so far)
         if self.nui.nil?
           raise "This concept doesn't have a nui or rxcui"
         else
-          rxcui = RxNav::RxNorm.find_rxcui_by_id('nui', self.nui)
+          self.rxcui = RxNav::RxNorm.find_rxcui_by_id('nui', self.nui)
         end
       end
-      rxcui = rxcui ? rxcui : self.rxcui
-      rxcui ? merge_concept(RxNav::RxTerms.get_info(rxcui)) : self
+      # If we had to look it up, use that, otherwise use the model's
+      return self.rxcui
     end
 
-    def get_ndfrt_info
+    def get_nui
       if self.nui.nil?
         if self.rxcui.nil?
           raise "This concept doesn't have a nui or rxcui"
         else
-          concept = RxNav::NDFRT.find_by_id('rxcui', self.rxcui)
+          record = RxNav::NDFRT.find_by_id('rxcui', self.rxcui).first
+          self.concept_nui = record.nui
         end
       end
-      nui = concept ? concept.nui : self.nui
-      nui ? merge_concept(RxNav::NDFRT.get_info(nui)) : self
+      return self.nui
     end
 
-    private
-
     def titleize_kind str
       str.split("_")[0...-1].map(&:capitalize).join(" ") if str.is_a? String
     end
 
     def merge_concept concept
-      return self if concept.attributes.nil?
-      concept.attributes.each do |k,v|
-        self.k = v if self.k.nil?
+      if concept_hash.empty?
+        return false
+      else
+        concept_hash.each do |k,v|
+          puts self.k
+          self.k = v if self.k.nil?
+          puts self.k
+        end
       end
+      return self
     end
 
   end

data/lib/rx_nav/ndfrt.rb

@@ -94,8 +94,9 @@ module RxNav
       def get_concepts query
         data = get_response_hash(query)[:group_concepts]
         if data && data[:concept]
-          data = [data] unless data.is_a?(Array)
-          return data.map { |c| RxNav::Concept.new(c) }
+          concepts = data[:concept]
+          concepts = [concepts] unless concepts.is_a?(Array)
+          return concepts.map { |c| RxNav::Concept.new(c) }
         else
           return nil
         end

data/lib/rx_nav/rx_norm.rb

@@ -5,7 +5,9 @@ module RxNav
       def search_by_name name, options = {}
         options = {max_results: 20, options: 0}.merge(options)
         
-        query = %Q(/approximateTerm?term=#{name}&maxEntries=#{options[:max_results]}&options=#{options[:options]})
+        query = "/approximateTerm?term=#{name}"\
+                "&maxEntries=#{options[:max_results]}"\
+                "&options=#{options[:options]}"
 
         # Get the data we care about in the right form
         data = get_response_hash(query)[:approximate_group][:candidate]
@@ -29,15 +31,39 @@ module RxNav
         return extract_rxcui query
       end
 
+      def find_drugs_by_name name
+        query = "/drugs?name=#{name}"
+        drugs = []
+        dg = get_response_hash(query)[:drug_group]
+        dg[:concept_group].each do |cg|
+          drugs << {
+            name: dg[:name],
+            concepts: cg[:concept_properties].map { |c| RxNav::Concept.new(c) }
+          }
+        end
+        return drugs
+      end
+
       def spelling_suggestions name
         query = "/spellingsuggestions?name=#{name}"
         get_response_hash(query)[:suggestion_group][:suggestion_list][:suggestion]
       end
 
       def status id
-        query = "/rxcui/#{id}/status"
-        status = OpenStruct.new get_response_hash(query)[:rxcui_status]
-        status.send("active?=", status.status == 'Active')
+        query           = "/rxcui/#{id}/status"
+        data            = get_response_hash(query)[:rxcui_status]
+        status          = OpenStruct.new
+        reported_status = data[:status].downcase
+
+        status.send("remapped?=", reported_status == 'remapped')
+        status.send("active?=", reported_status == 'active')
+        
+        if status.remapped?
+          concepts = data[:min_concept_group][:min_concept]
+          concepts = [concepts] if (concepts && !concepts.is_a?(Array))
+          status.remapped_to = concepts.map { |c| c[:rxcui] }
+        end
+        
         return status
       end
 
@@ -48,19 +74,12 @@ module RxNav
 
       def quantity id
         query = "/rxcui/#{id}/quantity"
-        return OpenStruct.new get_response_hash(query)[:quantity_group]
+        return get_response_hash(query)[:quantity_group][:quantity]
       end
 
       def strength id
         query = "/rxcui/#{id}/strength"
-        return OpenStruct.new get_response_hash(query)[:strength_group]
-      end
-
-      def complete_info id
-        result = self.properties(id)
-        result.strength = self.strength(id).strength
-        result.quantity = self.quantity(id).quantity
-        return result
+        return get_response_hash(query)[:strength_group][:strength]
       end
 
       private
@@ -78,7 +97,9 @@ module RxNav
           return nil
         end
       end
-
     end
+
+    self.singleton_class.send(:alias_method, :find_by_name, :search_by_name)
+
   end
 end

data/lib/rx_nav/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rx_nav
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jonathan Bender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori