summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoro <o@immerda.ch>2011-06-27 17:17:04 +0200
committero <o@immerda.ch>2011-06-27 17:17:04 +0200
commit9a0e273f172b886602a24ac05ea993d2daee4f96 (patch)
tree2ed4f5324f7d993336b37692ce4d88bb40bdfde3
parent86ff54aaffc7975e1f221a4c9aced9ef34ba246f (diff)
mo
-rw-r--r--lib/fpg/_helpers/parsing.rb6
-rw-r--r--lib/fpg/parse/packets/public_key.rb6
-rw-r--r--lib/fpg/parse/packets/public_subkey.rb6
-rw-r--r--lib/fpg/parse/packets/secret_key.rb6
-rw-r--r--lib/fpg/parse/packets/secret_subkey.rb6
5 files changed, 4 insertions, 26 deletions
diff --git a/lib/fpg/_helpers/parsing.rb b/lib/fpg/_helpers/parsing.rb
index b7f6aa2..b9e5868 100644
--- a/lib/fpg/_helpers/parsing.rb
+++ b/lib/fpg/_helpers/parsing.rb
@@ -7,8 +7,10 @@ module FPG
klass = self.class
modules = []
- while Parse.const_defined?("#{klass.name.split('::').last}Parser") do
- modules << Parse.const_get("#{klass.name.split('::').last}Parser")
+ while klass < Object
+ if Parse.const_defined?("#{klass.name.split('::').last}Parser") then
+ modules << Parse.const_get("#{klass.name.split('::').last}Parser")
+ end
klass = klass.superclass
end
diff --git a/lib/fpg/parse/packets/public_key.rb b/lib/fpg/parse/packets/public_key.rb
deleted file mode 100644
index 9fe54a4..0000000
--- a/lib/fpg/parse/packets/public_key.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module FPG
- module Parse
- module PublicKeyParser
- end
- end
-end
diff --git a/lib/fpg/parse/packets/public_subkey.rb b/lib/fpg/parse/packets/public_subkey.rb
deleted file mode 100644
index 6b17fdf..0000000
--- a/lib/fpg/parse/packets/public_subkey.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module FPG
- module Parse
- module PublicSubkeyParser
- end
- end
-end
diff --git a/lib/fpg/parse/packets/secret_key.rb b/lib/fpg/parse/packets/secret_key.rb
deleted file mode 100644
index 3937a0d..0000000
--- a/lib/fpg/parse/packets/secret_key.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module FPG
- module Parse
- module SecretKeyParser
- end
- end
-end
diff --git a/lib/fpg/parse/packets/secret_subkey.rb b/lib/fpg/parse/packets/secret_subkey.rb
deleted file mode 100644
index dbf0c15..0000000
--- a/lib/fpg/parse/packets/secret_subkey.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module FPG
- module Parse
- module SecretSubkeyParser
- end
- end
-end