har 0.0.2 → 0.0.3

data/bin/har

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 
 require "har"
-HAR::Viewer.new(ARGV).show
+
+begin
+  HAR::Viewer.new(ARGV).show
+rescue HAR::Error => ex
+  abort "\n\n#{ex.message}"
+end

data/har.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "har"
 
   s.add_dependency "json"
-  s.add_dependency "json-schema"
+  s.add_dependency "json-schema", ">= 0.1.10"
   s.add_dependency "launchy"
 
   s.add_development_dependency "rspec", "~> 2.0"

data/lib/har.rb

@@ -2,11 +2,7 @@ require 'json'
 require 'json-schema'
 require 'time'
 
-module HAR
-  class Error < StandardError; end
-  class ValidationError < StandardError; end
-end
-
+require 'har/error'
 require 'har/version'
 require 'har/serializable'
 require 'har/schema_type'

data/lib/har/archive.rb

@@ -10,6 +10,19 @@ module HAR
       from_string File.read(path), path
     end
 
+    def self.by_merging(hars)
+      hars = hars.dup
+
+      result = hars.shift
+      result = from_file(result) unless result.kind_of? self
+
+      hars.each do |har|
+        result.merge! har.kind_of?(self) ? har : from_file(har)
+      end
+
+      result
+    end
+
     attr_reader :uri
 
     def initialize(input, uri = nil)

data/lib/har/error.rb

@@ -0,0 +1,4 @@
+module HAR
+  class Error < StandardError; end
+  class ValidationError < Error; end
+end

data/lib/har/page.rb

@@ -8,10 +8,6 @@ module HAR
       @entries = entries
     end
 
-    def title
-      @data.fetch 'title'
-    end
-
     # a little sugar
     alias_method :timings, :page_timings
 

data/lib/har/version.rb

@@ -1,3 +1,3 @@
 module HAR
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/har/viewer.rb

@@ -10,7 +10,11 @@ module HAR
       @running = false
       @options = parse(args)
 
-      @har = merge archives_from(args)
+      if @options[:validate]
+        args = validate(args)
+      end
+
+      @har = Archive.by_merging(args)
     end
 
     def show
@@ -21,16 +25,13 @@ module HAR
 
     private
 
-    def archives_from(hars)
-      hars = hars.map { |path| Archive.from_file(path) }
-
-      if @options[:validate]
-        progress("Validating archives...") do
-          hars.each { |h| h.validate! }
-        end
-      end
+    def validate(hars)
+      progress("Validating archives...") {
+        hars = hars.map { |path| Archive.from_file(path) }
+        hars.each { |h| h.validate! }
 
-      hars
+        hars
+      }
     end
 
     def create_root

data/spec/har/archive_spec.rb

@@ -17,6 +17,11 @@ module HAR
         ar.uri.should_not be_nil
         ar.uri.should include("browser-blocking-time")
       end
+
+      it "creates a single archive by merging the given paths" do
+        ar = Archive.by_merging good_hars.first(2)
+        ar.pages.size.should == 3
+      end
     end
 
     context "fetching data" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jari Bakken
@@ -40,7 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 10
+        version: 0.1.10
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -90,6 +92,7 @@ files:
 - har.gemspec
 - lib/har.rb
 - lib/har/archive.rb
+- lib/har/error.rb
 - lib/har/page.rb
 - lib/har/schema_type.rb
 - lib/har/schemas/browserType