taxonifi 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a47e76270c05d20bb7414449757319b5af4a3c6
-  data.tar.gz: fcb516b17b9da22f5962b01c0577a91b49abad30
+  metadata.gz: efd49fd749d76dd0908917d714c62bed112a4987
+  data.tar.gz: b7930e884f2cb2cfb7d8e5fdc67a74ccecdccd5a
 SHA512:
-  metadata.gz: 7b9c31fdabfa563e59698be112bbf98859f0dd4ce12638c2b53d430a72b4b8961994b8a34f95cbfbf979ae98a97ab20317256ac59ba43d020aa7bcee38c92acf
-  data.tar.gz: e468168cc2fe3bbbde2387443faba9f82a6baa5a8ae72396901015483801edcec9480f4ca7b6bb86c9a45a0b6a8dd83a37d31cbee8f89db6217c35b0e3557c63
+  metadata.gz: ddd9ef1022f9292b5fddce37b9252d4cea0206c731e120e26d36ccc9ead91d4a0bfdb62c69e65c786a6e69d04e385753af69683a3cfb0801bc13a256bbc6ffc4
+  data.tar.gz: 18ab6ba3076b826ccaf268d8b07efbcfde316480ae9b501c188d6cc35d68209c669689cc40945fadcd1c5d481060754f18e3e572adc77edf4784780499c4fb78

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    taxonifi (0.3.4)
+    taxonifi (0.3.5)
       byebug (~> 5.0)
       rake (~> 10.4)
       require_all (~> 1.3)
@@ -14,10 +14,10 @@ GEM
     byebug (5.0.0)
       columnize (= 0.9.0)
     columnize (0.9.0)
-    did_you_mean (0.9.8)
+    did_you_mean (0.9.10)
       interception
     interception (0.5)
-    json (1.8.2)
+    json (1.8.3)
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
@@ -33,3 +33,6 @@ DEPENDENCIES
   did_you_mean (~> 0.9)
   rdoc (~> 4.2)
   taxonifi!
+
+BUNDLED WITH
+   1.10.6

data/lib/taxonifi.rb

@@ -30,10 +30,8 @@ module Taxonifi
       species
       subspecies
       variety
-
   }
 
   require_rel 'taxonifi'
 
-
 end

data/lib/taxonifi/lumper.rb

@@ -52,7 +52,7 @@ module Taxonifi::Lumper
   end
 
  
-  # Return a Taxonifi::Model::NameCollection from a csv file.
+  # return [Taxonifi::Model::NameCollection] from a csv file.
   def self.create_name_collection(options = {})
     opts = {
       :csv => [],
@@ -159,7 +159,7 @@ module Taxonifi::Lumper
     nc
   end 
 
-  # Return a Taxonifi::Model::RefCollection from a CSV file.
+  # return [Taxonifi::Model::RefCollection] from a CSV file.
   def self.create_ref_collection(options = {})
     opts = {
       :csv => nil,

data/lib/taxonifi/model/name.rb

@@ -119,8 +119,17 @@ module Taxonifi
       @parent = parent
     end
 
-    # Returns a formatted string, including parens for the name
+    # Returns just the name and author year, no parens, no parents. 
+    # Like:
+    #   foo Smith, 1927
+    #   Foo Smith, 1927
+    #   Fooidae
+    def name_author_year_string
+      [name, author_year_string].compact.join(" ")
+    end
+
     # TODO: rename to reflect parens
+    # return [String] an author/year string, including parens for the name
     def author_year
       au = author_year_string
       return nil if au.nil?
@@ -128,25 +137,34 @@ module Taxonifi
     end
 
 
-    # Return the author year string. 
-    def author_year_string
-      # Build based on People 
+    # return [String] an author string, including parens for the name
+    def author_with_parens
+      au = author_string
+      return nil if au.nil?
+      (self.parens == true) ? "(#{au})" : au
+    end
 
+    # return [String] an author string
+    def author_string
       auth = nil
-      if authors.size > 0
+      if authors.size > 0 # Build based on People 
         case authors.size
         when 1
-          auth = self.author
+          auth = authors.first.last_name # self.author
         when 2 
           auth = authors.map(&:last_name).join(" & ")
-        when 2...100
+        when 3...100
           auth =  authors[0..-1].map(&:last_name).join(", ") + " & " + authors.last.last_name
         end
-        # Build based on string
-      else
+      else # Build based on string
         auth = self.author
       end
-      au = [auth, self.year].compact.join(", ")
+      auth
+    end
+
+    # Return the author year string. 
+    def author_year_string
+      au = [author_string, self.year].compact.join(", ")
       return nil if au.size == 0
       au
     end
@@ -196,15 +214,6 @@ module Taxonifi
     def genus_group_parent
       [ parent_at_rank('subgenus'), parent_at_rank('genus')].compact.first
     end
-  
-    # Returns just the name and author year, no parens, no parents. 
-    # Like:
-    #   foo Smith, 1927
-    #   Foo Smith, 1927
-    #   Fooidae
-    def name_author_year_string
-      [name, author_year_string].compact.join(" ")
-    end
 
     # Return the name of a parent at a given rank.
     # TODO: move method to Base? 

data/lib/taxonifi/version.rb

@@ -1,3 +1,3 @@
 module Taxonifi 
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/test_lumper_names.rb

@@ -85,7 +85,7 @@ class Test_TaxonifiLumperNames < Test::Unit::TestCase
     string = CSV.generate() do |csv|
       csv << %w{family genus species author_year}
       csv << ["Fooidae", "Foo", "bar", "Smith, 1854"]
-      csv << ["Fooidae", "Foo", "foo", "(Smith, 1854)"]
+      csv << ["Fooidae", "Foo", "foo", "(Smith and Jones, 1854)"]
     end
    
     # 0  Fooidae
@@ -95,9 +95,15 @@ class Test_TaxonifiLumperNames < Test::Unit::TestCase
 
     csv = CSV.parse(string, {headers: true})
     nc = Taxonifi::Lumper.create_name_collection(:csv => csv)
-    assert_equal 1, nc.collection[3].authors.size
+    assert_equal 2, nc.collection[3].authors.size
     assert_equal 'Smith', nc.collection[3].authors.first.last_name
     assert_equal 1854, nc.collection[3].year
+    
+    assert_equal 'Smith, 1854', nc.collection[2].author_year
+    assert_equal 'Smith', nc.collection[2].author_with_parens
+
+    assert_equal '(Smith & Jones, 1854)', nc.collection[3].author_year
+    assert_equal '(Smith & Jones)', nc.collection[3].author_with_parens
 
     # Name only applies to the "last" name in the order.
     assert_equal nil, nc.collection[0].author

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taxonifi
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - mjy