ryodo 0.2.7 → 0.3.0

data/spec/ryodo/suffix_list_fetcher_spec.rb

@@ -1,13 +1,9 @@
-# coding: utf-8
 require "ryodo/suffix_list_fetcher"
-require File.expand_path("../../spec_helper.rb", __FILE__)
+require "spec_helper"
 
 describe Ryodo::SuffixListFetcher do
-
-  before do
-    @custom_uri = "http://custom.suffix.list.example.com/foo-bar.dat"
-    @custom_storage = "#{RYODO_TMP_ROOT}/custom-storage-path.dat"
-  end
+  let(:custom_uri) { "http://custom.suffix.list.example.com/foo-bar.dat" }
+  let(:custom_storage) { "#{RYODO_TMP_ROOT}/custom-storage-path.dat" }
 
   after do
     Dir["#{RYODO_TMP_ROOT}/**/*"].each do |file|
@@ -18,33 +14,32 @@ describe Ryodo::SuffixListFetcher do
   it "#new creates a new instance with predefined vars" do
     fetcher = described_class.new
 
-    fetcher.instance_variable_get("@uri").should   == URI(Ryodo::PUBLIC_SUFFIX_DATA_URI)
-    fetcher.instance_variable_get("@store").should == Ryodo::PUBLIC_SUFFIX_STORE
+    expect(fetcher.instance_variable_get("@uri")).to eq URI(Ryodo::PUBLIC_SUFFIX_DATA_URI)
+    expect(fetcher.instance_variable_get("@store")).to be Ryodo::PUBLIC_SUFFIX_STORE
   end
 
   it "#new creates a new instance with custom vars" do
+    fetcher = described_class.new(custom_uri, custom_storage)
 
-    fetcher = described_class.new(@custom_uri, @custom_storage)
-
-    fetcher.instance_variable_get("@uri").should   == URI(@custom_uri)
-    fetcher.instance_variable_get("@store").should == @custom_storage
+    expect(fetcher.instance_variable_get("@uri")).to eq URI(custom_uri)
+    expect(fetcher.instance_variable_get("@store")).to be custom_storage
   end
 
   context "data retrieval and storage" do
-
-    let(:fetcher){ described_class.new }
+    let(:fetcher) { described_class.new }
 
     it "#fetch_data retrieves remote data" do
+      first_line = /This Source Code Form is subject to the terms of the Mozilla Public/
       fetcher.fetch_data
 
-      fetcher.instance_variable_get("@fetched_data").first.should =~ /This Source Code Form is subject to the terms of the Mozilla Public/
+      expect(fetcher.instance_variable_get("@fetched_data").first).to match(first_line)
     end
 
     it "#save_data stores fetched data into file (as cleaned set)" do
       fetcher.fetch_data
       fetcher.instance_variable_set("@prepared_data", ["dummy data"])
 
-      File.should_receive(:open).with(Ryodo::PUBLIC_SUFFIX_STORE,"w")
+      expect(File).to receive(:open).with(Ryodo::PUBLIC_SUFFIX_STORE, "w")
       fetcher.save_data
     end
 
@@ -52,29 +47,22 @@ describe Ryodo::SuffixListFetcher do
       fetcher.fetch_data
       prepared_data = fetcher.prepare_data
 
