Kouhei Sutou
null+****@clear*****
Thu Jan 2 00:15:02 JST 2014
Kouhei Sutou 2014-01-02 00:15:02 +0900 (Thu, 02 Jan 2014) New Revision: 367b56dc4193360ab580597f473645563901b00b https://github.com/ranguba/chupa-text/commit/367b56dc4193360ab580597f473645563901b00b Message: Use more meaningful name for Feeder Feeder -> Extractor Modified files: lib/chupa-text.rb lib/chupa-text/command/chupa-text.rb Renamed files: lib/chupa-text/extractor.rb (from lib/chupa-text/feeder.rb) test/test-extractor.rb (from test/test-feeder.rb) Modified: lib/chupa-text.rb (+1 -1) =================================================================== --- lib/chupa-text.rb 2014-01-02 00:11:39 +0900 (1b604ef) +++ lib/chupa-text.rb 2014-01-02 00:15:02 +0900 (a6b3b50) @@ -16,7 +16,7 @@ require "chupa-text/version" -require "chupa-text/feeder" +require "chupa-text/extractor" require "chupa-text/decomposer" require "chupa-text/command" Modified: lib/chupa-text/command/chupa-text.rb (+6 -6) =================================================================== --- lib/chupa-text/command/chupa-text.rb 2014-01-02 00:11:39 +0900 (0027f2b) +++ lib/chupa-text/command/chupa-text.rb 2014-01-02 00:15:02 +0900 (6fac5a6) @@ -29,11 +29,11 @@ module ChupaText def run(*arguments) paths = arguments - feeder = create_feeder + extractor = create_extractor paths.each do |path| data = Data.new data.path = path - feeder.feed(data) do |extracted| + extractor.extract(data) do |extracted| puts(extracted.body) end end @@ -41,13 +41,13 @@ module ChupaText end private - def create_feeder + def create_extractor Decomposer.load - feeder = Feeder.new + extractor = Extractor.new Decomposer.registry.decomposers.each do |decomposer| - feeder.add_decomposer(decomposer) + extractor.add_decomposer(decomposer) end - feeder + extractor end end end Renamed: lib/chupa-text/extractor.rb (+2 -2) 97% =================================================================== --- lib/chupa-text/feeder.rb 2014-01-02 00:11:39 +0900 (c4a5d50) +++ lib/chupa-text/extractor.rb 2014-01-02 00:15:02 +0900 (77b4ab3) @@ -17,7 +17,7 @@ require "chupa-text/data" module ChupaText - class Feeder + class Extractor def initialize @decomposers = [] end @@ -26,7 +26,7 @@ module ChupaText @decomposers << decomposer end - def feed(data) + def extract(data) loop do if data.text? yield(data) Renamed: test/test-extractor.rb (+9 -9) 83% =================================================================== --- test/test-feeder.rb 2014-01-02 00:11:39 +0900 (8c518b1) +++ test/test-extractor.rb 2014-01-02 00:15:02 +0900 (215df31) @@ -14,16 +14,16 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -class TestFeeder < Test::Unit::TestCase +class TestExtractor < Test::Unit::TestCase def setup - @feeder = ChupaText::Feeder.new + @extractor = ChupaText::Extractor.new end - sub_test_case("feed") do + sub_test_case("extract") do private - def feed(data) + def extract(data) texts = [] - @feeder.feed(data) do |extracted_data| + @extractor.extract(data) do |extracted_data| texts << extracted_data.body end texts @@ -34,14 +34,14 @@ class TestFeeder < Test::Unit::TestCase data = ChupaText::Data.new data.content_type = "text/plain" data.body = "Hello" - assert_equal(["Hello"], feed(data)) + assert_equal(["Hello"], extract(data)) end def test_not_text data = ChupaText::Data.new data.content_type = "text/html" data.body = "<html><body>Hello</body></html>" - assert_equal([], feed(data)) + assert_equal([], extract(data)) end end @@ -62,14 +62,14 @@ class TestFeeder < Test::Unit::TestCase def setup super decomposer = HTMLDecomposer.new - @feeder.add_decomposer(decomposer) + @extractor.add_decomposer(decomposer) end def test_decompose data = ChupaText::Data.new data.content_type = "text/html" data.body = "<html><body>Hello</body></html>" - assert_equal(["Hello"], feed(data)) + assert_equal(["Hello"], extract(data)) end end end -------------- next part -------------- HTML����������������������������...Download