cinch-toolbox 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 74b989f4db81f01c47d4299fe198d9be4c846936
-  data.tar.gz: 2a248bccde80d1a50f2bce9375937f7bf031f711
+SHA1:
+  metadata.gz: 8e4cb9163dbda37fe9464c44c7e1c535393ff7e3
+  data.tar.gz: 58fdb864943f0814c191725e138e54066995842f
 SHA512:
-  metadata.gz: 1d80772822326e613ec8c225813f5e55370a164904ba04fabcd0dcf1c2b0fb009877dc3a134c3c6f014076e14cd09c85da643bef40adf346aa1e31ce88fb3340
-  data.tar.gz: 91721aaff6e505cffc115b01ff739e3a5ec76d7245de9b8548e3a6f0ad20591607ecf2f23d8bc17f7c1b9806bbb9c2c2319ca30d764e83b2ac2e47151df76a5e
+  metadata.gz: 0ea636880ff96553030ecba06476291a4c3a83226d51fcd962d4000f502d7b933ec55d53945a19c110b49e27d05696a700c307c2094f18e24de7cbc0cc713b62
+  data.tar.gz: 581c1ca7340726201fc6fc09f96a6ffc445b8c01f1b5c0effc0d1761f7142a4873dc42fb68769cf180d7480123a71d0fefea578a3e2c059c684f99431309d023

data/.travis.yml

@@ -1,8 +1,16 @@
+addons:
+    code_climate:
+        repo_token: 09ffc7d4f0f2912b317e719d8f95fd14fcfa3a0a117a24335a33c81d5013c8e5
 language: ruby
+before_install:
+  - gem update --system
+  - gem update bundler
 env:
   global:
     - "JRUBY_OPTS=-Xcext.enabled=true"
 rvm:
+  - 2.3.0
+  - 2.2.0
   - 2.1.0
   - 2.0.0
   - 1.9.3
@@ -10,15 +18,17 @@ rvm:
   - 1.8.7
   - jruby-18mode
   - jruby-19mode
-  - rbx
   - ruby-head
   - jruby-head
   - ree
 matrix:
   allow_failures:
     - rvm: 1.8.7
+    - rvm: 1.9.2
+    - rvm: 1.9.3
     - rvm: ree
     - rvm: jruby-18mode
     - rvm: jruby-19mode
     - rvm: jruby-head
+    - rvm: ruby-head
   fast_finish: true

data/cinch-toolbox.gemspec

@@ -8,21 +8,20 @@ Gem::Specification.new do |gem|
   gem.version       = Cinch::Toolbox::VERSION
   gem.authors       = ['Brian Haberer']
   gem.email         = ['bhaberer@gmail.com']
-  gem.description   = %q{A gem of various methods used in many of my plugins. If you need the namespace, let me know.}
-  gem.summary       = %q{Common methods used in Cinch Plugins.}
+  gem.description   = %q(A gem of various methods used in many of my plugins. If you need the namespace, let me know.)
+  gem.summary       = %q(Common methods used in Cinch Plugins.)
   gem.homepage      = 'https://github.com/bhaberer/cinch-toolbox'
   gem.license       = 'MIT'
-
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency  'rake'
-  gem.add_development_dependency  'rspec'
-  gem.add_development_dependency  'coveralls'
-  gem.add_development_dependency  'fakeweb',    '~> 1.3'
-  gem.add_development_dependency  'cinch-test'
+  gem.add_development_dependency 'rake', '~> 10'
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'cinch-test', '~> 0.1', '>= 0.1.0'
+  gem.add_development_dependency 'fakeweb', '~> 1.3'
+  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
 
-  gem.add_dependency              'nokogiri',   '~> 1.6.0'
+  gem.add_dependency 'nokogiri', '~> 1.6'
 end

data/lib/cinch/toolbox.rb

@@ -64,9 +64,9 @@ module Cinch
       return url if url.length < 45
       uri = URI.parse("http://is.gd/create.php?format=simple&url=#{url}")
       shortened = Net::HTTP.get(uri)
