trecs 0.3.18 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fabd1b003df8fddc54acbd3b6c386ecf7d661ad3
-  data.tar.gz: bd6a2196befafb9f950882ae65f078e992a592dc
+  metadata.gz: 8d398a30c4662e41a3cbe7461c72fde6ed150f13
+  data.tar.gz: bd44123337dca8b66a60ed882bac9485cfaa6f05
 SHA512:
-  metadata.gz: e173dc0ea5b69249675ae880a1c1f8eec063e5a2f62c8800feb9382771de17759ab2abbdacfd3d7857dfd9b0a858360d781cf1b41ce2655716079988be02d0c3
-  data.tar.gz: 30f1a81176e5896100ad2c89a3d23b04625d4279917c647d190aa23725223f86cd422b595c7691093f09cf08ec589d8211101ad26582fb0b9d64eef0bd0fbc57
+  metadata.gz: de4d6ac1348a7b4cf1b4a45af508e832f0edfd6f1215728043ab7f1a1434e042b58746d758deebc9cd28c346977e925fc8164ca8d4d0ce0da0a13a13c2eddfe8
+  data.tar.gz: a9f432b18467a15848db360f31d4dd76ab07ccf0d35853814215ebbc537ebb0dcbdeb43b5fbc92a162f3905a372b61786275c10964b27d16123cff5713e09ca0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trecs (0.3.18)
+    trecs (0.4.0)
       minitar (~> 0.5.4)
       trollop (~> 2.0)
 

data/bin/trecs

@@ -16,18 +16,18 @@ end
 opts = Trollop::options do
   version TRecs::VERSION
 
-  opt :step,        "Time in ms between frames", short: 's',                default: 100
-  opt :ticker,      "Ticker",                                 type: String, default: "clock"
+  opt :step,        "Time in ms between frames", short: 's',                 default: 100
+  opt :ticker,      "Ticker",                                 type: String,  default: "clock"
 
   opt :from,        "Play from",                              type: Integer, default: 0
   opt :to,          "Play to",                                type: Integer, default: 0
   opt :speed,       "Playing speed",                          type: Float,   default: 1.0
 
-  opt :ticker_file, "File to watch",                          type: String, default: "/tmp/ticker"
+  opt :ticker_file, "File to watch",                          type: String,  default: "/tmp/ticker"
 
-  opt :audio,       "If there's an audio file, reproduce it",               default: true
+  opt :audio,       "If there's an audio file, reproduce it",                default: true
 
-  opt :duration,    "Length of the recording",                              default: false
+  opt :duration,    "Length of the recording",                               default: false
 end
 opts[:trecs_backend] = ARGV[0]
 

data/bin/trecs_record

@@ -13,7 +13,7 @@ opts = Trollop::options do
   opt :strategy,   "Strategy",                              type: String,  default: "incremental"
 
   opt :message,    "Message to record",                     type: String,  default: "TRecs!"
-  opt :width,      "Width",                                 type: Integer, default: 10
+  #opt :width,      "Width",                                 type: Integer, default: 10
   opt :command,    "Command"          ,         short: "c", type: String
   opt :input_file, "File to record",                        type: String,  default: ""
   opt :terminal,   "Launch terminal",                                      default: true
@@ -21,9 +21,12 @@ opts = Trollop::options do
 
   opt :audio,      "Record audio"
 
-  opt :from,        "Play from",                              type: Integer, default: 0
-  opt :to,          "Play to",                                type: Integer, default: 0
-  opt :speed,       "Playing speed",                          type: Float,   default: 1.0
+  opt :from,        "Play from",                            type: Integer, default: 0
+  opt :to,          "Play to",                              type: Integer, default: 0
+  opt :speed,       "Playing speed",                        type: Float,   default: 1.0
+
+  opt :height,      "Height",                               type: Integer, default: 0
+  opt :width,       "Width",                                type: Integer, default: 0
 end
 opts[:trecs_backend] = ARGV[0]
 

data/lib/trecs/frame.rb

@@ -10,9 +10,10 @@ module TRecs
     end
 
     def width
-      raw_text.each_line.map { |line|
+      widths = raw_text.each_line.map { |line|
         line.chomp.size
-      }.max
+      }
+      widths.max || 0
     end
 
     def height

data/lib/trecs/recorder.rb

@@ -24,23 +24,10 @@ module TRecs
     end
 
     def record
-      do_record do
-        writer.setup
-        strategy.perform
-        writer.render
-      end
-    end
-
-    def current_frame(options={})
-      @current_time    = options.fetch(:time) { next_timestamp }
-      @current_content = options.fetch(:content)
-
-      if @previous_content != current_content
-        new_current_time  = current_time + offset
-        options[:time] = new_current_time
-        writer.create_frame(options)
-        @previous_content = current_content
-      end
+      self.current_time = nil
+      self.recording    = true
+      strategy.write_frames_to(writer)
+      self.recording    = false
     end
 
     def next_timestamp
@@ -57,12 +44,5 @@ module TRecs
     attr_writer :current_time
     attr_writer :current_content
 
-    def do_record
-      self.current_time = nil
-      self.recording    = true
-      yield
-      self.recording    = false
-    end
-
   end
 end

data/lib/trecs/strategies/config_strategy.rb

@@ -1,16 +1,20 @@
 require "strategies/strategy"
