har 0.0.8 → 0.0.9

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Jari Bakken
+Copyright (c) 2011-2012 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.mdown

@@ -4,8 +4,13 @@ HAR
 Ruby library to work with and view HTTP archives.
 This includes [harviewer][viewer], which can be launched through the "har" command.
 
+Install
+=======
+
+    gem install har
+
 Usage
-=============
+=====
 
     HAR::Archive.from_string(json) #=> #<Har::Archive:0x5e7cac>
     HAR::Archive.from_file(path)   #=> #<Har::Archive:0x5e7cac>
@@ -28,6 +33,6 @@ Note on Patches/Pull Requests
 Copyright
 =========
 
-Copyright (c) 2011 Jari Bakken. See LICENSE for details.
+Copyright (c) 2011-2012 Jari Bakken. See LICENSE for details.
 
 [viewer]: http://code.google.com/p/harviewer/

data/har.gemspec

@@ -15,12 +15,13 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "har"
 
   s.add_dependency "json"
-  s.add_dependency "json-schema", "= 0.1.12"
+  s.add_dependency "jschematic", ">= 0.1.0"
   s.add_dependency "launchy", ">= 0.3.7"
 
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rake", "~> 0.9.2"
+  s.add_development_dependency "pry"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/har.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'json-schema'
+require 'jschematic'
 require 'time'
 
 require 'har/error'
@@ -9,6 +9,8 @@ require 'har/schema_type'
 require 'har/page'
 require 'har/archive'
 require 'har/viewer'
+require 'har/extensions/jschematic/attributes/format'
+
 
 module Enumerable
   def group_by

data/lib/har/archive.rb

@@ -34,6 +34,23 @@ module HAR
       result
     end
 
+    # @api private
+    def self.schemas
+      @schemas ||= {}
+    end
+
+    # @api private
+    def self.add_schema(path)
+      data = JSON.parse(File.read(path))
+      id = data.fetch('id')
+
+      schemas[id] = data
+    end
+
+    Dir[File.expand_path("../schemas/*.json", __FILE__)].each do |path|
+      add_schema path
+    end
+
     attr_reader :uri
 
     def initialize(input, uri = nil)
@@ -81,26 +98,23 @@ module HAR
     end
 
     def valid?
-      JSON::Validator.validate schema_file, @data
+      Jschematic.validate @data, log_type_schema, :debug => true, :context => self.class.schemas.values
     end
 
     def validate!
-      JSON::Validator.validate2 schema_file, @data
-    rescue JSON::ValidationError => ex
-      # add archive uri to the message
-      if @uri
-        raise ValidationError, "#{@uri}: #{ex.message}"
-      else
-        raise ValidationError, ex.message
-      end
-    end
+      Jschematic.validate! @data, log_type_schema, :debug => true, :context => self.class.schemas.values
+      nil
+    rescue Jschematic::ValidationError => ex
+      msg = ex.message
+      msg = "#{@uri}: #{msg}" if @uri
 
-    protected
+      raise ValidationError, msg
+    end
 
     private
 
-    def schema_file
-      @schema_file ||= File.expand_path("../schemas/logType", __FILE__)
+    def log_type_schema
+      @schema ||= self.class.schemas.fetch('logType')
     end
 
     def merge_data(left, right, uri)
@@ -160,4 +174,3 @@ module HAR
 
   end # Archive
 end # HAR
-

data/lib/har/extensions/jschematic/attributes/format.rb

@@ -0,0 +1,21 @@
+module Jschematic
+  module Attributes
+    module Format
+
+      # Looks like HAR files have slightly non-compliant dates,
+      # so we override DateTime#accepts? to also check for that
+      class DateTime
+        alias_method :accepts_orig?, :accepts?
+
+        def accepts?(date_time)
+          accepts_orig?(date_time) || accepts_har_date?(date_time)
+        end
+
+        def accepts_har_date?(date_time)
+          # taken from harSchema.js
+          date_time =~ /^(\d{4})(-)?(\d\d)(-)?(\d\d)(T)?(\d\d)(:)?(\d\d)(:)?(\d\d)(\.\d+)?(Z|([+-])(\d\d)(:)?(\d\d))/
+        end
+      end
+    end
+  end
+end

data/lib/har/schemas/{browserType → browserType.json}

@@ -2,7 +2,6 @@
   "id": "browserType",
   "description": "Name and version info of used browser.",
   "type": "object",
