strain-code 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef54441ed7eb018a37e99b16ec58a9c9ef16e0f1338f1f785f3ebe2db1a432cf
-  data.tar.gz: d4c653cc8d490150ce4b892c44062dbc718d45f39ad05c9a5ba212ce4a6e7e03
+  metadata.gz: d36277fb9a7a63f76c5c9e87d3f4ab24673621d7c74d6706cf3af1c7ccd5f0c5
+  data.tar.gz: f2dc0c7dcb3f2e2a9d2088730502c89b3a72f9fb89b8a80aea70834bce1f188e
 SHA512:
-  metadata.gz: 95bd9c3ea251c15da59776692dddfa4ae4a14fb56c122a8e166f825fadc9fc373e4d33f66eac8bde94c6eb8748f045137ed87072cf5d752c157447ddaa4ff897
-  data.tar.gz: '08008703c1d9e02afd544901365d4bee620d1f78c3772257b36ad8d3885e1610929fc91c958038f4d1bc11a09983312ef08425778aeb5c9e7e5902ac20ad8847'
+  metadata.gz: 2cfeddbabda09ed12be7d3fab202941615831fd98268be0bf9642cc1475977c25319d10fa662c8f74d316f7f53ab21b419df0930e17e055e3bea2f98787e6116
+  data.tar.gz: 8c994a080414c9f077649f347298ce138b3f027e872c8726a5c034d503083d16c311c75d1a452a0f245705411c55ae8138f579903b4ed73c0232ad5ce3f9863f

data/lib/strain_code/catalogue.rb

@@ -13,22 +13,22 @@ class StrainCode::Catalogue
     end
 
     def catalogue_hash(code)
-      hsh = catalogues_source['catalogues'].find do |i|
+      catalogues_source['catalogues'].find do |i|
         i['codes'].include? code.to_s.upcase
       end
     end
 
     def catalogue(code)
       hsh = catalogue_hash(code)
-      new(hsh) if hsh
+      @catalogue ||= {}
+      @catalogue[hsh] ||= new(hsh) if hsh
     end
   end
 
   attr_accessor :codes, :country_code, :name, :name_en, :organization
   attr_accessor :url, :url_pattern
 
-  def initialize(code)
-    code = self.class.catalogue_hash(code) unless code.is_a?(Hash)
-    code.each { |k, v| self.send("#{k}=", v) unless k =~ /^_/ } if code
+  def initialize(hash)
+    hash.each { |k, v| self.send("#{k}=", v) unless k =~ /^_/ }
   end
 end

data/lib/strain_code/parser.rb

@@ -21,12 +21,12 @@ class StrainCode
     end
 
     def number(number)
-      StrainCode::StrainNumber.new(StrainCode::Parser.clean(number))
+      StrainCode::StrainNumber.strain_number(number)
     end
 
     def catalogue(code)
-      c = StrainCode::Catalogue.new(code)
-      c.codes ? c : nil
+      c = StrainCode::Catalogue.catalogue(code)
+      c if c&.codes
     end
   end
 end

data/lib/strain_code/strain_number.rb

@@ -1,6 +1,12 @@
 class StrainCode::StrainNumber
   attr_accessor :ori_number, :code, :accession
 
+  class << self
+    def strain_number(number)
+      new(StrainCode::Parser.clean(number))
+    end
+  end
+
   def initialize(number)
     @ori_number = number.to_s.strip
     @code, @accession = ori_number.split(/[ :_]+/, 2)

data/lib/strain_code/version.rb

@@ -1,5 +1,5 @@
 class StrainCode
-  VERSION       = '0.1.1'
+  VERSION       = '0.2.0'
   VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strain-code
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Luis M. Rodriguez-R