lib/vedeu/models/line.rb in vedeu-0.0.33 vs lib/vedeu/models/line.rb in vedeu-0.0.34

@@ -1,10 +1,10 @@
 require 'json'
 require 'virtus'
 
 require_relative 'presentation'
-require_relative 'stream_collection'
+require_relative 'attributes/stream_collection'
 require_relative 'style'
 
 module Vedeu
   class Line
     include Virtus.model
@@ -13,23 +13,17 @@
 
     attribute :model,   Hash
     attribute :streams, StreamCollection
 
     def to_json
-      json_attributes.to_json
-    end
-
-    def to_s
-      [colour, style, streams].join
-    end
-
-    private
-
-    def json_attributes
       {
         colour:  colour,
         style:   style_original,
         streams: streams
-      }
+      }.to_json
+    end
+
+    def to_s
+      [colour, style, streams].join
     end
   end
 end