rubeepass 2.0.9 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af1fb290246cefb9de256f1b1de1f5c2b5de7d188355617fe0c18cbb22ae0327
-  data.tar.gz: b70b387d333f4cbc489bb2077fdcb7f9e5b442276eacaa9d1596c659c65027f7
+  metadata.gz: 91862604b6d530be51df7825db096ccad76a0e8dd1dbd263ae153d6a91f5e27b
+  data.tar.gz: 7f43ea94b77cbdbed2c5956cca66f74fbc080bb704db47b1d597fd35e24cf143
 SHA512:
-  metadata.gz: fbb41b2c6114f3c80e14bdd4e939050b51478ee5cd51f9e6c260f23fcdbb203a05604a93adb028fa356bdb428393e2efd0a889f5cc7e26f1cfa8d6f68c9ae71f
-  data.tar.gz: 86350c3d58b4e2bc97fe8515669fdac64993c3d77e62803ddef098dae6a556a49b15aa34f6b639bb53982f4c096bbdf0a6033d41c41693f51adca1b2e247288a
+  metadata.gz: 6a084c97770183b0ebcc079cd262cfe4bb70a8de47836682c69520c0e046ab269621fe3e67db56e6abbd3904c908da352d1e6bf5ab3978581831314b1ff5338a
+  data.tar.gz: a630da76572f741def57282da179b5572b88ec78e7bacbd337d06aa1065616d9a3efe9a87ea18fb2002cd72dc08e49494d98f066af40469aebbcb20bc942d472

data/lib/rubeepass/group.rb

@@ -48,12 +48,28 @@ class RubeePass::Group
         return out.join("\n")
     end
 
+    def entry_by_uuid(uuid)
+        return @entries[uuid]
+    end
+
     def entry_titles
-        return @entries.keys.sort do |a, b|
+        return @entries.values.map do |entry|
+            entry.title
+        end.sort do |a, b|
             a.downcase <=> b.downcase
         end
     end
 
+    def entries_by_title(title, case_insensitive = false)
+        return @entries.values.select do |entry|
+            (entry.title == title) ||
+            (
+                case_insensitive &&
+                (entry.title.downcase == title.downcase)
+            )
+        end
+    end
+
     def find_group(path, case_insensitive = false)
         return nil if (@keepass.nil?)
 
@@ -62,20 +78,10 @@ class RubeePass::Group
 
         path.split("/").each do |group|
             next if (group.empty?)
-            if (case_insensitive)
-                if (cwd.has_group_like?(group))
-                    cwd = cwd.groups.select do |k, v|
-                        k.downcase == group.downcase
-                    end.values.first
-                else
-                    return nil
-                end
+            if (cwd.has_group_like?(group))
+                cwd = cwd.groups_by_name(group, case_insensitive)[0]
             else
-                if (cwd.has_group?(group))
-                    cwd = cwd.groups[group]
-                else
-                    return nil
-                end
+                return nil
             end
         end
 
@@ -111,7 +117,7 @@ class RubeePass::Group
                     group,
                     entry_xml
                 )
-                group.entries[entry.title] = entry
+                group.entries[entry.uuid] = entry
             end
         end
 
@@ -122,7 +128,7 @@ class RubeePass::Group
                     group,
                     group_xml
                 )
-                group.groups[child.name] = child
+                group.groups[child.uuid] = child
             end
         end
 
@@ -140,9 +146,7 @@ class RubeePass::Group
         return [Array.new, Array.new] if (new_cwd.nil?)
 
         if (new_cwd.has_group_like?(target))
-            new_cwd = new_cwd.groups.select do |k, v|
-                k.downcase == target.downcase
-            end.values.first
+            new_cwd = new_cwd.groups_by_name(target, true)[0]
             target = ""
         end
 
@@ -163,30 +167,42 @@ class RubeePass::Group
         return [group_completions, entry_completions]
     end
 
+    def group_by_uuid(uuid)
+        return @groups[uuid]
+    end
+
     def group_names
-        return @groups.keys.sort do |a, b|
+        return @groups.values.map do |group|
+            group.name
+        end.sort do |a, b|
             a.downcase <=> b.downcase
         end
     end
 
+    def groups_by_name(name, case_insensitive = false)
+        return @groups.values.select do |group|
+            (group.name == name) ||
+            (
+                case_insensitive &&
+                (group.name.downcase == name.downcase)
+            )
+        end
+    end
+
     def has_entry?(entry)
-        return !@entries[entry].nil?
+        return !entries_by_title(entry).empty?
     end
 
     def has_entry_like?(entry)
-        return entry_titles.any? do |title|
-            title.downcase == entry.downcase
-        end
+        return !entries_by_title(entry, true).empty?
     end
 
     def has_group?(group)
-        return !@groups[group].nil?
+        return !groups_by_name(group).empty?
     end
 
     def has_group_like?(group)
-        return group_names.any? do |name|
-            name.downcase == group.downcase
-        end
+        return !groups_by_name(group, true).empty?
     end
 
     def hilight_header(header)

data/lib/rubeepass/wish/copy_wish.rb

@@ -41,11 +41,10 @@ class CopyWish < Djinni::Wish
         end
 
         # Prefer exact match
-        entry = new_cwd.entries[target]
+        entry = new_cwd.entries_by_title(target)[0]
+
         # Fallback to case-insensitive match
-        entry ||= new_cwd.entries.select do |k, v|
-            k.downcase == target.downcase
-        end.values.first
+        entry ||= new_cwd.entries_by_title(target, true)[0]
 
         case field
         when "pass"

data/lib/rubeepass/wish/echo_wish.rb

@@ -40,11 +40,10 @@ class EchoWish < Djinni::Wish
         end
 
         # Prefer exact match
-        entry = new_cwd.entries[target]
+        entry = new_cwd.entries_by_title(target)[0]
+
         # Fallback to case-insensitive match
-        entry ||= new_cwd.entries.select do |k, v|
-            k.downcase == target.downcase
-        end.values.first
+        entry ||= new_cwd.entries_by_title(target, true)[0]
 
         case field
         when "pass"

data/lib/rubeepass/wish/show_wish.rb

@@ -31,9 +31,7 @@ class ShowWish < Djinni::Wish
                 puts new_cwd
             end
         elsif (new_cwd.has_group_like?(target))
-            new_cwd.groups.select do |k, v|
-                k.downcase == target.downcase
-            end.values.each do |group|
+            new_cwd.groups_by_name(target, true).each do |group|
                 case djinni_env["djinni_input"]
                 when "showall"
                     puts group.details(0, true)
@@ -42,9 +40,7 @@ class ShowWish < Djinni::Wish
                 end
             end
         elsif (new_cwd.has_entry_like?(target))
-            new_cwd.entries.select do |k, v|
-                k.downcase == target.downcase
-            end.values.each do |entry|
+            new_cwd.entries_by_title(target, true).each do |entry|
                 case djinni_env["djinni_input"]
                 when "showall"
                     puts entry.details(0, true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 3.0.0
 platform: ruby
 authors:
 - Miles Whittaker