+require "writers/in_memory_writer"
 
 module TRecs
-  class ConfigStrategy
-    include Strategy
-    attr_reader :step
+  class ConfigStrategy < Strategy
     attr_reader :format
     attr_reader :strategies
 
     def initialize(options={})
-      @step       = options.fetch(:step)       { 100 }
+      super(options)
+      
       @format     = options.fetch(:format)     { "json" }
       @strategies = options.fetch(:strategies) { [] }
+      @offset     = options.fetch(:offset)     { 0 }
+
+      @writer = InMemoryWriter.new
+
     end
 
     def <<(strategy)
@@ -22,13 +26,20 @@ module TRecs
         self << strategy
       end
     end
-    
+
     def perform
+      current_time(0)
       strategies.each do |strategy|
-        strategy.recorder = recorder
-        strategy.perform
-        recorder.offset = recorder.next_timestamp
+        strategy.write_frames_to(@writer)
+        strategy.frames.each do |time, frame|
+          current_content(frame.content)
+          current_format(frame.format)
+          current_time(time + offset)
+          save_frame
+        end
+        self.offset = current_time + self.step
       end
+      
     end
 
   end

data/lib/trecs/strategies/custom_strategy.rb

@@ -1,5 +1,16 @@
-CustomStrategy = Struct.new(:recorder, :action) do
-  def perform
-    self.action.call
+require "strategies/strategy"
+module TRecs
+  class CustomStrategy < Strategy
+
+    attr_accessor :recorder
+    attr_accessor :action
+
+    def initialize(action = ->{})
+      @action = action
+    end
+    
+    def perform
+      self.action.call
+    end
   end
 end

data/lib/trecs/strategies/emacs_plugin_strategy.rb

@@ -10,8 +10,8 @@ module TRecs
       @clock   = options.fetch(:clock) { Time }
       @testing = options.fetch(:testing) { false }
 
-      @width  = 0
-      @height = 0
+      @height = 20
+      @width  = 80
     end
 
     def perform
