public_suffix 1.1.1 → 1.1.2

data/lib/public_suffix/list.rb

@@ -43,6 +43,83 @@ module PublicSuffix
   class List
     include Enumerable
 
+    class << self
+      attr_accessor :default
+      attr_accessor :default_definition
+    end
+
+    # Gets the default rule list.
+    # Initializes a new {PublicSuffix::List} parsing the content
+    # of {PublicSuffix::List.default_definition}, if required.
+    #
+    # @return [PublicSuffix::List]
+    def self.default
+      @default ||= parse(default_definition)
+    end
+
+    # Sets the default rule list to +value+.
+    #
+    # @param [PublicSuffix::List] value
+    #   The new rule list.
+    #
+    # @return [PublicSuffix::List]
+    def self.default=(value)
+      @default = value
+    end
+
+    # Sets the default rule list to +nil+.
+    #
+    # @return [self]
+    def self.clear
+      self.default = nil
+      self
+    end
+
+    # Resets the default rule list and reinitialize it
+    # parsing the content of {PublicSuffix::List.default_definition}.
+    #
+    # @return [PublicSuffix::List]
+    def self.reload
+      self.clear.default
+    end
+
+    # Gets the default definition list.
+    # Can be any <tt>IOStream</tt> including a <tt>File</tt>
+    # or a simple <tt>String</tt>.
+    # The object must respond to <tt>#each_line</tt>.
+    #
+    # @return [File]
+    def self.default_definition
+      @default_definition || File.new(File.join(File.dirname(__FILE__), "definitions.txt"), "r:utf-8")
+    end
+
+    # Parse given +input+ treating the content as Public Suffix List.
+    #
+    # See http://publicsuffix.org/format/ for more details about input format.
+    #
+    # @param [String] input The rule list to parse.
+    #
+    # @return [Array<PublicSuffix::Rule::*>]
+    def self.parse(input)
+      new do |list|
+        input.each_line do |line|
+          line.strip!
+
+          # strip blank lines
+          if line.empty?
+            next
+          # strip comments
+          elsif line =~ %r{^//}
+            next
+          # append rule
+          else
+            list.add(Rule.factory(line), false)
+          end
+        end
+      end
+    end
+
+
     # Gets the array of rules.
     #
     # @return [Array<PublicSuffix::Rule::*>]
@@ -202,85 +279,5 @@ module PublicSuffix
       @rules.values_at(*indices).select { |rule| rule.match?(domain) }
     end
 
-
-    @@default = nil
-
-    class << self
-
-      # Gets the default rule list.
-      # Initializes a new {PublicSuffix::List} parsing the content
-      # of {PublicSuffix::List.default_definition}, if required.
-      #
-      # @return [PublicSuffix::List]
-      def default
-        @@default ||= parse(default_definition)
-      end
-
-      # Sets the default rule list to +value+.
-      #
-      # @param [PublicSuffix::List] value
-      #   The new rule list.
-      #
-      # @return [PublicSuffix::List]
-      def default=(value)
-        @@default = value
-      end
-
-      # Sets the default rule list to +nil+.
-      #
-      # @return [self]
-      def clear
-        self.default = nil
-        self
-      end
-
-      # Resets the default rule list and reinitialize it
-      # parsing the content of {PublicSuffix::List.default_definition}.
-      #
-      # @return [PublicSuffix::List]
-      def reload
-        self.clear.default
-      end
-
-      # Gets the default definition list.
-      # Can be any <tt>IOStream</tt> including a <tt>File</tt>
-      # or a simple <tt>String</tt>.
-      # The object must respond to <tt>#each_line</tt>.
-      #
-      # @return [File]
-      def default_definition
-        File.new(File.join(File.dirname(__FILE__), "definitions.txt"), "r:utf-8")
-      end
-
-
-      # Parse given +input+ treating the content as Public Suffix List.
-      #
-      # See http://publicsuffix.org/format/ for more details about input format.
-      #
-      # @param [String] input The rule list to parse.
-      #
-      # @return [Array<PublicSuffix::Rule::*>]
-      def parse(input)
-        new do |list|
-          input.each_line do |line|
-            line.strip!
-
-            # strip blank lines
-            if line.empty?
-              next
-            # strip comments
-            elsif line =~ %r{^//}
-              next
-            # append rule
-            else
-              list.add(Rule.factory(line), false)
-            end
-          end
-        end
-      end
-
-    end
-
   end
-
 end

data/lib/public_suffix/version.rb

@@ -12,7 +12,7 @@ module PublicSuffix
   module Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/public_suffix.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "public_suffix"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = "2012-06-26"
+  s.date = "2012-09-03"
   s.description = "PublicSuffix can parse and decompose a domain name into top level domain, domain and subdomains."
   s.email = "weppos@weppos.net"
   s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG.md", "Gemfile", "LICENSE", "README.md", "Rakefile", "lib/public_suffix.rb", "lib/public_suffix/definitions.txt", "lib/public_suffix/domain.rb", "lib/public_suffix/errors.rb", "lib/public_suffix/list.rb", "lib/public_suffix/rule.rb", "lib/public_suffix/version.rb", "public_suffix.gemspec", "test/acceptance_test.rb", "test/test_helper.rb", "test/unit/domain_test.rb", "test/unit/errors_test.rb", "test/unit/list_test.rb", "test/unit/public_suffix_test.rb", "test/unit/rule_test.rb"]

data/test/unit/list_test.rb

@@ -97,23 +97,23 @@ class PublicSuffix::ListTest < Test::Unit::TestCase
 
 
   def test_self_default_getter
-    assert_equal     nil, PublicSuffix::List.send(:class_variable_get, :"@@default")
+    assert_equal     nil, PublicSuffix::List.class_eval { @default }
     PublicSuffix::List.default
-    assert_not_equal nil, PublicSuffix::List.send(:class_variable_get, :"@@default")
+    assert_not_equal nil, PublicSuffix::List.class_eval { @default }
   end
 
   def test_self_default_setter
     PublicSuffix::List.default
-    assert_not_equal nil, PublicSuffix::List.send(:class_variable_get, :"@@default")
+    assert_not_equal nil, PublicSuffix::List.class_eval { @default }
     PublicSuffix::List.default = nil
-    assert_equal     nil, PublicSuffix::List.send(:class_variable_get, :"@@default")
+    assert_equal     nil, PublicSuffix::List.class_eval { @default }
   end
 
   def test_self_clear
     PublicSuffix::List.default
-    assert_not_equal nil, PublicSuffix::List.send(:class_variable_get, :"@@default")
+    assert_not_equal nil, PublicSuffix::List.class_eval { @default }
     PublicSuffix::List.clear
-    assert_equal     nil, PublicSuffix::List.send(:class_variable_get, :"@@default")
+    assert_equal     nil, PublicSuffix::List.class_eval { @default }
   end
 
   def test_self_reload

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake