jobparser 0.10.1 → 0.11.0

data/lib/jobparser.rb

@@ -27,16 +27,31 @@ module JobParser
   end
 
   def self.parse(url)
-    unless JobParser.config[:cache_on] && JobParser.cache.has_cache_for_url?(url) && !JobParser.cache.cache_expired?(url)
+    if JobParser.cache.has_cache_for_url?(url)
+      res = JobParser.cache.fetch_result_for_url(url)
+      if res[:schema]
+        ParseSchema.new(nil, url)
+      else
+        ParseHtml.new(nil, url)
+      end
+    else
       # we only need the HTML if there's no cache
       html = open(url, :allow_redirections => :safe).read
+      if html.include?("http://schema.org/JobPosting")
+        ParseSchema.new(html, url)
+      else
+        ParseHtml.new(html, url)
+      end
     end
 
-    if html.include?("http://schema.org/JobPosting")
-      ParseSchema.new(html, url)
-    else
-      ParseHtml.new(html, url)
-    end
+  end
+
+  def self.has_cache_for_url?(url)
+    JobParser.config[:cache_on] && JobParser.cache.has_cache_for_url?(url) && !JobParser.cache.cache_expired?(url)
+  end
+
+  def self.get_cache_for_url(url)
+
   end
 
   def self.config

data/lib/jobparser/parsehtml.rb

@@ -2,6 +2,11 @@
 module JobParser
   class ParseHtml < Parser
 
+    def job
+      res = super
+      cache(res)
+    end
+
     private
 
     def job_location

data/lib/jobparser/parser.rb

@@ -28,13 +28,18 @@ module JobParser
         :location => job_location,
         :deadline => deadline
       }
-
-      store_result_to_cache(result) if JobParser.config[:cache_on]
       result
     end
 
     private
 
+    def cache(result)
+      if JobParser.config[:cache_on]
+        store_result_to_cache(result)
+      end
+      result
+    end
+
     def store_result_to_cache(result)
       JobParser.cache.store_to_file(result)
     end

data/lib/jobparser/parseschema.rb

@@ -31,12 +31,14 @@ module JobParser
     def job
       res = super
       res[:schema] = true
-      EXTRA_SCHEMA_TEXT_FIELDS.each do |field|
-        underscore_name = underscore(field).to_sym
-        result = send("job_#{underscore_name}")
-        res[underscore_name] = result unless result.nil?
+      unless res[:from_cache]
+        EXTRA_SCHEMA_TEXT_FIELDS.each do |field|
+          underscore_name = underscore(field).to_sym
+          result = send("job_#{underscore_name}")
+          res[underscore_name] = result unless result.nil?
+        end
       end
-      res
+      cache(res)
     end
 
     private

data/lib/jobparser/version.rb

@@ -1,3 +1,3 @@
 module JobParser
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jobparser
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +164,6 @@ files:
 - lib/jobparser/regex.rb
 - lib/jobparser/scorer.rb
 - lib/jobparser/specialcases.rb
-- lib/jobparser/textfile.rb
 - lib/jobparser/version.rb
 - lib/jobparser.rb
 homepage: ''