public-suffix-list 0.1.5 → 0.1.6

data/Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 group :test do
   gem 'rspec'
+  gem 'timecop'
 end

data/README.rdoc

@@ -71,11 +71,11 @@ Install the gem directly:
 
 Or add it to your Gemfile and use bundler:
 
-  gem 'public-suffix-list', '~> 0.1.4'
+  gem 'public-suffix-list'
 
 == License
 
-Copyright (c) 2010-2016 Todd Sundsted
+Copyright (c) 2010-2017 Todd Sundsted
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/public_suffix_list.rb

@@ -6,7 +6,7 @@ require "public_suffix_list/parser.rb"
 
 class PublicSuffixList
 
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 
   def self.config
     @@config ||= Config.new

data/lib/public_suffix_list/cache_file.rb

@@ -31,11 +31,7 @@ class PublicSuffixList
     end
 
     def data
-      @data or (load_data and @data) or @data = {created_at: Time.now, tag: rand(36**8).to_s(36)}
-    end
-
-    def data=(data)
-      @data = data and dump_data
+      @data or (load_data and @data) or @data = {}
     end
 
     def [](key)
@@ -43,7 +39,7 @@ class PublicSuffixList
     end
 
     def []=(key, value)
-      data[key] = value and dump_data
+      data.merge!({key => value, created_at: Time.now, tag: rand(36**8).to_s(36)}) and dump_data
     end
 
     def expired?

data/spec/caching.spec

@@ -1,5 +1,6 @@
 require 'tmpdir'
 require 'public_suffix_list'
+require 'timecop'
 
 describe PublicSuffixList do
 
@@ -15,20 +16,44 @@ describe PublicSuffixList do
     public_suffix_list.cache_file.cache?.should be true
     public_suffix_list.cache_file.exist?.should be true
     created_at = public_suffix_list.cache_file.data[:created_at]
-    tag  = public_suffix_list.cache_file.data[:tag]
+    tag = public_suffix_list.cache_file.data[:tag]
     public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
     public_suffix_list.cache_file.cache?.should be true
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.data[:created_at].should == created_at
     public_suffix_list.cache_file.data[:tag].should == tag
-    public_suffix_list.cache_file.data[:created_at] = Time.now - 100
-    public_suffix_list.cache_file.data[:tag] = "1234567890"
-    public_suffix_list.cache_file.dump_data
+  end
+
+  it "should fetch a new data file when the cache expiry has passed" do
+    File.exist?(FILE).should be false
+    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+    public_suffix_list.cache_file.cache?.should be true
+    public_suffix_list.cache_file.exist?.should be true
+    created_at = public_suffix_list.cache_file.data[:created_at]
+    tag = public_suffix_list.cache_file.data[:tag]
+    Timecop.travel(Time.now + 15) do
+      public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+      public_suffix_list.cache_file.cache?.should be true
+      public_suffix_list.cache_file.exist?.should be true
+      public_suffix_list.cache_file.data[:created_at].should_not == created_at
+      public_suffix_list.cache_file.data[:tag].should_not == tag
+    end
+  end
+
+  it "should not fetch a new data file when the cache expiry has not passed" do
+    File.exist?(FILE).should be false
     public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
     public_suffix_list.cache_file.cache?.should be true
     public_suffix_list.cache_file.exist?.should be true
-    public_suffix_list.cache_file.data[:created_at].should_not == created_at
-    public_suffix_list.cache_file.data[:tag].should_not == tag
+    created_at = public_suffix_list.cache_file.data[:created_at]
+    tag = public_suffix_list.cache_file.data[:tag]
+    Timecop.travel(Time.now + 5) do
+      public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+      public_suffix_list.cache_file.cache?.should be true
+      public_suffix_list.cache_file.exist?.should be true
+      public_suffix_list.cache_file.data[:created_at].should == created_at
+      public_suffix_list.cache_file.data[:tag].should == tag
+    end
   end
 
   it "should allow 0 or nil to specify an infinite cache expiry period" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public-suffix-list
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies: []
 description: The Public Suffix List (http://publicsuffix.org/) is "a cross-vendor
   initiative to provide an accurate list of domain name suffixes". Such a list is