-  "optional": true,
   "properties": {
     "name": {
       "type": "string",

data/lib/har/schemas/{cacheEntryType → cacheEntryType.json}

@@ -1,6 +1,5 @@
 {
   "id": "cacheEntryType",
-  "optional": true,
   "description": "Info about cache entry.",
   "properties": {
     "expires": {

data/lib/har/schemas/{entryType → entryType.json}

@@ -1,7 +1,6 @@
 {
   "id": "entryType",
   "description": "Request and Response related info",
-  "optional": true,
   "properties": {
     "pageref": {
       "type": "string"
@@ -14,7 +13,7 @@
     },
     "time": {
       "type": "integer",
-      "min": 0,
+      "minimum": 0,
       "required": true
     },
     "request": {

data/lib/har/schemas/{pageTimingsType → pageTimingsType.json}

@@ -4,11 +4,11 @@
   "properties": {
     "onContentLoad": {
       "type": "number",
-      "min": -1
+      "minimum": -1
     },
     "onLoad": {
       "type": "number",
-      "min": -1
+      "minimum": -1
     },
     "comment": {
       "type": "string"

data/lib/har/schemas/{pageType → pageType.json}

@@ -1,7 +1,6 @@
 {
   "id": "pageType",
   "description": "Exported web page",
-  "optional": true,
   "properties": {
     "startedDateTime": {
       "type": "string",
@@ -11,7 +10,6 @@
     },
     "id": {
       "type": "string",
-      "unique": true,
       "required": true
     },
     "title": {

data/lib/har/schemas/{postDataType → postDataType.json}

@@ -1,7 +1,6 @@
 {
   "id": "postDataType",
   "description": "Posted data info.",
-  "optional": true,
   "properties": {
     "mimeType": {
       "type": "string",

data/lib/har/schemas/{timingsType → timingsType.json}

@@ -4,37 +4,37 @@
   "properties": {
     "dns": {
       "type": "integer",
-      "min": -1,
+      "minimum": -1,
       "required": true
     },
     "connect": {
       "type": "integer",
-      "min": -1,
+      "minimum": -1,
       "required": true
     },
     "blocked": {
       "type": "integer",
-      "min": -1,
+      "minimum": -1,
       "required": true
     },
     "send": {
       "type": "integer",
-      "min": -1,
+      "minimum": -1,
       "required": true
     },
     "wait": {
       "type": "integer",
-      "min": -1,
+      "minimum": -1,
       "required": true
     },
     "receive": {
       "type": "integer",
-      "min": -1,
+      "minimum": -1,
       "required": true
     },
     "ssl": {
       "type": "integer",
-      "min": -1
+      "minimum": -1
     },
     "comment": {
       "type": "string"

data/lib/har/version.rb

@@ -1,3 +1,3 @@
 module HAR
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/spec_helper.rb

@@ -7,7 +7,8 @@ if ENV['COVERAGE']
 end
 
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "har"
+require 'har'
+require 'pry'
 
 module HAR
   module SpecHelper

metadata

@@ -1,123 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: har
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json-schema
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jschematic
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 1
-        - 12
-        version: 0.1.12
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 3
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.7
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.7
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby library to work with HTTP archives
-email: 
+email:
 - jari.bakken@gmail.com
-executables: 
+executables:
 - har
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -130,23 +143,24 @@ files:
 - lib/har.rb
 - lib/har/archive.rb
 - lib/har/error.rb
+- lib/har/extensions/jschematic/attributes/format.rb
 - lib/har/page.rb
 - lib/har/schema_type.rb
-- lib/har/schemas/browserType
-- lib/har/schemas/cacheEntryType
-- lib/har/schemas/cacheType
-- lib/har/schemas/contentType
-- lib/har/schemas/cookieType
-- lib/har/schemas/creatorType
-- lib/har/schemas/entryType
-- lib/har/schemas/logType
-- lib/har/schemas/pageTimingsType
-- lib/har/schemas/pageType
-- lib/har/schemas/postDataType
-- lib/har/schemas/recordType
-- lib/har/schemas/requestType
-- lib/har/schemas/responseType
-- lib/har/schemas/timingsType
+- lib/har/schemas/browserType.json
+- lib/har/schemas/cacheEntryType.json
+- lib/har/schemas/cacheType.json
+- lib/har/schemas/contentType.json
+- lib/har/schemas/cookieType.json
+- lib/har/schemas/creatorType.json
+- lib/har/schemas/entryType.json
+- lib/har/schemas/logType.json
+- lib/har/schemas/pageTimingsType.json
+- lib/har/schemas/pageType.json
+- lib/har/schemas/postDataType.json
+- lib/har/schemas/recordType.json
+- lib/har/schemas/requestType.json
+- lib/har/schemas/responseType.json
+- lib/har/schemas/timingsType.json
 - lib/har/serializable.rb
 - lib/har/version.rb
 - lib/har/viewer.rb
@@ -274,40 +288,31 @@ files:
 - spec/har/page_spec.rb
 - spec/har/viewer_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: har
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby library to work with HTTP archives
-test_files: 
+test_files:
 - spec/fixtures/entry1.json
 - spec/fixtures/hars/bad.har
 - spec/fixtures/hars/browser-blocking-time.har
@@ -319,3 +324,4 @@ test_files:
 - spec/har/page_spec.rb
 - spec/har/viewer_spec.rb
 - spec/spec_helper.rb
+has_rdoc: