More method renaming and dead code removal
This commit is contained in:
parent
e977015868
commit
e8e223f2ee
2
dist/pigeon.rb
vendored
2
dist/pigeon.rb
vendored
|
@ -137,8 +137,8 @@ end
|
||||||
require_relative File.join("pigeon", "local_identity.rb")
|
require_relative File.join("pigeon", "local_identity.rb")
|
||||||
require_relative File.join("pigeon", "remote_identity.rb")
|
require_relative File.join("pigeon", "remote_identity.rb")
|
||||||
require_relative File.join("pigeon", "storage.rb")
|
require_relative File.join("pigeon", "storage.rb")
|
||||||
require_relative File.join("pigeon", "draft_serializer.rb")
|
|
||||||
require_relative File.join("pigeon", "message_serializer.rb")
|
require_relative File.join("pigeon", "message_serializer.rb")
|
||||||
|
require_relative File.join("pigeon", "draft_serializer.rb")
|
||||||
require_relative File.join("pigeon", "message.rb")
|
require_relative File.join("pigeon", "message.rb")
|
||||||
require_relative File.join("pigeon", "draft.rb")
|
require_relative File.join("pigeon", "draft.rb")
|
||||||
require_relative File.join("pigeon", "lexer.rb")
|
require_relative File.join("pigeon", "lexer.rb")
|
||||||
|
|
4
dist/pigeon/draft.rb
vendored
4
dist/pigeon/draft.rb
vendored
|
@ -74,9 +74,7 @@ module Pigeon
|
||||||
message
|
message
|
||||||
end
|
end
|
||||||
|
|
||||||
def render
|
def render_as_draft
|
||||||
puts "Rename to `render_as_draft` to avoid confusion."
|
|
||||||
puts "Do we even need DraftSerializer any more?"
|
|
||||||
DraftSerializer.new(self).render
|
DraftSerializer.new(self).render
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
8
dist/pigeon/draft_serializer.rb
vendored
8
dist/pigeon/draft_serializer.rb
vendored
|
@ -3,13 +3,7 @@ require "erb"
|
||||||
module Pigeon
|
module Pigeon
|
||||||
# Wrapper around a Pigeon::Draft to perform string templating.
|
# Wrapper around a Pigeon::Draft to perform string templating.
|
||||||
# Renders a string that contains most (but not all) of a Pigeon message.
|
# Renders a string that contains most (but not all) of a Pigeon message.
|
||||||
class DraftSerializer
|
class DraftSerializer < MessageSerializer
|
||||||
attr_reader :message
|
|
||||||
|
|
||||||
def initialize(message)
|
|
||||||
@message = message
|
|
||||||
end
|
|
||||||
|
|
||||||
def render
|
def render
|
||||||
body = message.body
|
body = message.body
|
||||||
kind = message.kind
|
kind = message.kind
|
||||||
|
|
4
dist/pigeon/storage.rb
vendored
4
dist/pigeon/storage.rb
vendored
|
@ -25,10 +25,6 @@ module Pigeon
|
||||||
read { store[COUNT_INDEX_NS][mhash] || 0 }
|
read { store[COUNT_INDEX_NS][mhash] || 0 }
|
||||||
end
|
end
|
||||||
|
|
||||||
def message_count
|
|
||||||
read { store[MESG_NS].count }
|
|
||||||
end
|
|
||||||
|
|
||||||
def save_message(msg)
|
def save_message(msg)
|
||||||
write do
|
write do
|
||||||
return msg if store[MESG_NS][msg.multihash]
|
return msg if store[MESG_NS][msg.multihash]
|
||||||
|
|
|
@ -26,7 +26,7 @@ RSpec.describe Pigeon::Draft do
|
||||||
|
|
||||||
it "renders a message" do
|
it "renders a message" do
|
||||||
pk = Pigeon::LocalIdentity.current.multihash
|
pk = Pigeon::LocalIdentity.current.multihash
|
||||||
actual = message.render
|
actual = message.render_as_draft
|
||||||
expected = MSG.gsub("___", pk)
|
expected = MSG.gsub("___", pk)
|
||||||
expect(actual).to start_with(expected)
|
expect(actual).to start_with(expected)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user