bliss 0.0.5 → 0.0.6

data/Gemfile

@@ -3,9 +3,9 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "nokogiri"
-gem "eventmachine", ">= 0.12"
-gem "em-http-request"
+gem "nokogiri", ">= 1.5.2"
+gem "eventmachine", ">= 1.0.0.beta.4"
+gem "em-http-request", ">= 1.0.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     addressable (2.2.7)
     cookiejar (0.3.0)
-    em-http-request (1.0.1)
+    em-http-request (1.0.2)
       addressable (>= 2.2.3)
       cookiejar
       em-socksify
@@ -19,10 +19,14 @@ GEM
       git (>= 1.2.5)
       rake
     multi_json (1.1.0)
-    nokogiri (1.5.0)
+    nokogiri (1.5.2)
     rake (0.9.2.2)
-    shoulda (2.11.3)
-    simplecov (0.6.0)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    simplecov (0.6.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
@@ -32,9 +36,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  em-http-request
-  eventmachine (>= 0.12)
+  em-http-request (>= 1.0.2)
+  eventmachine (>= 1.0.0.beta.4)
   jeweler (~> 1.6.4)
-  nokogiri
+  nokogiri (>= 1.5.2)
   shoulda
   simplecov

data/Rakefile

@@ -21,6 +21,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{streamed xml parsing tool}
   gem.email = "krakatoa1987@gmail.com"
   gem.authors = ["Fernando Alonso"]
+  gem.require_paths = ["lib"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bliss.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bliss"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fernando Alonso"]
-  s.date = "2012-03-01"
+  s.date = "2012-03-21"
   s.description = "streamed xml parsing tool"
   s.email = "krakatoa1987@gmail.com"
   s.extra_rdoc_files = [
@@ -46,26 +46,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12"])
-      s.add_runtime_dependency(%q<em-http-request>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.5.2"])
+      s.add_runtime_dependency(%q<eventmachine>, [">= 1.0.0.beta.4"])
+      s.add_runtime_dependency(%q<em-http-request>, [">= 1.0.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<eventmachine>, [">= 0.12"])
-      s.add_dependency(%q<em-http-request>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 1.5.2"])
+      s.add_dependency(%q<eventmachine>, [">= 1.0.0.beta.4"])
+      s.add_dependency(%q<em-http-request>, [">= 1.0.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<eventmachine>, [">= 0.12"])
-    s.add_dependency(%q<em-http-request>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 1.5.2"])
+    s.add_dependency(%q<eventmachine>, [">= 1.0.0.beta.4"])
+    s.add_dependency(%q<em-http-request>, [">= 1.0.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/bliss/parser_machine.rb

@@ -1,5 +1,7 @@
 module Bliss
   class ParserMachine
+    attr_writer :max_unhandled_bytes
+
     def initialize(path, filepath=nil)
       @path = path
       
@@ -27,11 +29,46 @@ module Bliss
 
     def on_tag_open(element, &block)
       return false if block.arity != 1
-      @sax_parser.on_tag_open(element, block)
+
+      overriden_block = Proc.new { |depth|
+        reset_unhandled_bytes
+        block.call(depth)
+      }
+      @sax_parser.on_tag_open(element, overriden_block)
     end
 
     def on_tag_close(element, &block)
-      @sax_parser.on_tag_close(element, block)
+      overriden_block = Proc.new { |hash|
+        reset_unhandled_bytes
+        block.call(hash)
+      }
+      @sax_parser.on_tag_close(element, overriden_block)
+    end
+
+    def wait_tag_close(element)
+      @wait_tag_close = "</#{element}>"
+    end
+
+    def reset_unhandled_bytes
+      return false if not check_unhandled_bytes?
+      @unhandled_bytes = 0
+    end
+
+    def check_unhandled_bytes
+      if @unhandled_bytes > @max_unhandled_bytes
+        self.close
+      end
+    end
+
+    def exceeded?
+      return false if not check_unhandled_bytes?
+      if @unhandled_bytes > @max_unhandled_bytes
+        return true
+      end
+    end
+
+    def check_unhandled_bytes?
+      @max_unhandled_bytes ? true : false
     end
 
     def root
@@ -43,33 +80,39 @@ module Bliss
     end
 
     def parse
-      @bytes = 0
+      reset_unhandled_bytes if check_unhandled_bytes?
 
       EM.run do
         http = EM::HttpRequest.new(@path).get
         http.stream { |chunk|
-          chunk.force_encoding('UTF-8')
+          if chunk
+            chunk.force_encoding('UTF-8')
 
-          @parser << chunk
+            @parser << chunk
 
-          @bytes += chunk.length
-          
-          if not @sax_parser.is_closed?
-            if @file
-              @file << chunk
+            if check_unhandled_bytes?
+              @unhandled_bytes += chunk.length
+              check_unhandled_bytes
             end
-          else
-            if @file
-              last_index = chunk.index('</ad>') + 4
-              begin
-                @file << chunk[0..last_index]
-                @file << "</#{self.root}>"
-              ensure
-                @file.close
+            
+            if not @sax_parser.is_closed?
+              if @file
+                @file << chunk
+              end
+            else
+              if @file and not exceeded? and @wait_tag_close
+                handle_wait_tag_close(chunk) #if @wait_tag_close
+              else
+                begin
+                  if @file
+                    @file.close
+                  end
+                ensure
+                  EM.stop
+                end
               end
-            end
 
-            EM.stop
+            end
           end
         }
         http.callback {
@@ -80,6 +123,29 @@ module Bliss
         }
       end
     end
+    
+    def handle_wait_tag_close(chunk)
+      begin
+        last_index = chunk.index(@wait_tag_close)
+        if last_index
+          last_index += 4
+          @file << chunk[0..last_index]
+          @file << "</#{self.root}>" # TODO set this by using actual depth, so all tags get closed
+          @file.close
+          EM.stop
+        else
+          @file << chunk
+        end
+      rescue
+        begin
+          @file.close
+        rescue
+        ensure
+          EM.stop
+        end
+      end
+    end
+
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bliss
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &10621740 !ruby/object:Gem::Requirement
+  requirement: &16081520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *10621740
+  version_requirements: *16081520
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &10620860 !ruby/object:Gem::Requirement
+  requirement: &16079400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *10620860
+  version_requirements: *16079400
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &10619800 !ruby/object:Gem::Requirement
+  requirement: &16076620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *10619800
+  version_requirements: *16076620
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &10617960 !ruby/object:Gem::Requirement
+  requirement: &16074940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10617960
+  version_requirements: *16074940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10616320 !ruby/object:Gem::Requirement
+  requirement: &16088940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10616320
+  version_requirements: *16088940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10615260 !ruby/object:Gem::Requirement
+  requirement: &16083840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *10615260
+  version_requirements: *16083840
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &10725500 !ruby/object:Gem::Requirement
+  requirement: &16094900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10725500
+  version_requirements: *16094900
 description: streamed xml parsing tool
 email: krakatoa1987@gmail.com
 executables: []
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3470161500999733584
+      hash: -3872124772469338070
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: