trecs 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063ffb002a27203278a25d1514da9f5175309148
-  data.tar.gz: b2d61f5b666dcd311c8257da9f6bc8e653edf23c
+  metadata.gz: 1567faa458d8727e15199ceadb97b6c08c73a05b
+  data.tar.gz: 336b1cd252fb2b75efd20cd65ca4f11553581ead
 SHA512:
-  metadata.gz: f236b56eeeda0aa44602e8714cf4ed1e06aa4119b179f2c847cc0259d4e7e616f1e43807d819f632fb8262c16f2ead7546bb60e0717381fa4d40e9d49da44d36
-  data.tar.gz: 9f32b4ad8fe607200d5a7ccb72adbf91f43d97ff87348db46712d047db40e280e4447942d3a272106344e0d24413767ffd976032a654f51fa5444b89d02da034
+  metadata.gz: 2303fc365f90d50cfdea548877847381338cd280dd4a5549e09731d0ec4ae27e4ea9fbf6b01aad0f74eae2f5417a8115e4dafdf18034edd5ae72ce4a3407d1cf
+  data.tar.gz: afe215e565ddff5f58430548c973716b32482763652b88318bfc299f871e2ec5e67a814d2c65716ac00bbc0396dc37ac166dad61f2428f4272f42199e53a8b23

data/Gemfile.lock

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

data/lib/trecs/frame.rb

@@ -2,8 +2,11 @@ module TRecs
   class Frame
     include Enumerable
     attr_accessor :content
-    def initialize(content="")
-      @content = content
+    attr_accessor :format
+    def initialize(opts={})
+      opts = opts.is_a?(Hash) ? opts : {content: opts}
+      @content = opts.fetch(:content) { "" }
+      @format  = opts.fetch(:format)  { "raw" }
     end
 
     def width
@@ -24,13 +27,17 @@ module TRecs
       content
     end
     alias :to_str :to_s
+
+    def ==(other)
+      to_s == other.to_s
+    end
   end
 
-  def Frame(value)
-    case value
-    when Frame then value
+  def Frame(opts)
+    case opts
+    when Frame then opts
     else
-      Frame.new(value.to_str)
+      Frame.new(opts)
     end
   end
   module_function :Frame

data/lib/trecs/player.rb

@@ -33,7 +33,7 @@ module TRecs
       content = reader.frame_at(time_to_play(time))
       if content != prev_content
         screen.clear
-        screen.puts(content)
+        screen.puts(content.to_s)
         self.prev_content = content
       end
       content

data/lib/trecs/readers/json_reader.rb

@@ -1,4 +1,5 @@
 require "sources/tgz_source"
+require "frame"
 
 module TRecs
   class JsonReader
@@ -20,9 +21,9 @@ module TRecs
       frames = {}
       source.read do
         json_string = source.read_entry("frames.json") || "{}"
-        parsed_json = JSON.parse(json_string)
-        parsed_json.each do |time, content|
-          frames[Integer(time)] = content
+        parsed_json = JSON.parse(json_string, symbolize_names: true)
+        parsed_json.each do |time, value|
+          frames[Integer(time.to_s)] = TRecs::Frame(value)
         end
       end
       frames
@@ -33,8 +34,7 @@ module TRecs
     end
 
     def frame_at(time)
-      frame = @frames[time]
-      frame.is_a?(Hash) ? frame["content"] : frame
+      @frames[time]
     end
 
     def to_s

data/lib/trecs/version.rb

@@ -1,3 +1,3 @@
 module TRecs
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/trecs/frame_spec.rb

@@ -5,8 +5,9 @@ module TRecs
   describe Frame do
     context "content" do
       context "initializer" do
-        Given(:frame) { Frame.new("THE CONTENT") }
+        Given(:frame) { Frame.new(content: "THE CONTENT") }
         Then { frame.content == "THE CONTENT" }
+        Then { frame.format  == "raw" }
       end
       context "set aftewards" do
         Given(:frame) { Frame.new }
@@ -31,6 +32,11 @@ FRAME
       end
     end
 
+    context "equality" do
+      Then { Frame.new(content: "A") == Frame.new("A") }
+      Then { Frame.new(content: "B") == "B" }
+    end
+
     context "height" do
       context "one line" do
         Given(:frame) { Frame.new("LINE 1") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trecs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Federico Iachetti