strain-code 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef54441ed7eb018a37e99b16ec58a9c9ef16e0f1338f1f785f3ebe2db1a432cf
-  data.tar.gz: d4c653cc8d490150ce4b892c44062dbc718d45f39ad05c9a5ba212ce4a6e7e03
+  metadata.gz: 5b45a589a119e1e4f49f16656624cd3e89c8ede3a9a61b1a5d597963b768a180
+  data.tar.gz: e4c8fc980afcd12f1f592124971de30eb265019db615760af78569213b3d50f1
 SHA512:
-  metadata.gz: 95bd9c3ea251c15da59776692dddfa4ae4a14fb56c122a8e166f825fadc9fc373e4d33f66eac8bde94c6eb8748f045137ed87072cf5d752c157447ddaa4ff897
-  data.tar.gz: '08008703c1d9e02afd544901365d4bee620d1f78c3772257b36ad8d3885e1610929fc91c958038f4d1bc11a09983312ef08425778aeb5c9e7e5902ac20ad8847'
+  metadata.gz: 809c1338a136ba50c47bd62840203ab713f9c3e6017552d293b2339bbdff8830cbcf6a28646829751cc1456d7200dd7cab8c586937e80e14b2d4a8513dde0780
+  data.tar.gz: c80cb2a935b320c57059754cb0faa10c027597202adbd1557bd75d4ee1e4fd32e748df239c8e3a5ea559852d0c43785a1b9732700b35827b610cffa7de382e9e

data/README.md

@@ -12,7 +12,7 @@ gem install strain-code
 ## Usage
 
 ```ruby
-require 'strain_code'
+require 'strain-code'
 
 # Parse one or more numbers in a variety of formats
 str_no = StrainCode.parse <<STR_NO

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
 
-require 'strain_code/version'
+require 'strain-code/version'
 
 SOURCES = FileList['lib/**/*.rb']
 

data/lib/{strain_code → 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 → strain-code}/common.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 require 'ostruct'
-require 'strain_code/version'
-require 'strain_code/catalogue'
+require 'strain-code/version'
+require 'strain-code/catalogue'
 
 class StrainCode
   class << self

data/lib/{strain_code → strain-code}/parser.rb

@@ -1,4 +1,4 @@
-require 'strain_code/strain_number'
+require 'strain-code/number'
 
 class StrainCode::Parser
   class << self
@@ -8,7 +8,7 @@ class StrainCode::Parser
 
     def parse(numbers)
       clean(numbers).split(' = ').map do |number|
-        StrainCode::StrainNumber.new(number)
+        StrainCode::Number.new(number)
       end
     end
   end
@@ -21,12 +21,12 @@ class StrainCode
     end
 
     def number(number)
-      StrainCode::StrainNumber.new(StrainCode::Parser.clean(number))
+      StrainCode::Number.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-code}/strain_number.rb

@@ -1,6 +1,12 @@
-class StrainCode::StrainNumber
+class StrainCode::Number
   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 → strain-code}/version.rb

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

data/lib/strain-code.rb

@@ -0,0 +1,3 @@
+require 'strain-code/common'
+require 'strain-code/parser'
+#require 'strain-code/styler'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strain-code
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
@@ -50,12 +50,12 @@ files:
 - README.md
 - Rakefile
 - data/catalogues.yaml
-- lib/strain_code.rb
-- lib/strain_code/catalogue.rb
-- lib/strain_code/common.rb
-- lib/strain_code/parser.rb
-- lib/strain_code/strain_number.rb
-- lib/strain_code/version.rb
+- lib/strain-code.rb
+- lib/strain-code/catalogue.rb
+- lib/strain-code/common.rb
+- lib/strain-code/parser.rb
+- lib/strain-code/strain_number.rb
+- lib/strain-code/version.rb
 homepage: https://github.com/seq-code/strain-code
 licenses: []
 metadata: {}

data/lib/strain_code.rb

@@ -1,3 +0,0 @@
-require 'strain_code/common'
-require 'strain_code/parser'
-#require 'strain_code/styler'