Move ConvertsSubscriberToFeedData out of lib and into app/services as…

… SubscriberToFeedDataConverter
AVGP · Nov 16, 2012 · 07157df · 07157df
1 parent b30e740
commit 07157df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/app/services/feed_service.rb b/app/services/feed_service.rb
@@ -1,5 +1,3 @@
-require_relative '../../lib/converts_subscriber_to_feed_data'
-
 class FeedService
   def initialize(target_feed)
     @target_feed  = target_feed
@@ -28,6 +26,6 @@ def create_feed_from_feed_data
   end
 
   def get_feed_data_for_target
-    ConvertsSubscriberToFeedData.new(@target_feed).get_feed_data!
+    SubscriberToFeedDataConverter.new(@target_feed).get_feed_data!
   end
 end
diff --git a/lib/converts_subscriber_to_feed_data.rb → ...ices/subscriber_to_feed_data_converter.rb b/lib/converts_subscriber_to_feed_data.rb → ...ices/subscriber_to_feed_data_converter.rb
@@ -1,7 +1,4 @@
-require_relative '../app/services/finger_service'
-require_relative '../app/models/feed_data'
-
-class ConvertsSubscriberToFeedData
+class SubscriberToFeedDataConverter
 
   def initialize(subscriber_url)
     @subscriber_url = subscriber_url

diff --git a/.../converts_subscriber_to_feed_data_test.rb → ...subscriber_to_feed_data_converter_test.rb b/.../converts_subscriber_to_feed_data_test.rb → ...subscriber_to_feed_data_converter_test.rb
@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'mocha'
 require 'socket'
-require_relative '../../lib/converts_subscriber_to_feed_data'
+require_relative '../../app/services/subscriber_to_feed_data_converter'
 
 FakeFingerData = Struct.new(:url)
 
@@ -12,7 +12,7 @@ class InvalidSubscribeTo < StandardError; end
 describe "converting a subscriber to feed data" do
   describe "when a Safari 'feed://' scheme is provided" do
     it "should replace feed:// with http://" do
-      feed_data = ConvertsSubscriberToFeedData.new("feed://stuff").get_feed_data!
+      feed_data = SubscriberToFeedDataConverter.new("feed://stuff").get_feed_data!
 
       assert_equal "http://stuff", feed_data.url
     end
@@ -28,7 +28,7 @@ class InvalidSubscribeTo < StandardError; end
       finger_data = FakeFingerData.new("url")
       mock_finger_service.expects(:finger!).returns(finger_data)
 
-      new_feed_data = ConvertsSubscriberToFeedData.new(email).get_feed_data!
+      new_feed_data = SubscriberToFeedDataConverter.new(email).get_feed_data!
 
       assert_equal "url", new_feed_data.url
       assert_equal finger_data, new_feed_data
@@ -38,7 +38,7 @@ class InvalidSubscribeTo < StandardError; end
   describe "when an http:// URL is provided" do
     it "should use the subscriber URL as the feed URL" do
       feed_url  = "http://feed.me"
-      feed_data = ConvertsSubscriberToFeedData.new(feed_url).get_feed_data!
+      feed_data = SubscriberToFeedDataConverter.new(feed_url).get_feed_data!
 
       assert_equal feed_url, feed_data.url
     end
@@ -47,7 +47,7 @@ class InvalidSubscribeTo < StandardError; end
   describe "when an https:// URL is provided" do
     it "should use the subscriber URL as the feed URL" do
       feed_url  = "https://feed.me"
-      feed_data = ConvertsSubscriberToFeedData.new(feed_url).get_feed_data!
+      feed_data = SubscriberToFeedDataConverter.new(feed_url).get_feed_data!
 
       assert_equal feed_url, feed_data.url
     end
@@ -58,7 +58,7 @@ class InvalidSubscribeTo < StandardError; end
       feed_url  = "Gemfile.lock"
 
       lambda {
-        ConvertsSubscriberToFeedData.new(feed_url).get_feed_data!
+        SubscriberToFeedDataConverter.new(feed_url).get_feed_data!
       }.must_raise(RstatUs::InvalidSubscribeTo)
     end
   end
@@ -72,7 +72,7 @@ class InvalidSubscribeTo < StandardError; end
       mock_finger_service.expects(:finger!).throws(SocketError)
 
       lambda {
-        ConvertsSubscriberToFeedData.new(email).get_feed_data!
+        SubscriberToFeedDataConverter.new(email).get_feed_data!
       }.must_raise(RstatUs::InvalidSubscribeTo)
     end
   end