jobparser 0.13.7 → 0.13.8

data/lib/jobparser/cache.rb

@@ -1,27 +1,36 @@
 module JobParser
   class Cache
+
+    def cache_instance
+      @cache_instance || JobParser.config[:cache_storage_class].new
+    end
+
+    def valid_for_url?(url)
+      JobParser.config[:cache_on] && has_cache_for_url?(url) && !cache_expired?(url)
+    end
+
     def has_cache_for_url?(url)
-      JobParser.config[:cache_storage_class].new.has_cache_for_url?(url)
+      cache_instance.has_cache_for_url?(url)
     end
 
     def fetch_result_for_url(url)
-      JobParser.config[:cache_storage_class].new.get(url)
+      cache_instance.get(url)
     end
 
     def store_to_file(job_hash)
-      JobParser.config[:cache_storage_class].new.store(job_hash)
+      cache_instance.store(job_hash)
     end
 
     def cache_expired?(url)
-      JobParser.config[:cache_storage_class].new.cache_expired?(url)
+      cache_instance.cache_expired?(url)
     end
 
     def view_cache
-      JobParser.config[:cache_storage_class].new.view_cache
+      cache_instance.view_cache
     end
 
     def clear_all
-      JobParser.config[:cache_storage_class].new.clear_all
+      cache_instance.clear_all
     end
   end
 end

data/lib/jobparser/parser.rb

@@ -9,12 +9,8 @@ module JobParser
     end
 
     def job
-      if JobParser.config[:cache_on]
-        if JobParser.cache.has_cache_for_url?(@url)
-          if !JobParser.cache.cache_expired?(@url)
-            return JobParser.cache.fetch_result_for_url(@url)
-          end
-        end
+      if JobParser.cache.valid_for_url?(@url)
+        return JobParser.cache.fetch_result_for_url(@url)
       end
 
       @doc = strip_bad_elements(Nokogiri::HTML(@html))

data/lib/jobparser/version.rb

@@ -1,3 +1,3 @@
 module JobParser
-  VERSION = "0.13.7"
+  VERSION = "0.13.8"
 end

data/lib/jobparser.rb

@@ -24,20 +24,14 @@ require "open-uri"
 module JobParser
   def self.parser(url)
     puts "Warning: JobParser.parser is old. Use JobParser.parse"
-
     JobParser.parse(url)
   end
 
   def self.parse(url)
-    if JobParser.has_cache_for_url?(url)
+    if JobParser.cache.valid_for_url?(url)
       res = JobParser.cache.fetch_result_for_url(url)
-      if res[:schema]
-        ParseSchema.new(nil, url)
-      else
-        ParseHtml.new(nil, url)
-      end
+      res[:schema] ? ParseSchema.new(nil, url) : ParseHtml.new(nil, url)
     else
-      # we only need the HTML if there's no cache
       begin
         html = open(url, :allow_redirections => :safe).read
         if html.include?("http://schema.org/JobPosting")
@@ -48,13 +42,7 @@ module JobParser
       rescue URI::InvalidURIError
         raise JobParser::Error::InvalidUrl, "The URI given was not valid"
       end
-
     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.config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jobparser
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.13.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler