rippersnapper 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7202bdd1f9dc7fa438a08db2f2a6e09482033ee5
-  data.tar.gz: 287f5995cb970c67673b50ac2982215ea8fe6515
+  metadata.gz: 2f34bb9857cd7aaebeade923e85ea856d187a2e9
+  data.tar.gz: ccc1cf211881f9d27fd6bccc3fd2c302143f1960
 SHA512:
-  metadata.gz: 1861dada6eb732b7b5bf1eeee82e83bc1168ef06385ffa9c3aa619d645b6eee6a5d975519d6273fefd5c3db75da284d3085551d619cda24f43f7289dc295d3ba
-  data.tar.gz: a7d4a01f0ea5e3319a6517a432d86d460b7aa8348dc4b35eb963aec412f661cb661d893095bb5ee0f64e08d2cdcc233439ab81f80c33bc81840dd8f328f38f5c
+  metadata.gz: 467c606b219291dc375c0eb276ce8bd9199551058f5b0081d065f83e6288ce2b960b8795b428844209d375f2e37de18207c80fb4a6efe4be0ad0cb8fe146475c
+  data.tar.gz: 3f9da79c65b973bbfa0e586b7ade9d0304b44bb9157c5012856ce88c4a9a26fa79fa0a4723ddfd589fdadea4c3be81c7af0fb65f4c54ac15b947a51b93f43dba

data/.travis.yml

@@ -7,5 +7,3 @@ rvm:
   - ruby-head
   - 2.1.0
   - 2.0.0
-  - 1.9.3
-  - jruby-19mode

data/README.md

@@ -36,6 +36,13 @@ Or install it yourself as:
     url.subdomain # => "foo.bar"
     url.path      # => "/asdf.html?q=arg"
 
+    # optionally preload suffixes file to avoid loading on each call to `#parse`
+    Rippersnapper.load_suffixes
+    # subsequent calls to parse will use the same `SuffixFileReader` instance
+
+    # unloading the suffixes simply sets the internal variable to `nil`
+    Rippersnapper.unload_suffixes
+
 ## Notable differences between Rippersnapper and [Domainatrix](https://github.com/pauldix/domainatrix)
 
 One of Rippersnappers goals is to be a compatible API with Domainatrix, but

data/lib/rippersnapper.rb

@@ -8,4 +8,26 @@ module Rippersnapper
   def self.parse url
     Url.new url
   end
+
+  # Load public suffix file into class instance var to be reused
+  #
+  # @return [void]
+  def self.load_suffixes file = nil
+    @suffix_file_reader = SuffixFileReader.new(file)
+  end
+
+  # Accessor for loaded suffix reader
+  #
+  # @return [SuffixFileReader]
+  # @return [nil] if not loaded
+  def self.suffix_file_reader
+    @suffix_file_reader
+  end
+
+  # Unload public suffix file
+  #
+  # @return [void]
+  def self.unload_suffixes
+    @suffix_file_reader = nil
+  end
 end

data/lib/rippersnapper/domain_parser.rb

@@ -60,7 +60,8 @@ module Rippersnapper
     end
 
     def suffix_reader
-      @suffix_reader ||= SuffixFileReader.new
+      @suffix_reader ||= (Rippersnapper.suffix_file_reader ||
+                          SuffixFileReader.new)
     end
   end
 end

data/lib/rippersnapper/version.rb

@@ -1,3 +1,3 @@
 module Rippersnapper
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/rippersnapper.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.13.0"
+  spec.add_development_dependency "rspec", "~> 3.3"
 end

data/spec/rippersnapper/domain_parser_spec.rb

@@ -6,24 +6,73 @@ module Rippersnapper
 
     context "simple domain" do
       subject { DomainParser.new "www.google.com" }
-      its(:subdomain) { should eq "www" }
-      its(:domain) { should eq "google" }
-      its(:suffix) { should eq "com" }
+
+      describe '#subdomain' do
+        subject { super().subdomain }
+        it { is_expected.to eq "www" }
+      end
+
+      describe '#domain' do
+        subject { super().domain }
+        it { is_expected.to eq "google" }
+      end
+
+      describe '#suffix' do
+        subject { super().suffix }
+        it { is_expected.to eq "com" }
+      end
     end
 
     context "complex domain" do
       subject { DomainParser.new "my.drive.google.whatever.sapporo.jp" }
-      its(:subdomain) { should eq "my.drive" }
-      its(:domain) { should eq "google" }
-      its(:suffix) { should eq "whatever.sapporo.jp" }
+
+      describe '#subdomain' do
+        subject { super().subdomain }
+        it { is_expected.to eq "my.drive" }
+      end
+
+      describe '#domain' do
+        subject { super().domain }
+        it { is_expected.to eq "google" }
+      end
+
+      describe '#suffix' do
+        subject { super().suffix }
+        it { is_expected.to eq "whatever.sapporo.jp" }
+      end
     end
 
     context "empty url" do
       subject { DomainParser.new "" }
-      its(:subdomain) { should eq "" }
-      its(:domain) { should eq "" }
-      its(:suffix) { should eq "" }
+
+      describe '#subdomain' do
+        subject { super().subdomain }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#domain' do
+        subject { super().domain }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#suffix' do
+        subject { super().suffix }
+        it { is_expected.to eq "" }
+      end
     end
 
+    context "preloaded suffix file" do
+      before { Rippersnapper.load_suffixes }
+      after { Rippersnapper.unload_suffixes }
+
+      subject { described_class.new("").send(:suffix_reader) }
+
+      it { is_expected.to be_kind_of SuffixFileReader }
+
+      it "uses the preloaded reader" do
+        expect(subject.object_id)
+          .to eq(Rippersnapper.suffix_file_reader.object_id)
+      end
+    end
   end
 end

data/spec/rippersnapper/suffix_file_validator_spec.rb

@@ -8,56 +8,64 @@ module Rippersnapper
     describe '#initialize' do
 
       context 'passing in a file' do
-        let(:file) { stub :file, each_line: [] }
+        let(:file) { double :file, each_line: [] }
         subject { SuffixFileReader.new file }
-        its(:file) { should be file}
+
+        describe '#file' do
+          subject { super().file }
+          it { is_expected.to be file}
+        end
       end
 
       context 'file default' do
         subject { SuffixFileReader.new }
-        its(:file) { should be_a_kind_of File }
+
+        describe '#file' do
+          subject { super().file }
+          it { is_expected.to be_a_kind_of File }
+        end
       end
     end
 
     describe '#contains?' do
       subject { SuffixFileReader.new }
 
-      it { should respond_to :contains? }
+      it { is_expected.to respond_to :contains? }
 
       context "matching valid data" do
 
         it 'matches a single suffix' do
-          expect(subject.contains?("com")).to be_true
+          expect(subject.contains?("com")).to be_truthy
         end
 
         it 'matches a nested suffix' do
-          expect(subject.contains?("la.us")).to be_true
+          expect(subject.contains?("la.us")).to be_truthy
         end
 
         it 'matches a suffix with a single asterix' do
-          expect(subject.contains?("whatever.uk")).to be_true
+          expect(subject.contains?("whatever.uk")).to be_truthy
         end
 
         it 'matches a suffix with multiple asterix' do
-          expect(subject.contains?("whatever.sapporo.jp")).to be_true
+          expect(subject.contains?("whatever.sapporo.jp")).to be_truthy
         end
       end
 
       context "rejecting invalid data" do
         it "doesn't match suffix that is not in file" do
-          expect(subject.contains?("baz")).to be_false
+          expect(subject.contains?("baz")).to be_falsey
         end
 
         it "doesn't match complex suffix that are not in file" do
-          expect(subject.contains?("doesnt.exist.sapporo.jp")).to be_false
+          expect(subject.contains?("doesnt.exist.sapporo.jp")).to be_falsey
         end
 
         it "doesn't match comments" do
-          expect(subject.contains?("// comment")).to be_false
+          expect(subject.contains?("// comment")).to be_falsey
         end
 
         it "doesn't match empty lines" do
