eightball 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzI0NTNmOGFjZGJjYTMyNzRmMTExOTZlYjFhOWVlYzMwNzhjZGZiMg==
+  data.tar.gz: !binary |-
+    YjNhZGI4M2Y4N2ZkZDM5NDVhZDFjNzgzZGY4YjI4Mzc3NWI2NmY5MA==
+SHA512:
+  metadata.gz: !binary |-
+    ZjY0OTY4MzdlMDA1ZDRjMWYzNmNjMTgwZTJkYTYzMWZlMzkyM2RhNzlkMDU4
+    YjU3MWQ5YzBjNGM3ZGNkOTE1ZWJjNmExOTY4MWNhNzc4NGQ0MzBkNGEzMjg4
+    YmYyODg1YjViNDJlYTM2OWIyZmE1ZDE2ZWExMjU3MjIxNDc5NGE=
+  data.tar.gz: !binary |-
+    OWM4MmNjMjdmOWMyN2E2MDA3YTVhYjgzYjM4ZmI2ZTJjMjdiNDdlNWE1YWZj
+    ZmYwYmQzMTJlMjJjMjhhNTc1MDNkZGNkZWM4YzU5ZTY4MmU0NGVjMTE5ZWVk
+    NTc5NzlkMGQxNDE3ZDEzYWI3OGJkOTAwMWZjZjY2ZDliZGRhYTE=

data/Gemfile

@@ -6,8 +6,9 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  gem "shoulda", "~> 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "rcov", "~> 0"
+  gem "pry"
 end

data/Gemfile.lock

@@ -1,20 +1,28 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    coderay (1.0.9)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    method_source (0.8.1)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rake (0.9.2.2)
     rcov (0.9.11)
     shoulda (2.11.3)
+    slop (3.4.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (>= 1.0.0)
   jeweler (~> 1.6.4)
+  pry
   rcov
   shoulda

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 AcademicWorks, inc.
+Copyright (c) 2013 AcademicWorks, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,10 +1,10 @@
 = eightball
 
 call "string".eightball and get back a legit UTF-8 string
-This has only been tested with ruby 1.9.2
+This has only been tested with ruby 1.9.3
 
 == Contributing to eightball
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
@@ -15,6 +15,6 @@ This has only been tested with ruby 1.9.2
 
 == Copyright
 
-Copyright (c) 2011 AcademicWorks, inc. See LICENSE.txt for
+Copyright (c) 2013 AcademicWorks, inc. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -15,12 +15,12 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "eightball"
-  gem.homepage = "http://github.com/ascruggs/eightball"
+  gem.homepage = "http://github.com/AcademicWorks/eightball"
   gem.license = "MIT"
   gem.summary = %Q{force a string to utf8 and be sure of it}
   gem.description = %Q{force a string to utf8 and be sure of it}
-  gem.email = "ascruggs@academicworks.com"
-  gem.authors = ["Aaron Scruggs"]
+  gem.email = "engineering@academicworks.com"
+  gem.authors = ["Aaron Scruggs", "Chris Botarro", "Matthew Thomas"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/eightball.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = "eightball"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aaron Scruggs"]
-  s.date = "2012-03-02"
+  s.authors = ["Aaron Scruggs", "Chris Botarro", "Matthew Thomas"]
+  s.date = "2013-12-31"
   s.description = "force a string to utf8 and be sure of it"
-  s.email = "ascruggs@academicworks.com"
+  s.email = "engineering@academicworks.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -26,13 +26,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "eightball.gemspec",
     "lib/eightball.rb",
+    "test/files/test1",
     "test/helper.rb",
     "test/test_eightball.rb"
   ]
-  s.homepage = "http://github.com/ascruggs/eightball"
+  s.homepage = "http://github.com/AcademicWorks/eightball"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.23"
   s.summary = "force a string to utf8 and be sure of it"
 
   if s.respond_to? :specification_version then
@@ -40,20 +41,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

data/lib/eightball.rb

@@ -1,22 +1,29 @@
-require 'iconv'
 module Eightball
 
-	def eightball
-		string = self.encode(Encoding::UTF_8, :invalid => :replace, :undef => :replace)
-		begin
-    		string.empty?
-  		rescue ArgumentError => e
-	    	if e.message == "invalid byte sequence in UTF-8"
-	      		Thread.current["iconv"] ||= Iconv.new('UTF-8//IGNORE', 'UTF-8')
-	      		string = Thread.current["iconv"].iconv(string)
-	    	else
-	      		raise
-	    	end
-  		end
-  		#drop the BOM
-    string.force_encoding("UTF-8").gsub("\xEF\xBB\xBF".force_encoding("UTF-8"), '')
-	end
+  def eightball
+    string = self
+    string = string.force_encoding(Encoding::UTF_8) if not_utf8?
+    string = reencode(string)
+    string = drop_bom(string)
+    string
+  end
+
+  private
+
+  def not_utf8?
+    !self.valid_encoding? || self.encoding != Encoding::UTF_8
+  end
+
+  def reencode(string)
+    string = string.encode(Encoding::UTF_16, :invalid => :replace, :undef => :replace, :replace => '?')
+    string = string.encode(Encoding::UTF_8, :invalid => :replace, :undef => :replace, :replace => '?')
+    string
+  end
+
+  def drop_bom(string)
+    string.sub(/^\xEF\xBB\xBF/, '')
+  end
 
 end
 
-String.send(:include, Eightball)
+String.send(:include, Eightball)

data/test/files/test1

@@ -0,0 +1 @@
+R. M. Princ Scholarship","Rose Marie Moline Princ, a native of the Chicago area, graduated from St. Mary�s High School and Rosary College with a degree in history, political science and English. She continued her studies at Loyola, De Paul and Northwestern and earned advanced degrees at the University of Chicago and Northern Illinois University. She taught at Nazareth Academy for seven years and at J. Sterling Morton High School in Cicero-Berwyn for twenty-seven years, where she also served as an administrator for fourteen years. Upon retiring, she joined the Illinois Retired Teachers Association and served on the Executive Board, as well as Treasurer and President of her local chapter. She now resides in Las Vegas, Nevada, where she is active in numerous organizations.",TRUE

data/test/helper.rb

@@ -9,6 +9,7 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require "pry"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_eightball.rb

@@ -3,8 +3,17 @@
 require 'helper'
 
 class TestEightball < Test::Unit::TestCase
+
   should "return utf-8 when utf-8 is called" do
     assert_equal "ウabcé", "ウabcé".encode("utf-8")
   end
+
+  should "remove invalid UTF-8 byte sequences" do
+    string = File.read("test/files/test1")
+    assert Eightball::Helpers.needs_help?(string)
+    string = string.eightball
+    assert !string.empty?
+    assert !Eightball::Helpers.needs_help?(string)
+  end
   
 end

metadata

@@ -1,62 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: eightball
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Aaron Scruggs
+- Chris Botarro
+- Matthew Thomas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70113890773960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113890773960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70113890773200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70113890773200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70113890772700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70113890772700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70113890772220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113890772220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: force a string to utf8 and be sure of it
-email: ascruggs@academicworks.com
+email: engineering@academicworks.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -72,33 +99,30 @@ files:
 - VERSION
 - eightball.gemspec
 - lib/eightball.rb
+- test/files/test1
 - test/helper.rb
 - test/test_eightball.rb
-homepage: http://github.com/ascruggs/eightball
+homepage: http://github.com/AcademicWorks/eightball
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2475021504432103746
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 3
 summary: force a string to utf8 and be sure of it