-      shortened if shortened.match(%r(https?://is.gd/))
+      shortened if shortened.match(%r{https?://is.gd/})
     rescue Errno::ETIMEDOUT
-      # if the URL shortener is down, handle it. 
+      # if the URL shortener is down, handle it.
       url
     end
 
@@ -76,7 +76,7 @@ module Cinch
     def self.expand(url)
       uri = URI.parse("http://is.gd/forward.php?format=simple&shorturl=#{url}")
       unshortened = Net::HTTP.get(uri)
-      unshortened unless unshortened.match(%r(https?://is.gd/))
+      unshortened unless unshortened.match(%r{https?://is.gd/})
     end
 
     # Truncate a given block of text, used for making sure the bot doesn't
@@ -150,10 +150,9 @@ module Cinch
     def self.parse_time_hash(times, format)
       string = []
       times.each_pair do |period, time|
-        if period == :seconds || !(time.zero? && string.empty?)
-          string << [time, format == :long ? " #{period}" : period.slice(0)]
-                      .join
-        end
+        next unless period == :seconds || !(time.zero? && string.empty?)
+
+        string << [time, format == :long ? " #{period}" : period.slice(0)].join
       end
       string.join(', ')
     end

data/lib/cinch/toolbox/version.rb

@@ -2,6 +2,6 @@
 module Cinch
   # Version Info
   module Toolbox
-    VERSION = '1.1.4'
+    VERSION = '1.1.6'
   end
 end

data/spec/cinch-toolbox_spec.rb

@@ -11,94 +11,92 @@ describe Cinch::Toolbox do
     end
 
     it 'should return a string with contents of a css selector of a web page' do
-      Cinch::Toolbox.get_html_element('http://example.com/', '.foo', :css).
-        should == 'Bar'
+      element = Cinch::Toolbox.get_html_element('http://example.com/', '.foo', :css)
+      expect(element).to eq('Bar')
     end
 
     it 'should return a string with full markup of a css selector of a web page' do
-      Cinch::Toolbox.get_html_element('http://example.com/', '.top', :css_full).
-        should == @fake_web_html
+      element = Cinch::Toolbox.get_html_element('http://example.com/', '.top', :css_full)
+      expect(element).to eq(@fake_web_html)
     end
 
     it 'should return a string with contents of a xpath selector of a web page' do
-      Cinch::Toolbox.get_html_element('http://example.com/', "//div/div[1]", :xpath).
-        should == 'Bar'
+      element = Cinch::Toolbox.get_html_element('http://example.com/', "//div/div[1]", :xpath)
+      expect(element).to eq('Bar')
     end
 
     it 'should return a string with contents of a xpath selector of a web page' do
-      Cinch::Toolbox.get_html_element('http://example.com/', "//div[@id='a1']", :xpath_full).
-        should == @fake_web_html
+      element = Cinch::Toolbox.get_html_element('http://example.com/', "//div[@id='a1']", :xpath_full)
+      expect(element).to eq(@fake_web_html)
     end
 
     it 'should return nil if the css element does not exist' do
-      Cinch::Toolbox.get_html_element('http://example.com/', '.foo2', :css).
-        should be_nil
+      element = Cinch::Toolbox.get_html_element('http://example.com/', '.foo2', :css)
+      expect(element).to be_nil
     end
 
     it 'should return nil if the xpath element does not exist' do
-      Cinch::Toolbox.get_html_element('http://example.com/', "//div/div[3]", :xpath).
-        should be_nil
+      element = Cinch::Toolbox.get_html_element('http://example.com/', "//div/div[3]", :xpath)
+      expect(element).to be_nil
     end
 
     it 'should return nil if there is a problem finding the site' do
-      Cinch::Toolbox.get_html_element('http://baddurl.com/', '.foo2', :css).
-        should be_nil
+      element = Cinch::Toolbox.get_html_element('http://baddurl.com/', '.foo2', :css)
+      expect(element).to be_nil
     end
 
     it 'should return the page title if there is a http => https trasition' do
-      Cinch::Toolbox.get_html_element('http://github.com/bhaberer/', 'title', :css).
-        should include 'bhaberer (Brian Haberer)'
+      element = Cinch::Toolbox.get_html_element('http://github.com/bhaberer/', 'title', :css)
+      expect(element).to include('bhaberer (Brian Haberer)')
     end
 
     it 'should return nil if there is a https => http trasition' do
-      Cinch::Toolbox.get_html_element('https://www.amazon.com/', 'title', :css).
-        should be_nil
+      element = Cinch::Toolbox.get_html_element('https://www.amazon.com/', 'title', :css)
+      expect(element).to be_nil
     end
   end
 
   describe 'the get_page_title method' do
-    before(:all) do
-    end
-
     it 'should return a page title for a given url' do
-      FakeWeb.register_uri( :get, "http://example.com/", :body => "<title>Page Title</table>")
-      Cinch::Toolbox.get_page_title("http://example.com/").
-        should == 'Page Title'
+      FakeWeb.register_uri( :get, 'http://example.com/',
+                            body: '<body><title>Page Title</title></body>')
+      element = Cinch::Toolbox.get_page_title('http://example.com/')
+      expect(element).to eq('Page Title')
     end
 
     it 'should return Nil if a page is lacking a title' do
-      FakeWeb.register_uri( :get, "http://example.com/", :body => "<body>Page Title</body>")
-      Cinch::Toolbox.get_page_title("http://example.com/").
-        should be_nil
+      FakeWeb.register_uri( :get, "http://example.com/", body: '<body>Page Title</body>')
+      element = Cinch::Toolbox.get_page_title('http://example.com/')
+      expect(element).to be_nil
     end
 
     it 'should return an image title if a page is a supported image type' do
       [:jpg, :jpeg, :gif, :png].each do |image|
-        Cinch::Toolbox.get_page_title("http://example.com/image.#{image}").
-          should == "Image from http://example.com"
+        img = Cinch::Toolbox.get_page_title("http://example.com/image.#{image}")
+        expect(img).to eq('Image from http://example.com')
       end
     end
 
     it 'should return Nil if a page is lacking a title' do
-      Cinch::Toolbox.get_page_title("http://i.imgur.com/oMndYK7.jpg").
-        should == "Anybody with a cat will relate. - Imgur"
+      element = Cinch::Toolbox.get_page_title("http://i.imgur.com/oMndYK7.jpg")
+      expect(element).to eq('Anybody with a cat will relate. - Imgur')
     end
   end
 
   describe 'url shortening and expanding' do
     it 'should shorten long urls' do
-      Cinch::Toolbox.shorten('http://en.wikipedia.org/wiki/Llanfairpwllgwyngyllgogerychwyrndrobwllllan').
-        should == "http://is.gd/PaUTII"
+      url = Cinch::Toolbox.shorten('http://en.wikipedia.org/wiki/Llanfairpwllgwyngyllgogerychwyrndrobwllllan')
+      expect(url).to eq('http://is.gd/PaUTII')
     end
 
     it 'should not shorten urls that are already short enough (< 45 cha)' do
-      Cinch::Toolbox.shorten('http://en.wikipedia.org/').
-        should == 'http://en.wikipedia.org/'
+      url = Cinch::Toolbox.shorten('http://en.wikipedia.org/')
+      expect(url).to eq('http://en.wikipedia.org/')
     end
 
     it 'should be able to expand shortened links' do
       url = 'http://en.wikipedia.org/wiki/Llanfairpwllgwyngyll'
-      Cinch::Toolbox.expand(Cinch::Toolbox.shorten(url)).should == url
+      expect(url).to eq(Cinch::Toolbox.expand(Cinch::Toolbox.shorten(url)))
     end
   end
 
@@ -106,30 +104,30 @@ describe Cinch::Toolbox do
     it 'should truncate text past the limit' do
       foo = String.new
       1000.times { foo << 'a' }
-      Cinch::Toolbox.truncate(foo).length.should == 250
+      expect(Cinch::Toolbox.truncate(foo).length).to eq(250)
     end
 
     it 'should not truncate text within limit' do
       foo = String.new
       1000.times { foo << 'a' }
-      Cinch::Toolbox.truncate(foo, 100).length.should == 100
+      expect(Cinch::Toolbox.truncate(foo, 100).length).to eq(100)
     end
   end
 
   describe 'time parseing' do
     it 'should parse seconds into a user friendly string' do
-      Cinch::Toolbox.time_format(126).
-        should == '2 mins, 6 seconds'
+      expect(Cinch::Toolbox.time_format(126))
+        .to eq('2 mins, 6 seconds')
     end
 
     it 'should allow users to limit the kinds of units returned' do
-      Cinch::Toolbox.time_format(126020, [:days, :seconds]).
-        should == '1 days, 20 seconds'
+      expect(Cinch::Toolbox.time_format(126020, [:days, :seconds]))
+        .to eq('1 days, 20 seconds')
     end
 
     it 'should allow users to specify short form' do
-      Cinch::Toolbox.time_format(126000, [:days], :short).
-        should == '1d'
+      expect(Cinch::Toolbox.time_format(126000, [:days], :short))
+        .to eq('1d')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,5 @@
-require 'coveralls'
-require 'simplecov'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 
 require 'cinch/toolbox'
 require 'cinch/test'

metadata

@@ -1,99 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: cinch-toolbox
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Brian Haberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: cinch-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: cinch-test
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
 description: A gem of various methods used in many of my plugins. If you need the
   namespace, let me know.
 email:
@@ -102,8 +108,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -123,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Common methods used in Cinch Plugins.