-      prepared_data.should be_an(Array)
-      prepared_data.none?{|e| e =~ /^\/\//}.should be_true # no comment lines
-      prepared_data.none?{|e| e =~ /^\n/}.should   be_true # no empty lines
+      expect(prepared_data).to be_an(Array)
+      expect(prepared_data).to_not include(%r{\A//|\A\n})
     end
-
   end
 
   context ".fetch_and_save! does all jobs" do
-
-    before do
-      @valid_uri   = Ryodo::PUBLIC_SUFFIX_DATA_URI
-      @invalid_uri = "#{Ryodo::PUBLIC_SUFFIX_DATA_URI}&invalid_file"
-      @storage     = "#{RYODO_TMP_ROOT}/suffixes.dat"
-    end
+    let(:valid_uri)   { Ryodo::PUBLIC_SUFFIX_DATA_URI }
+    let(:invalid_uri) { "#{Ryodo::PUBLIC_SUFFIX_DATA_URI}&invalid_file" }
+    let(:storage)     { "#{RYODO_TMP_ROOT}/suffixes.dat" }
 
     it "and returns true if successful" do
-      described_class.fetch_and_save!(@valid_uri, @storage).should be_true
+      expect(described_class.fetch_and_save!(valid_uri, storage)).to be true
     end
 
     it "and returns false if something failed" do
-      described_class.fetch_and_save!(@invalid_uri, @storage).should be_false
+      expect(described_class.fetch_and_save!(invalid_uri, storage)).to be false
     end
-
   end
-
 end

data/spec/ryodo/suffix_list_spec.rb

@@ -1,8 +1,6 @@
-# coding: utf-8
-require File.expand_path("../../spec_helper.rb", __FILE__)
+require "spec_helper"
 
 describe Ryodo::SuffixList do
-
   context "singleton" do
 
     it "cannot be instanciated via #new" do
@@ -14,25 +12,23 @@ describe Ryodo::SuffixList do
       described_class.send(:"SuffixList")
     end
 
-    it "instance check" do
-      o1 = described_class
-      o2 = described_class
-
-      o1.should == o2
-    end
-
     it "has .instance" do
-      described_class.methods.should include(:"instance")
+      expect(described_class.methods).to include(:instance)
     end
 
+    it "instance check" do
+      o1 = described_class.instance
+      o2 = described_class.instance
+
+      expect(o1).to be o2
+    end
   end
 
   context "methods" do
-
-    let(:described_instance){ described_class.instance }
+    let(:described_instance) { described_class.instance }
 
     it ".reload can retrieve a fresh suffix list" do
-      described_instance.should_receive(:load_file).and_return(true)
+      expect(described_instance).to receive(:load_file).and_return(true)
       described_class.reload
     end
 
@@ -41,10 +37,10 @@ describe Ryodo::SuffixList do
     end
 
     it ".list returns an array of arrays" do
-      described_class.list.should be_kind_of(Array)
-      described_class.list.any?{|e|e.is_a?(Array)}.should be_true
+      expect(described_class.list).to be_an(Array)
+      expect(
+        described_class.list.all? { |e| e.is_a?(Array) }
+      ).to be true
     end
-
   end
-
 end

data/spec/ryodo_spec.rb

@@ -1,6 +1,5 @@
-# coding: utf-8
-require File.expand_path("../spec_helper.rb", __FILE__)
+require "spec_helper"
 
 describe Ryodo do
-  pending
+  skip
 end

data/spec/spec_helper.rb

@@ -1,28 +1,11 @@
-# coding: utf-8
-
 require "coveralls"
 Coveralls.wear!
 
-$:.push(File.expand_path("../../lib", __FILE__))
-
 require "fileutils"
 require "fakeweb"
 require "uri"
 require "ryodo"
 
-RSpec::Matchers.define :include_hash do |expected|
-
-  match do |actual|
-    actual.is_a?(Hash) &&
-    expected.is_a?(Hash) &&
-    (actual.keys & expected.keys) == expected.keys &&
-    !(expected.keys.inject([]){|m,k|
-        m << expected.has_value?(actual[k])
-      }.uniq.include?(false))
-  end
-
-end
-
 RYODO_SPEC_ROOT = File.expand_path("..", __FILE__)
 RYODO_TMP_ROOT  = File.expand_path("../../tmp/spec", __FILE__)
 
@@ -31,11 +14,11 @@ FileUtils.mkdir_p RYODO_TMP_ROOT unless File.exists?(RYODO_TMP_ROOT)
 FakeWeb.register_uri(:get,
   Ryodo::PUBLIC_SUFFIX_DATA_URI,
   :body => File.read("#{RYODO_SPEC_ROOT}/_files/mozilla_effective_tld_names.dat")
-  )
+)
 
 FakeWeb.register_uri(
   :get,
   "#{Ryodo::PUBLIC_SUFFIX_DATA_URI}&invalid_file",
   :body => "Oops!",
   :status => [404,"Not Found"]
-  )
+)

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: ryodo
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Christoph Grabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 description: ryōdo【領土】 りょうど — A domain name parser gem using public suffix list (provided
   by publicsuffix.org / mozilla)
 email:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ryōdo【領土】 りょうど — A domain name parser using public suffix list