public-suffix-list 0.0.4 → 0.0.5

data/lib/public_suffix_list.rb

@@ -6,7 +6,7 @@ require "public_suffix_list/parser.rb"
 
 class PublicSuffixList
 
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 
   def self.config
     @@config ||= Config.new
@@ -38,9 +38,9 @@ class PublicSuffixList
     if @config.cache_dir
       @cache_file = CacheFile.new(@config)
     end
-    if @config.cache_dir && File.directory?(@config.cache_dir) && File.exist?(File.join(@config.cache_dir, name))
+    if @cache_file and @cache_file.exist?
       uncache or (download and cache)
-    elsif @config.cache_dir && File.directory?(@config.cache_dir)
+    elsif @cache_file
       download and cache
     else
       download

data/lib/public_suffix_list/cache_file.rb

@@ -7,15 +7,11 @@ class PublicSuffixList
     end
 
     def cache?
-      @config.cache_dir && true
-    end
-
-    def name
-      URI.parse(@config.effective_tld_names_url).path.split("/").last + ".cache" if cache?
+      @config.cache_dir && File.directory?(@config.cache_dir) && true
     end
 
     def file
-      File.join(@config.cache_dir, name) if cache?
+      File.join(@config.cache_dir, URI.parse(@config.effective_tld_names_url).path.split("/").last + ".cache") if cache?
     end
 
     def exist?
@@ -35,7 +31,7 @@ class PublicSuffixList
     end
 
     def data
-      @data or (load_data and @data) or @data = {:created_at => Time.now}
+      @data or (load_data and @data) or @data = {:created_at => Time.now, :tag => rand(36**8).to_s(36)}
     end
 
     def data=(data)
@@ -46,14 +42,6 @@ class PublicSuffixList
       !cache? or !([0, nil].include?(@config.cache_expiry_period) or data[:created_at] + @config.cache_expiry_period > Time.now)
     end
 
-    def read_attribute(attribute)
-      data[attribute]
-    end
-
-    def write_attribute(attribute, value)
-      data[attribute] = value
-    end
-
   end
 
 end

data/spec/caching.spec

@@ -14,20 +14,21 @@ describe PublicSuffixList 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
-    created_at = public_suffix_list.cache_file.read_attribute(:created_at)
-    tag  = public_suffix_list.cache_file.read_attribute(:tag)
+    created_at = public_suffix_list.cache_file.data[:created_at]
+    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.read_attribute(:created_at).should == created_at
-    public_suffix_list.cache_file.read_attribute(:tag).should == tag
-    public_suffix_list.cache_file.write_attribute :created_at, Time.now - 100
+    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
     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.read_attribute(:created_at).should_not == created_at
-    public_suffix_list.cache_file.read_attribute(:tag).should_not == tag
+    public_suffix_list.cache_file.data[:created_at].should_not == created_at
+    public_suffix_list.cache_file.data[:tag].should_not == tag
   end
 
   it "should allow 0 or nil to specify an infinite cache expiry period" do
@@ -35,7 +36,7 @@ describe PublicSuffixList 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.exist?.should be true
     public_suffix_list.cache_file.expired?.should be false
-    public_suffix_list.cache_file.write_attribute :created_at, Time.now - 100
+    public_suffix_list.cache_file.data[:created_at] = Time.now - 100
     public_suffix_list.cache_file.expired?.should be true
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.delete
@@ -43,7 +44,7 @@ describe PublicSuffixList do
     public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 0)
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.expired?.should be false
-    public_suffix_list.cache_file.write_attribute :created_at, Time.now - 10000000
+    public_suffix_list.cache_file.data[:created_at] = Time.now - 10000000
     public_suffix_list.cache_file.expired?.should be false
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.delete
@@ -51,7 +52,7 @@ describe PublicSuffixList do
     public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => nil)
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.expired?.should be false
-    public_suffix_list.cache_file.write_attribute :created_at, Time.now - 10000000
+    public_suffix_list.cache_file.data[:created_at] = Time.now - 10000000
     public_suffix_list.cache_file.expired?.should be false
     public_suffix_list.cache_file.exist?.should be true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: public-suffix-list
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Todd Sundsted
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -05:00
+date: 2010-01-12 00:00:00 -05:00
 default_executable: 
 dependencies: []