-          expect(subject.contains?("")).to be_false
+          expect(subject.contains?("")).to be_falsey
         end
       end
     end

data/spec/rippersnapper/url_spec.rb

@@ -5,67 +5,203 @@ module Rippersnapper
   describe Url do
     subject { Url.new "www.google.com" }
 
-    it { should respond_to :domain }
-    it { should respond_to :scheme }
-    it { should respond_to :host }
-    it { should respond_to :path }
-    it { should respond_to :url }
-    it { should respond_to :suffix }
-    it { should respond_to :subdomain }
-    it { should respond_to :port }
+    it { is_expected.to respond_to :domain }
+    it { is_expected.to respond_to :scheme }
+    it { is_expected.to respond_to :host }
+    it { is_expected.to respond_to :path }
+    it { is_expected.to respond_to :url }
+    it { is_expected.to respond_to :suffix }
+    it { is_expected.to respond_to :subdomain }
+    it { is_expected.to respond_to :port }
 
     context "with a scheme" do
       subject { Url.new "http://drive.google.com:91/micah" }
-      its(:url) { should eq "http://drive.google.com:91/micah" }
-      its(:path) { should eq "/micah" }
-      its(:scheme) { should eq "http" }
-      its(:host) { should eq "drive.google.com" }
-      its(:suffix) { should eq "com" }
-      its(:domain) { should eq "google" }
-      its(:subdomain) { should eq "drive" }
-      its(:port) { should eq 91 }
+
+      describe '#url' do
+        subject { super().url }
+        it { is_expected.to eq "http://drive.google.com:91/micah" }
+      end
+
+      describe '#path' do
+        subject { super().path }
+        it { is_expected.to eq "/micah" }
+      end
+
+      describe '#scheme' do
+        subject { super().scheme }
+        it { is_expected.to eq "http" }
+      end
+
+      describe '#host' do
+        subject { super().host }
+        it { is_expected.to eq "drive.google.com" }
+      end
+
+      describe '#suffix' do
+        subject { super().suffix }
+        it { is_expected.to eq "com" }
+      end
+
+      describe '#domain' do
+        subject { super().domain }
+        it { is_expected.to eq "google" }
+      end
+
+      describe '#subdomain' do
+        subject { super().subdomain }
+        it { is_expected.to eq "drive" }
+      end
+
+      describe '#port' do
+        subject { super().port }
+        it { is_expected.to eq 91 }
+      end
     end
 
     context "without a scheme" do
       subject { Url.new "www.google.com/micah" }
-      its(:url) { should eq "http://www.google.com/micah" }
-      its(:path) { should eq "/micah" }
-      its(:scheme) { should eq "http" }
-      its(:host) { should eq "www.google.com" }
-      its(:suffix) { should eq "com" }
-      its(:domain) { should eq "google" }
-      its(:subdomain) { should eq "www" }
-      its(:port) { should eq 80 }
+
+      describe '#url' do
+        subject { super().url }
+        it { is_expected.to eq "http://www.google.com/micah" }
+      end
+
+      describe '#path' do
+        subject { super().path }
+        it { is_expected.to eq "/micah" }
+      end
+
+      describe '#scheme' do
+        subject { super().scheme }
+        it { is_expected.to eq "http" }
+      end
+
+      describe '#host' do
+        subject { super().host }
+        it { is_expected.to eq "www.google.com" }
+      end
+
+      describe '#suffix' do
+        subject { super().suffix }
+        it { is_expected.to eq "com" }
+      end
+
+      describe '#domain' do
+        subject { super().domain }
+        it { is_expected.to eq "google" }
+      end
+
+      describe '#subdomain' do
+        subject { super().subdomain }
+        it { is_expected.to eq "www" }
+      end
+
+      describe '#port' do
+        subject { super().port }
+        it { is_expected.to eq 80 }
+      end
     end
 
     context "with a query string" do
       subject { Url.new "www.google.com/micah?date=today" }