@@ -50,7 +50,7 @@ module TRecs
         .gsub(/\/\*.+\*\//, "")
       #.gsub!(/^\s/, "").gsub!(/^(<[^\/]\w+ (\w+=['"][^>]+['"])*>)+ /) {|m| m[-1]=""; m } # clean extra space at the begining of each line
 
-      new_content = "<style>#{style}</style><pre style='border: 2px solid #898989;width: #{@width*1.2}ex;height: #{@height*1.25}ex' class='emacs-code'>#{code}</pre>"
+      new_content = "<style>#{style}</style><pre style='border: 2px solid #898989;width: #{@width*1.3}ex;height: #{@height*1.31}ex' class='emacs-code'>#{code}</pre>"
 
       super(new_content)
     end

data/lib/trecs/strategies/file_frames_strategy.rb

@@ -1,7 +1,6 @@
 require "strategies/strategy"
 module TRecs
-  class FileFramesStrategy
-    include Strategy
+  class FileFramesStrategy < Strategy
     attr_accessor :frames
 
     def initialize(dirname)

data/lib/trecs/strategies/fly_from_right_strategy.rb

@@ -2,8 +2,7 @@ require "strategies/strategy"
 require "strategies/shell_command_strategy"
 
 module TRecs
-  class FlyFromRightStrategy
-    include Strategy
+  class FlyFromRightStrategy < Strategy
     include ShellCommandStrategy
     attr_reader :message
     attr_reader :width

data/lib/trecs/strategies/hash_strategy.rb

@@ -2,18 +2,17 @@ require "strategies/strategy"
 require "strategies/shell_command_strategy"
 
 module TRecs
-  class HashStrategy
-    include Strategy
+  class HashStrategy < Strategy
     include ShellCommandStrategy
-    attr_accessor :frames
+    attr_accessor :frames_to_save
 
-    def initialize(frames={})
-      @frames = frames || Hash.new
-      @command = frames.fetch(:command) { nil }
+    def initialize(frames_to_save={})
+      @frames_to_save = frames_to_save || Hash.new
+      @command        = frames_to_save.fetch(:command) { nil }
     end
 
     def perform
-      @frames.each do |time, content|
+      @frames_to_save.each do |time, content|
         if time.is_a?(Numeric) || /\A\d+\Z/ === time
           current_time(time.to_s.to_i)
           current_content(content)

data/lib/trecs/strategies/incremental_strategy.rb

@@ -2,19 +2,24 @@ require "strategies/strategy"
 require "strategies/shell_command_strategy"
 
 module TRecs
-  class IncrementalStrategy
-    include Strategy
+  class IncrementalStrategy < Strategy
     include ShellCommandStrategy
 
     attr_reader :message
+    attr_reader :step
 
     def initialize(options={})
       @message = options.fetch(:message)
       @command = options.fetch(:command) { nil }
+      @step = options.fetch(:step) { 100 }
+      
     end
 
     def perform
-      recorder.current_frame(time: 0, content: "")
+      current_time(0)
+      current_content("")
+      save_frame
+
       message.each_char.each_with_object("") do |current_char, current_msg|
         current_msg << current_char
 
@@ -27,7 +32,7 @@ module TRecs
     private
 
     def timestamp_for(message)
-      message.size * recorder.step
+      message.size * step
     end
   end
 end

data/lib/trecs/strategies/raw_file_strategy.rb

@@ -1,7 +1,6 @@
 require "strategies/strategy"
 module TRecs
-  class RawFileStrategy
-    include Strategy
+  class RawFileStrategy < Strategy
     attr_reader :file
 
     def initialize(options={})
@@ -10,10 +9,6 @@ module TRecs
 
       @clock   = options.fetch(:clock) { Time }
       @testing = options.fetch(:testing) { false }
-      #
-      #@height = options.fetch(:height) { 24  }
-      #@width  = options.fetch(:width)  { 80  }
-      #
     end
 
     def perform

data/lib/trecs/strategies/strategy.rb

@@ -1,6 +1,22 @@
+require "frame"
 module TRecs
-  module Strategy
+  class Strategy
     attr_accessor :recorder
+    attr_accessor :offset
+    attr_accessor :step
+
+    def initialize(options={})
+      @step = options.fetch(:step) { 100 }
+    end
+    
+    def write_frames_to(writer)
+      perform
+      writer.render_frames(frames)
+    end
+
+    def frames
+      @frames ||= {}
+    end
 
     def stop
     end
@@ -24,19 +40,16 @@ module TRecs
       end
       @__content
     end
- 
+
     def current_format(format=nil)
       if format
         @__format = format
       end
       @__format
     end
-    
-    def save_frame
-      options = {time: __time, format: __format, content: __content}
-      options.reject! {|k,v| v.nil?}
 
-      recorder.current_frame(options)
+    def save_frame
+      frames[__time] = Frame.new(format: __format, content: __content)
     end
   end
 end

data/lib/trecs/strategies/swipe_strategy.rb

@@ -3,15 +3,13 @@ require "strategies/hash_strategy"
 require "strategies/shell_command_strategy"
 
 module TRecs
-  class SwipeStrategy < HashStrategy
-    include Strategy
+  class SwipeStrategy < Strategy
     include ShellCommandStrategy
     attr_reader :message
-    attr_reader :step
 
     def initialize(options={})
+      super(options)
       @message = options.fetch(:message)
-      @step    = options.fetch(:step)    { 100 }
       @command = options.fetch(:command) { nil }
       @swiper  = options.fetch(:swiper)  { "|" }
       @hider   = options.fetch(:hider)   { "*" }
@@ -36,7 +34,7 @@ module TRecs
       end
 
       cleanup_frames
-      super
+      #super
     end
 
     private

data/lib/trecs/strategies/tmux_session_strategy.rb

@@ -1,14 +1,13 @@
 require "strategies/strategy"
 
 module TRecs
-  class TmuxSessionStrategy
-    include Strategy
+  class TmuxSessionStrategy < Strategy
     attr_reader :recording
-    attr_reader :step
 
     def initialize(options={})
+      super(options)
       @frames = []
-      @step = options.fetch(:step) { 100 } / 1000.0
+      @step = @step / 1000.0
       @color = options.fetch(:color) { true }
       set_color_or_bw
     end

data/lib/trecs/strategies/trecs_file_strategy.rb

@@ -4,8 +4,7 @@ require "player"
 require "frame"
 
 module TRecs
-  class TrecsFileStrategy
-    include Strategy
+  class TrecsFileStrategy < Strategy
     attr_reader :input_file
     attr_reader :frames
     attr_reader :from

data/lib/trecs/strategies/ttyrec_strategy.rb

@@ -1,7 +1,6 @@
 require "strategies/strategy"
 module TRecs
-  class TtyrecStrategy
-    include Strategy
+  class TtyrecStrategy < Strategy
 
     def initialize(options={})
       file = options.fetch(:input_file)

data/lib/trecs/version.rb

@@ -1,3 +1,3 @@
 module TRecs
-  VERSION = "0.3.18"
+  VERSION = "0.4.0"
 end

data/lib/trecs/writers/in_memory_writer.rb

@@ -13,7 +13,8 @@ module TRecs
       @frames[time] = content
     end
 
-    def render
+    def render_frames(frames)
+      @frames = frames
     end
   end
 end

data/lib/trecs/writers/json_writer.rb

@@ -18,10 +18,6 @@ module TRecs
       @audio_files = Array(@audio_files)
     end
 
-    def setup
-      @frames = {}
-    end
- 
     def create_frame(options={})
       time    = options.fetch(:time)
       content = options.fetch(:content)
@@ -35,7 +31,7 @@ module TRecs
       frames[time] = frame
     end
 
-    def render
+    def render_frames(frames)
       source.create_recording do |source|
         source[:format] = "json"
 

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ require File.expand_path("../../lib/trecs", __FILE__)
 require "rspec/given"
 require "ostruct"
 
+require "recorder"
+require "writers/in_memory_writer"
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
@@ -63,7 +66,6 @@ class Spy
   end
 end
 
-
 class CustomTicker
   attr_accessor :player
   def initialize(*ticks)

data/spec/trecs/frame_spec.rb

@@ -21,6 +21,7 @@ module TRecs
         Given(:frame) { Frame.new("123456") }
         Then { frame.width == 6 }
       end
+      
       context "multiple lines" do
         Given(:frame) { Frame.new(<<FRAME
 123
@@ -30,6 +31,11 @@ FRAME
             ) }
         Then { frame.width == 5 }
       end
+
+      context "empty frame" do
+        Given(:frame) { Frame.new("") }
+        Then { frame.width == 0 }
+      end
     end
 
     context "equality" do

data/spec/trecs/recorder_spec.rb

@@ -35,28 +35,24 @@ module TRecs
 
       When { recorder.record }
 
-      Then { Spy.calls[1] == ["writer",   :setup,   []] }
-      Then { Spy.calls[2] == ["strategy", :perform, []] }
-      Then { Spy.calls[3] == ["writer",   :render,  []] }
+      Then { Spy.calls[1] == ["strategy", :write_frames_to, [writer]] }
     end
 
     context "#recording" do
-      Given(:writer)   { OpenStruct.new }
-      Given(:strategy) { OpenStruct.new }
+      Given(:writer)   { InMemoryWriter.new }
       Given(:recorder) {
         Recorder.new(writer: writer, strategy: strategy)
       }
+      Given(:strategy) { CustomStrategy.new }
 
       context "before start" do
         Then { recorder.recording == false }
       end
 
       context "when recording" do
-        Given(:strategy) { CustomStrategy.new }
-
         When(:recording) {
           result = nil
-          strategy.action = -> { result = recorder.recording }
+          strategy.action=( -> { result = recorder.recording })
           recorder.record
           result
         }
@@ -69,96 +65,6 @@ module TRecs
       end
     end
 
-    context "#current_frame" do
-      Given   { Spy.clear }
-      Given(:writer)   { Spy.new("Writer").ignore(:recorder=, :setup, :render) }
-      Given(:strategy) { CustomStrategy.new }
-
-      Given(:recorder) {
-        Recorder.new(writer: writer, strategy: strategy)
-      }
-
-      context "setting current frame and time" do
-        When(:result) {
-          result = []
-          strategy.action = -> {
-            recorder.current_frame(time: 10, content: "CONTENT")
-            result << {
-              time: recorder.current_time,
-              content: recorder.current_content,
-            }
-            recorder.current_frame(time: 15, content: "CONTENT 2")
-            result << {
-              time: recorder.current_time,
-              content: recorder.current_content,
-            }
-          }
-          recorder.record
-          result
-        }
-
-        Then {
-          result == [
-            {time: 10, content: "CONTENT"},
-            {time: 15, content: "CONTENT 2"},
-          ]
-        }
-        Then {
-          writer.calls[1] == [
-            :create_frame,
-            [ { time: 10, content: "CONTENT" } ]
-          ]
-        }
-        Then {
-          writer.calls[2] == [
-            :create_frame,
-            [ { time: 15, content: "CONTENT 2" } ]
-          ]
-        }
-      end
-    end
-
-    context "#current_frame" do
-      Given   { Spy.clear }
-      Given(:writer)   { Spy.new("Writer").ignore(:recorder=, :setup, :render) }
-      Given(:strategy) { CustomStrategy.new }
-
-      Given(:recorder) {
-        Recorder.new(writer: writer, strategy: strategy)
-      }
-
-      context "setting current frame and time with content duplicates" do
-        When {
-          strategy.action = -> {
-            recorder.current_frame(time: 10, content: "CONTENT")
-            recorder.current_frame(time: 15, content: "CONTENT 2")
-            recorder.current_frame(time: 20, content: "CONTENT 2")
-            recorder.current_frame(time: 25, content: "CONTENT 3")
-          }
-          recorder.record
-        }
-
-        Then {
-          writer.calls[1] == [
-            :create_frame,
-            [ { time: 10, content: "CONTENT" } ]
-          ]
-        }
-        Then {
-          writer.calls[2] == [
-            :create_frame,
-            [ { time: 15, content: "CONTENT 2" } ]
-          ]
-        }
-        Then {
-          writer.calls[3] == [
-            :create_frame,
-            [ { time: 25, content: "CONTENT 3" } ]
-          ]
-        }
-      end
-    end
-
     context "#next_timestamp" do
       Given(:writer)   { OpenStruct.new }
       Given(:strategy) { OpenStruct.new }
@@ -205,65 +111,5 @@ module TRecs
 
       Then { strategy.calls[1] == [:stop, []] }
     end
-
-    context "Offset" do
-      context "initialization" do
-        context "from constructor" do
-          Given(:recorder) { Recorder.new(offset: 10, writer: OpenStruct.new, strategy: OpenStruct.new) }
-          Then { recorder.offset == 10 }
-        end
-
-        context "setter" do
-          Given(:recorder) { Recorder.new(offset: 10, writer: OpenStruct.new, strategy: OpenStruct.new) }
-          When { recorder.offset =  30 }
-          Then { recorder.offset == 30 }
-        end
-      end
-
-      Given   { Spy.clear }
-      Given(:writer)   { Spy.new("Writer").ignore(:recorder=, :setup, :render) }
-      Given(:strategy) { CustomStrategy.new }
-
-      Given(:recorder) {
-        Recorder.new(offset: 7, writer: writer, strategy: strategy, step: 10)
-      }
-
-      When {
-        strategy.action = -> {
-          recorder.current_frame(time: 0,  content: "CONTENT")
-          recorder.current_frame(time: 10, content: "CONTENT 2")
-          recorder.current_frame(time: 12, content: "CONTENT 3")
-          recorder.current_frame(          content: "CONTENT 4")
-        }
-        recorder.record
-      }
-
-      Then {
-        writer.calls[1] == [
-          :create_frame,
-          [ { time: 7, content: "CONTENT" } ]
-        ]
-      }
-      Then {
-        writer.calls[2] == [
-          :create_frame,
-          [ { time: 17, content: "CONTENT 2" } ]
-        ]
-      }
-      Then {
-        writer.calls[3] == [
-          :create_frame,
-          [ { time: 19, content: "CONTENT 3" } ]
-        ]
-      }
-      Then { recorder.current_time == 22 }
-      Then {
-        writer.calls[4] == [
-          :create_frame,
-          [ { time: 29, content: "CONTENT 4" } ]
-        ]
-      }
-    end
-
   end
 end

data/spec/trecs/strategies/config_strategy_spec.rb

@@ -1,36 +1,33 @@
 require "spec_helper"
 require "strategies/config_strategy"
-require "recorder"
 require "strategies/hash_strategy"
-require "writers/in_memory_writer"
+require "recorder"
 
 module TRecs
   describe ConfigStrategy do
     context "options" do
-
       context "set values" do
-
         Given(:options) {
           {
-            step: 40,
-            format: "yaml_store",
-            strategies: [],
+            step:            40,
+            format:          "json",
+            strategies:      [],
             spureous_option: "something spureous",
           }
         }
 
         Given(:strategy) { ConfigStrategy.new(options) }
 
-        Then { strategy.step == 40 }
-        Then { strategy.format == "yaml_store" }
+        Then { strategy.step       == 40 }
+        Then { strategy.format     == "json" }
         Then { strategy.strategies == [] }
       end
 
       context "default values" do
         Given(:strategy) { ConfigStrategy.new }
 
-        Then { strategy.step == 100 }
-        Then { strategy.format == "json" }
+        Then { strategy.step       == 100 }
+        Then { strategy.format     == "json" }
         Then { strategy.strategies == [] }
       end
     end
@@ -127,3 +124,63 @@ module TRecs
     end
   end
 end
+
+##### Creo que esto va aca
+### context "Offset" do
+###   context "initialization" do
+###     context "from constructor" do
+###       Given(:recorder) { Recorder.new(offset: 10, writer: OpenStruct.new, strategy: OpenStruct.new) }
+###       Then { recorder.offset == 10 }
+###     end
+###
+###     context "setter" do
+###       Given(:recorder) { Recorder.new(offset: 10, writer: OpenStruct.new, strategy: OpenStruct.new) }
+###       When { recorder.offset =  30 }
+###       Then { recorder.offset == 30 }
+###     end
+###   end
+###
+###   Given   { Spy.clear }
+###   Given(:writer)   { Spy.new("Writer").ignore(:recorder=, :setup, :render) }
+###   Given(:strategy) { CustomStrategy.new }
+###
+###   Given(:recorder) {
+###     Recorder.new(offset: 7, writer: writer, strategy: strategy, step: 10)
+###   }
+###
+###   When {
+###     strategy.action = -> {
+###       recorder.current_frame(time: 0,  content: "CONTENT")
+###       recorder.current_frame(time: 10, content: "CONTENT 2")
+###       recorder.current_frame(time: 12, content: "CONTENT 3")
+###       recorder.current_frame(          content: "CONTENT 4")
+###     }
+###     recorder.record
+###   }
+###
+###   Then {
+###     writer.calls[1] == [
+###       :create_frame,
+###       [ { time: 7, content: "CONTENT" } ]
+###     ]
+###   }
+###   Then {
+###     writer.calls[2] == [
+###       :create_frame,
+###       [ { time: 17, content: "CONTENT 2" } ]
+###     ]
+###   }
+###   Then {
+###     writer.calls[3] == [
+###       :create_frame,
+###       [ { time: 19, content: "CONTENT 3" } ]
+###     ]
+###   }
+###   Then { recorder.current_time == 22 }
+###   Then {
+###     writer.calls[4] == [
+###       :create_frame,
+###       [ { time: 29, content: "CONTENT 4" } ]
+###     ]
+###   }
+### end

data/spec/trecs/strategies/fly_from_right_strategy_spec.rb

@@ -36,28 +36,32 @@ module TRecs
     end
 
     context "perform" do
-      Given { Spy.clear }
-      Given(:recorder) { Spy.new("recorder") }
+      Given(:writer)   { InMemoryWriter.new }
       Given(:strategy) { FlyFromRightStrategy.new(message: "abc", width: 4) }
+      Given(:recorder) { Recorder.new(strategy: strategy, writer: writer) }
+
+      When { strategy.recorder = recorder }
+      When { recorder.record }
+      When { strategy.perform }
 
       When { recorder.stub(:step) { 100 } }
       When { strategy.recorder = recorder }
       When { strategy.perform }
 
-      Then { recorder.calls[1]  == [:current_frame, [ {time: 0,    content: ""                  } ] ] }
-      Then { recorder.calls[2]  == [:current_frame, [ {time: 100,  content: "   a" } ] ] }
-      Then { recorder.calls[3]  == [:current_frame, [ {time: 200,  content: "  a"  } ] ] }
-      Then { recorder.calls[4]  == [:current_frame, [ {time: 300,  content: " a"   } ] ] }
-      Then { recorder.calls[5]  == [:current_frame, [ {time: 400,  content: "a"    } ] ] }
+      Then { writer.frames[0]    ==  ""     }
+      Then { writer.frames[100]  ==  "   a" }
+      Then { writer.frames[200]  ==  "  a"  }
+      Then { writer.frames[300]  ==  " a"   }
+      Then { writer.frames[400]  ==  "a"    }
 
-      Then { recorder.calls[6]  == [:current_frame, [ {time: 500,  content: "a"    } ] ] }
-      Then { recorder.calls[7]  == [:current_frame, [ {time: 600,  content: "a  b" } ] ] }
-      Then { recorder.calls[8]  == [:current_frame, [ {time: 700,  content: "a b"  } ] ] }
-      Then { recorder.calls[9]  == [:current_frame, [ {time: 800,  content: "ab"   } ] ] }
+      Then { writer.frames[500]  ==  "a"    }
+      Then { writer.frames[600]  ==  "a  b" }
+      Then { writer.frames[700]  ==  "a b"  }
+      Then { writer.frames[800]  ==  "ab"   }
 
-      Then { recorder.calls[10] == [:current_frame, [ {time: 900,  content: "ab"    } ] ] }
-      Then { recorder.calls[11] == [:current_frame, [ {time: 1000, content: "ab c" } ] ] }
-      Then { recorder.calls[12] == [:current_frame, [ {time: 1100, content: "abc"  } ] ] }
+      Then { writer.frames[900]  ==  "ab"   }
+      Then { writer.frames[1000] ==  "ab c" }
+      Then { writer.frames[1100] ==  "abc"  }
 
     end
   end

data/spec/trecs/strategies/hash_strategy_spec.rb

@@ -19,8 +19,10 @@ module TRecs
     end
 
     context "perform" do
-      Given { Spy.clear }
-      Given(:recorder) { Spy.new("recorder") }
+      Given(:writer)   { InMemoryWriter.new }
+      Given(:strategy) { IncrementalStrategy.new(message: "Hello World") }
+      Given(:recorder) { Recorder.new(strategy: strategy, writer: writer) }
+
       Given(:strategy) { HashStrategy.new(
           {
             0         => "A",
@@ -28,18 +30,19 @@ module TRecs
             "15"      => "C",
             "1a2b3C4" => "h",
             20        => "D",
-            :"25"        => "E",
+            :"25"     => "E",
           }
           ) }
 
       When { strategy.recorder = recorder }
+      When { recorder.record }
       When { strategy.perform }
 
-      Then { recorder.calls[1]  == [:current_frame, [ {time: 0,  content: "A"} ] ] }
-      Then { recorder.calls[2]  == [:current_frame, [ {time: 10, content: "B"} ] ] }
-      Then { recorder.calls[3]  == [:current_frame, [ {time: 15, content: "C"} ] ] }
-      Then { recorder.calls[4]  == [:current_frame, [ {time: 20, content: "D"} ] ] }
-      Then { recorder.calls[5]  == [:current_frame, [ {time: 25, content: "E"} ] ] }
+      Then { writer.frames[0]  ==  "A" }
+      Then { writer.frames[10] ==  "B" }
+      Then { writer.frames[15] ==  "C" }
+      Then { writer.frames[20] ==  "D" }
+      Then { writer.frames[25] ==  "E" }
     end
   end
 end

data/spec/trecs/strategies/incremental_strategy_spec.rb

@@ -6,7 +6,7 @@ module TRecs
     context "initialization" do
       When(:strategy1) { IncrementalStrategy.new(message: "HELLO") }
       Then { strategy1.message == "HELLO" }
-      
+
       When(:strategy2) { IncrementalStrategy.new }
       Then { expect(strategy2).to have_failed(KeyError, /message/) }
     end
@@ -17,28 +17,28 @@ module TRecs
       When { strategy.recorder = recorder }
       Then { strategy.recorder == recorder }
     end
-    
+
     context "perform" do
-      Given { Spy.clear }
-      Given(:recorder) { Spy.new("recorder") }
+      Given(:writer)   { InMemoryWriter.new }
       Given(:strategy) { IncrementalStrategy.new(message: "Hello World") }
+      Given(:recorder) { Recorder.new(strategy: strategy, writer: writer) }
 
-      When { recorder.stub(:step) { 100 } }
       When { strategy.recorder = recorder }
+      When { recorder.record }
       When { strategy.perform }
 
-      Then { recorder.calls[1]  == [:current_frame, [ {time: 0,    content: ""}           ] ] }
-      Then { recorder.calls[2]  == [:current_frame, [ {time: 100,  content: "H"}           ] ] }
-      Then { recorder.calls[3]  == [:current_frame, [ {time: 200,  content: "He"}          ] ] }
-      Then { recorder.calls[4]  == [:current_frame, [ {time: 300,  content: "Hel"}         ] ] }
-      Then { recorder.calls[5]  == [:current_frame, [ {time: 400,  content: "Hell"}        ] ] }
-      Then { recorder.calls[6]  == [:current_frame, [ {time: 500,  content: "Hello"}       ] ] }
-      Then { recorder.calls[7]  == [:current_frame, [ {time: 600,  content: "Hello "}      ] ] }
-      Then { recorder.calls[8]  == [:current_frame, [ {time: 700,  content: "Hello W"}     ] ] }
-      Then { recorder.calls[9]  == [:current_frame, [ {time: 800,  content: "Hello Wo"}    ] ] }
-      Then { recorder.calls[10] == [:current_frame, [ {time: 900,  content: "Hello Wor"}   ] ] }
-      Then { recorder.calls[11] == [:current_frame, [ {time: 1000, content: "Hello Worl"}  ] ] }
-      Then { recorder.calls[12] == [:current_frame, [ {time: 1100, content: "Hello World"} ] ] }
+      Then { writer.frames[0]    == ""            }
+      Then { writer.frames[100]  == "H"           }
+      Then { writer.frames[200]  == "He"          }
+      Then { writer.frames[300]  == "Hel"         }
+      Then { writer.frames[400]  == "Hell"        }
+      Then { writer.frames[500]  == "Hello"       }
+      Then { writer.frames[600]  == "Hello "      }
+      Then { writer.frames[700]  == "Hello W"     }
+      Then { writer.frames[800]  == "Hello Wo"    }
+      Then { writer.frames[900]  == "Hello Wor"   }
+      Then { writer.frames[1000] == "Hello Worl"  }
+      Then { writer.frames[1100] == "Hello World" }
     end
   end
 end

data/spec/trecs/strategies/raw_file_strategy_spec.rb

@@ -41,33 +41,5 @@ module TRecs
       When { strategy.recorder = recorder }
       Then { strategy.recorder == recorder }
     end
-
-    # context "perform" do
-    #   Given { Spy.clear }
-    #   Given(:recorder) { Spy.new("recorder").ignore }
-
-    #   Given(:input_file)   { "tmp/input_file.txt" }
-    #   Given(:clock) { DummyClock.new }
-
-    #   Given(:strategy) {
-    #     RawFileStrategy.new(
-    #       file: input_file,
-    #       clock: clock)
-    #   }
-
-    #   When { recorder.stub(:step) { 100 } }
-    #   When { strategy.recorder = recorder }
-
-    #   When { strategy.perform }
-    #   When {
-    #     File.open(input_file, "rw") do |f|
-    #       f.write "A"
-    #       clock.sleep()
-    #     end
-    #   }
-
-    #   When { strategy.stop }
-    #   Then { recorder.calls[1]  == [:current_frame, [ {time: 0,    content: "A"}           ] ] }
-    # end
   end
 end

data/spec/trecs/strategies/strategy_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+require "strategies/strategy"
+
+module TRecs
+  class MyStrategy < Strategy
+    attr_accessor :action
+
+    def perform
+      current_time(0)
+      current_content("A")
+      current_format("raw")
+      save_frame
+
+      current_time(10)
+      current_content("<p>B</p>")
+      current_format("html")
+      save_frame
+
+      current_time(50)
+      current_content("C")
+      save_frame
+    end
+  end
+
+  describe Strategy do
+    Given(:strategy) { MyStrategy.new }
+
+    context "recorder" do
+      When { strategy.recorder = :recorder }
+      Then { strategy.recorder == :recorder }
+    end
+
+    context "performing" do
+      Given(:writer)   { InMemoryWriter.new }
+      When { strategy.write_frames_to(writer) }
+
+      Then { writer.frames[0].content == "A" }
+      Then { writer.frames[0].format  == "raw" }
+
+      Then { writer.frames[10].content == "<p>B</p>" }
+      Then { writer.frames[10].format  == "html" }
+    end
+
+  end
+end

data/spec/trecs/strategies/swipe_strategy_spec.rb

@@ -7,65 +7,67 @@ require "writers/in_memory_writer"
 
 module TRecs
   describe SwipeStrategy do
-    context "initialization" do
-      When(:strategy) { SwipeStrategy.new }
-      Then { expect(strategy).to have_raised(/key not found.*message/) }
-    end
-
-    context "performing" do
-      Given(:writer)   { InMemoryWriter.new }
-      Given(:recorder) { Recorder.new(strategy: strategy, writer: writer) }
-
-      When { strategy.recorder = recorder }
-      When { recorder.record }
-
-      context "one char" do
-        Given(:strategy) { SwipeStrategy.new(message: "a") }
-        Then { writer.frames[0]   == "*" }
-        Then { writer.frames[100] == "|" }
-        Then { writer.frames[200] == "a|" }
-        Then { writer.frames[300] == "a" }
-      end
-
-      context "two chars" do
-        Given(:strategy) { SwipeStrategy.new(message: "ab", step: 10) }
-        Then { writer.frames[0]  == "**" }
-        Then { writer.frames[10] == "|*" }
-        Then { writer.frames[20] == "a|" }
-        Then { writer.frames[30] == "ab|" }
-        Then { writer.frames[40] == "ab" }
-      end
-
-      context "multiple_lines" do
-        Given(:strategy) { SwipeStrategy.new(message: "FIRST\nSECOND") }
-        Then { writer.frames[0]   == "******\n******" }
-        Then { writer.frames[100] == "|*****\n|*****" }
-        Then { writer.frames[200] == "F|****\nS|****" }
-        Then { writer.frames[300] == "FI|***\nSE|***" }
-        Then { writer.frames[400] == "FIR|**\nSEC|**" }
-        Then { writer.frames[500] == "FIRS|*\nSECO|*" }
-        Then { writer.frames[600] == "FIRST|\nSECON|" }
-        Then { writer.frames[700] == "FIRST |\nSECOND|" }
-        Then { writer.frames[800] == "FIRST\nSECOND" }
-      end
-
-      context "swiper and hider" do
-        context "swiper" do
-          Given(:strategy) { SwipeStrategy.new(message: "a", swiper: ">") }
-          Then { writer.frames[0]   == "*" }
-          Then { writer.frames[100] == ">" }
-          Then { writer.frames[200] == "a>" }
-          Then { writer.frames[300] == "a" }
-        end
-
-        context "hider" do
-          Given(:strategy) { SwipeStrategy.new(message: "a", hider: "#") }
-          Then { writer.frames[0]   == "#" }
-          Then { writer.frames[100] == "|" }
-          Then { writer.frames[200] == "a|" }
-          Then { writer.frames[300] == "a" }
-        end
-      end
-    end
+    skip("Modify Swipe")
+    #context "initialization" do
+    #  When(:strategy) { SwipeStrategy.new }
+    #  Then { expect(strategy).to have_raised(/key not found.*message/) }
+    #end
+    #
+    #context "performing" do
+    #  Given(:writer)   { InMemoryWriter.new }
+    #  Given(:recorder) { Recorder.new(strategy: strategy, writer: writer) }
+    #
+    #  When { strategy.recorder = recorder }
+    #  When { recorder.record }
+    #  When { strategy.perform }
+    #
+    #  context "one char" do
+    #    Given(:strategy) { SwipeStrategy.new(message: "a") }
+    #    Then { writer.frames[0]   == "*" }
+    #    Then { writer.frames[100] == "|" }
+    #    Then { writer.frames[200] == "a|" }
+    #    Then { writer.frames[300] == "a" }
+    #  end
+    #
+    #  context "two chars" do
+    #    Given(:strategy) { SwipeStrategy.new(message: "ab", step: 10) }
+    #    Then { writer.frames[0]  == "**" }
+    #    Then { writer.frames[10] == "|*" }
+    #    Then { writer.frames[20] == "a|" }
+    #    Then { writer.frames[30] == "ab|" }
+    #    Then { writer.frames[40] == "ab" }
+    #  end
+    #
+    #  context "multiple_lines" do
+    #    Given(:strategy) { SwipeStrategy.new(message: "FIRST\nSECOND") }
+    #    Then { writer.frames[0]   == "******\n******" }
+    #    Then { writer.frames[100] == "|*****\n|*****" }
+    #    Then { writer.frames[200] == "F|****\nS|****" }
+    #    Then { writer.frames[300] == "FI|***\nSE|***" }
+    #    Then { writer.frames[400] == "FIR|**\nSEC|**" }
+    #    Then { writer.frames[500] == "FIRS|*\nSECO|*" }
+    #    Then { writer.frames[600] == "FIRST|\nSECON|" }
+    #    Then { writer.frames[700] == "FIRST |\nSECOND|" }
+    #    Then { writer.frames[800] == "FIRST\nSECOND" }
+    #  end
+    #
+    #  context "swiper and hider" do
+    #    context "swiper" do
+    #      Given(:strategy) { SwipeStrategy.new(message: "a", swiper: ">") }
+    #      Then { writer.frames[0]   == "*" }
+    #      Then { writer.frames[100] == ">" }
+    #      Then { writer.frames[200] == "a>" }
+    #      Then { writer.frames[300] == "a" }
+    #    end
+    #
+    #    context "hider" do
+    #      Given(:strategy) { SwipeStrategy.new(message: "a", hider: "#") }
+    #      Then { writer.frames[0]   == "#" }
+    #      Then { writer.frames[100] == "|" }
+    #      Then { writer.frames[200] == "a|" }
+    #      Then { writer.frames[300] == "a" }
+    #    end
+    #  end
+    #end
   end
 end

data/spec/trecs/writers/in_memory_writer_spec.rb

@@ -38,8 +38,11 @@ module TRecs
       end
     end
 
-    context "render" do
-      Then { InMemoryWriter.new.respond_to?(:render) == true }
+    context "render_frames" do
+      Given(:strategy) { InMemoryWriter.new }
+      Given(:frames) { { 0 => "A", 100 => "B" } }
+      When(:result) { strategy.render_frames(frames) }
+      Then { result == frames }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trecs
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.4.0
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -168,6 +168,7 @@ files:
 - spec/trecs/strategies/incremental_strategy_spec.rb
 - spec/trecs/strategies/raw_file_strategy_spec.rb
 - spec/trecs/strategies/shell_command_strategy_spec.rb
+- spec/trecs/strategies/strategy_spec.rb
 - spec/trecs/strategies/swipe_strategy_spec.rb
 - spec/trecs/strategies/trecs_file_strategy_spec.rb
 - spec/trecs/tickers/clock_ticker_spec.rb
@@ -217,6 +218,7 @@ test_files:
 - spec/trecs/strategies/incremental_strategy_spec.rb
 - spec/trecs/strategies/raw_file_strategy_spec.rb
 - spec/trecs/strategies/shell_command_strategy_spec.rb
+- spec/trecs/strategies/strategy_spec.rb
 - spec/trecs/strategies/swipe_strategy_spec.rb
 - spec/trecs/strategies/trecs_file_strategy_spec.rb
 - spec/trecs/tickers/clock_ticker_spec.rb