castle-log 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4797c95bdb305b3595774e95cb3286113d71e2af
-  data.tar.gz: d026af6d58fc1eeee14c7b7a47e6fbf89ea7b159
+  metadata.gz: 9d26d17bf903f0038b5057f53782d6d3cb2edcc4
+  data.tar.gz: 57101db560f62b05d21c3e732d16f7b664dd5c65
 SHA512:
-  metadata.gz: 05ec679d02eff9db2c667b0e24d57c3dfe912999f014dbdb5282731c371aa0c195cdb1ea53ad4f94c2fa3d883a8a3b52dc9398d0c31ba07ce3a312f00e96a7e9
-  data.tar.gz: b8deaf1e2c31d3983278df6382afccbadffdc2bdb642f51496f750cd64b8e8250bfe42998d9716813d6c9b6a1dac2a7cb186eafb0c26da0d284b1ac696090246
+  metadata.gz: 5188fe7b857dfca1b2d8c714a01c7de3cc34f22282e62719a693d10bffe5ffc603366ccaa8b09a81a9ef852a96bd9f5be778cd8b17532ce323bed1c51fa6186f
+  data.tar.gz: b089e59141544d7ff6efa8de582a4e28a83dfda01aedb0cadc5b51db80a1e62f942663db46983c70a1f3e5eb41e5d2ee878d2e55d6bfc0e851384e2681f4ac7a

data/lib/castle/log/file.rb

@@ -14,14 +14,12 @@ module Castle
       # @return [Array<Session>] Sessions contained in this file
       attr_reader :sessions
 
-      # Determines if the file at the given URI is a Castle log file.  If one intends
-      # to read the file, simply using #new should be preferred in favor of this, catching any
-      # errors that may be raised.
+      # Determines if the file at the given URI is a Castle log file.
       #
       # @param uri URI to file to read
-      # @return [Boolean] true if the file is a Castle log file, false otherwise
+      # @return [Castle::Log::File] loaded file if the file is a Castle log file, nil otherwise
       def self.castle? uri
-        !!File.new(uri) rescue false
+        File.new(uri) rescue nil
       end
 
       def initialize uri

data/lib/castle/log/version.rb

@@ -1,5 +1,5 @@
 module Castle
   module Log
-    VERSION = "0.0.5"
+    VERSION = "0.1.0"
   end
 end

data/spec/file_spec.rb

@@ -21,7 +21,7 @@ describe Castle::Log::File do
       it { should have(1).sessions }
 
       it 'should have a multi-line note field' do
-        subject.notes.split("\n").should have(3).lines
+        expect(subject.notes.split("\n")).to have(3).lines
       end
 
     end
@@ -81,10 +81,18 @@ describe Castle::Log::File do
       files.should have(5).files
 
       files.each do |f|
-        Castle::Log::File.castle?(f).should be_true
+        expect(Castle::Log::File.castle?(f)).to be_true
       end
     end
 
+    it 'should return a file object' do
+      expect(Castle::Log::File.castle?(data_files[0])).to be_a(Castle::Log::File)
+    end
+
+    it 'should return nil when invalid' do
+      expect(Castle::Log::File.castle?(invalid_data_files[0])).to be_nil
+    end
+
   end
 
 end

data/spec/session_spec.rb

@@ -4,15 +4,15 @@ describe Castle::Log::Session do
 
   context 'data file long-flight.csv' do
 
-    let(:file) { Castle::Log::File.new(data_file('long-flight.csv')) }
+    before(:all) { @file = Castle::Log::File.new(data_file('long-flight.csv')) }
 
-    subject { file }
+    subject { @file }
 
     it { should have(1).sessions }
 
     context 'session 1' do
 
-      subject { file.sessions[0] }
+      subject { @file.sessions[0] }
 
       its(:duration) { should be_within(0.1).of(569.2) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: castle-log
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print