-      its(:path) { should eq "/micah?date=today" }
-      its(:suffix) { should eq "com" }
-      its(:domain) { should eq "google" }
+
+      describe '#path' do
+        subject { super().path }
+        it { is_expected.to eq "/micah?date=today" }
+      end
+
+      describe '#suffix' do
+        subject { super().suffix }
+        it { is_expected.to eq "com" }
+      end
+
+      describe '#domain' do
+        subject { super().domain }
+        it { is_expected.to eq "google" }
+      end
     end
 
     context "when url is nil" do
       subject {Url.new nil}
-      its(:url) { should eq "" }
-      its(:path) { should eq "" }
-      its(:scheme) { should eq "" }
-      its(:host) { should eq "" }
-      its(:suffix) { should eq "" }
-      its(:domain) { should eq "" }
-      its(:subdomain) { should eq "" }
-      its(:port) { should be_nil }
+
+      describe '#url' do
+        subject { super().url }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#path' do
+        subject { super().path }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#scheme' do
+        subject { super().scheme }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#host' do
+        subject { super().host }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#suffix' do
+        subject { super().suffix }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#domain' do
+        subject { super().domain }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#subdomain' do
+        subject { super().subdomain }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#port' do
+        subject { super().port }
+        it { is_expected.to be_nil }
+      end
     end
 
     context "whith ip address" do
       subject { Url.new "http://10.0.1.1/" }
-      its(:url) { should eq "http://10.0.1.1/" }
-      its(:path) { should eq "/" }
-      its(:scheme) { should eq "http" }
-      its(:host) { should eq "10.0.1.1" }
-      its(:suffix) { should eq "" }
-      its(:domain) { should eq "10.0.1.1" }
-      its(:subdomain) { should eq "" }
+
+      describe '#url' do
+        subject { super().url }
+        it { is_expected.to eq "http://10.0.1.1/" }
+      end
+
+      describe '#path' do
+        subject { super().path }
+        it { is_expected.to eq "/" }
+      end
+
+      describe '#scheme' do
+        subject { super().scheme }
+        it { is_expected.to eq "http" }
+      end
+
+      describe '#host' do
+        subject { super().host }
+        it { is_expected.to eq "10.0.1.1" }
+      end
+
+      describe '#suffix' do
+        subject { super().suffix }
+        it { is_expected.to eq "" }
+      end
+
+      describe '#domain' do
+        subject { super().domain }
+        it { is_expected.to eq "10.0.1.1" }
+      end
+
+      describe '#subdomain' do
+        subject { super().subdomain }
+        it { is_expected.to eq "" }
+      end
     end
   end
 end

data/spec/rippersnapper_spec.rb

@@ -1,6 +1,34 @@
 describe Rippersnapper do
   describe '::parse' do
     subject { Rippersnapper.parse "www.google.com" }
-    it { should be_a_kind_of Rippersnapper::Url }
+    it { is_expected.to be_a_kind_of Rippersnapper::Url }
+  end
+
+  describe "::load_suffixes" do
+    subject { described_class.load_suffixes }
+    after { described_class.unload_suffixes }
+    it { is_expected.to be_a_kind_of described_class::SuffixFileReader }
+  end
+
+  describe "::suffix_file_reader" do
+    subject { described_class.suffix_file_reader }
+    it { is_expected.to be_nil }
+
+    context "with loaded suffixes" do
+      before { described_class.load_suffixes }
+      after { described_class.unload_suffixes }
+      it { is_expected.to be_a_kind_of described_class::SuffixFileReader }
+    end
+  end
+
+  describe "::unload_suffixes" do
+    before { described_class.load_suffixes }
+    after { described_class.unload_suffixes }
+
+    it "unloads suffixes" do
+      expect(described_class.suffix_file_reader).to_not be_nil
+      described_class.unload_suffixes
+      expect(described_class.suffix_file_reader).to be_nil
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ require 'rippersnapper'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rippersnapper
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Micah Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.3'
 description: Rip and snap domains using Rippersnappers jaws of steele!
 email:
 - micahwoods@gmail.com
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Named after the worst decepticon ever, a shark with T-Rex arms...