har 0.0.3 → 0.0.4

data/har.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "launchy"
 
   s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "simplecov"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/har/archive.rb

@@ -13,7 +13,7 @@ module HAR
     def self.by_merging(hars)
       hars = hars.dup
 
-      result = hars.shift
+      result = hars.shift or raise ArgumentError, "no HARs given"
       result = from_file(result) unless result.kind_of? self
 
       hars.each do |har|

data/lib/har/version.rb

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

data/lib/har/viewer.rb

@@ -14,7 +14,9 @@ module HAR
         args = validate(args)
       end
 
-      @har = Archive.by_merging(args)
+      progress("Merging HARs...") {
+        @har = Archive.by_merging(args)
+      }
     end
 
     def show
@@ -48,18 +50,6 @@ module HAR
       }
     end
 
-    def merge(hars)
-      progress("Merging hars...") {
-        har = hars.shift or raise Error, "no HARs given"
-
-        unless hars.empty?
-          hars.each { |h| har.merge! h }
-        end
-
-        har
-      }
-    end
-
     DEFAULT_OPTIONS = {
       :port     => 9292,
       :validate => false
@@ -135,4 +125,4 @@ module HAR
     end
 
   end # Viewer
-end # HAR
+end # HAR

data/spec/har/archive_spec.rb

@@ -19,9 +19,13 @@ module HAR
       end
 
       it "creates a single archive by merging the given paths" do
-        ar = Archive.by_merging good_hars.first(2)
+        ar = Archive.by_merging [har_path("browser-blocking-time"), har_path("google.com")]
         ar.pages.size.should == 3
       end
+
+      it "raises ArgumentError if the given array is empty" do
+        lambda { Archive.by_merging [] }.should raise_error(ArgumentError)
+      end
     end
 
     context "fetching data" do
@@ -132,4 +136,4 @@ module HAR
     end
 
   end # Archive
-end # HAR
+end # HAR

data/spec/spec_helper.rb

@@ -1,3 +1,11 @@
+if ENV['COVERAGE']
+  raise "simplecov only works on 1.9" unless RUBY_PLATFORM >= "1.9"
+  require 'simplecov'
+  SimpleCov.start {
+    add_filter "spec/"
+  }
+end
+
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "har"
 
@@ -31,4 +39,4 @@ end
 
 RSpec.configure do |c|
   c.include HAR::SpecHelper
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jari Bakken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-01-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,19 @@ dependencies:
         version: "2.0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Ruby library to work with HTTP archives
 email: 
 - jari.bakken@gmail.com