demoji 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b914bc5b630cf9c50965db1ca53d64fba97567bd
-  data.tar.gz: 8b7d5990c3f5f61b2f58e626831b856f4b15f82c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzY4NGMyYmQ2NmMwNDliNTM3YTE3NmVjN2MzZDhlZTYwNTcxOTEyZg==
+  data.tar.gz: !binary |-
+    MGFlZjdhNjQ4YjY4NWM5YTNjYzM5NjljZjFlYTRhZDVlZGRlNTBjNA==
 SHA512:
-  metadata.gz: 4139d2660aa5ae5586dc717f2af11e7f8c3aa98dcd10b7e49cbc56f968fce78695043f69ba8cefd23101f02d0ce7783ea788e88d75b09785bc495400873bfe2e
-  data.tar.gz: 6825cdf5a4ae927bc9d7b250bff7cd7392207145b0c0c4831d49272fc5cc51ae25f065fc59bcda451a04d35be3084f071d3a3f656fa5017da3efd9dfe69e9d44
+  metadata.gz: !binary |-
+    OTBhZjExNjg1NDA4Y2IwYzVhYzM5MzJmN2ZhZjhlYzk4NDNmOTc2ZGMzYzdh
+    OTM5NWM2NDFhNDI1N2E4MTJlNDI3NWNhZjlmNWVjN2Q2YTdiNWE2NTNiYjdm
+    N2U1NDUzM2VkZWRjYjY0MjkyMzMwOGRhYzVjZjYxM2NkMjFjZGI=
+  data.tar.gz: !binary |-
+    MzdmMDAwMGJmY2ZkZGM3OTliMjhiMDhiZjcwMmJjMjBiYmJjYjgzZWM5OWMy
+    MGRmOWZiMDcxNTRkODFjZjgwODgwZTM2NzBiZmEyZjdhNDc2YzcwZjkwZDBk
+    ZTU3ZWEwZWVlMDRlNjZkZWYwN2QzZDdiZDhlNGQyZDU4NDg4OGY=

data/.ruby-gemset

@@ -0,0 +1 @@
+demoji

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p551

data/lib/demoji.rb

@@ -30,7 +30,7 @@ module Demoji
 
     def _fix_utf8_attributes
       self.attributes.each do |k, v|
-        next if v.blank? || !v.is_a?(String)
+        next if v.blank? || !v.is_a?(String) || (self.column_for_attribute(k).type == :binary)
         self.send "#{k}=", _fix_chars(v)
       end
     end

data/lib/demoji/version.rb

@@ -1,3 +1,3 @@
 module Demoji
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/models/test_user_spec.rb

@@ -2,9 +2,13 @@ require 'spec_helper'
 
 describe TestUser do
 
+  def ord_to_str(ord)
+    ord.chr("UTF-8")
+  end
+
   it "doesn't blow up when trying to save emoji" do
     u = TestUser.new
-    u.name = "😊"
+    u.name = ord_to_str(65554)
     expect{ u.save }.to_not raise_error
     expect(u).to be_persisted
     expect(u.reload.name.strip).to eql ""
@@ -15,40 +19,51 @@ describe TestUser do
     TestUser.any_instance.should_receive(:_fix_utf8_attributes).once
 
     u = TestUser.new
-    u.name = "😊"
+    u.name = ord_to_str(65554)
     expect{ u.save }.to raise_error
     expect(u).to_not be_persisted
   end
 
   it "leaves other chars alone" do
     u = TestUser.new
-    u.name = "Peter Perez\n😊"
+    u.name = "Peter Perez\n#{ord_to_str(65554)}"
+    expect{ u.save }.to_not raise_error
+    expect(u).to be_persisted
+    expect(u.reload.name.strip).to eql "Peter Perez"
+  end
+
+  it "fixes non-binary columns but leaves binary columns alone" do
+    u = TestUser.new
+    u.name = "Peter Perez\n#{ord_to_str(65554)}"
+    cart = "some binary data #{ord_to_str(65554)}"
+    u.cart = cart
     expect{ u.save }.to_not raise_error
     expect(u).to be_persisted
     expect(u.reload.name.strip).to eql "Peter Perez"
+    expect(u.reload.cart).to eql "some binary data \xF0\x90\x80\x92"
   end
 
   it "doesn't mess up with valid language specific chars" do
     u = TestUser.new
-    u.name = "üç£"
+    u.name = "#{ord_to_str(252)}"
     expect { u.save }.to_not raise_error
     expect(u).to be_persisted
-    expect(u.reload.name.strip).to eql "üç£"
+    expect(u.reload.name.strip).to eql "#{ord_to_str(252)}"
   end
 
    it "doesn't remove valid 3-byte utf8 chars" do
     u = TestUser.new
-    u.name = "✔ ✫ 𐌎 abc"
+    u.name = "#{ord_to_str(10004)} #{ord_to_str(10027)} #{ord_to_str(66318)} abc"
     expect { u.save }.to_not raise_error
     expect(u).to be_persisted
-    expect(u.reload.name.strip).to eql "✔ ✫   abc"
+    expect(u.reload.name.strip).to eql "#{ord_to_str(10004)} #{ord_to_str(10027)}   abc"
   end
 
    it "doesn't remove valid 4-byte utf8 chars" do
     u = TestUser.new
-    u.name = "✔ ✫ 𠀋 abc"
+    u.name = "#{ord_to_str(10004)} #{ord_to_str(10027)} #{ord_to_str(131083)} abc"
     expect { u.save }.to_not raise_error
     expect(u).to be_persisted
-    expect(u.reload.name.strip).to eql "✔ ✫   abc"
+    expect(u.reload.name.strip).to eql "#{ord_to_str(10004)} #{ord_to_str(10027)}   abc"
   end
 end

data/spec/spec_helper.rb

@@ -21,7 +21,10 @@ RSpec.configure do |config|
     ActiveRecord::Base.establish_connection db_config
 
     ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS `test_users`")
-    ActiveRecord::Base.connection.execute("CREATE TABLE IF NOT EXISTS `test_users` (`id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, PRIMARY KEY (`id`)) DEFAULT CHARSET=utf8;")
+    ActiveRecord::Base.connection.execute(
+      "CREATE TABLE IF NOT EXISTS `test_users` (`id` int(11) NOT NULL AUTO_INCREMENT, " \
+      "`name` varchar(255) NOT NULL, `cart` blob, PRIMARY KEY (`id`)) DEFAULT CHARSET=utf8;"
+    )
   end
 
   config.before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: demoji
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - David Jairala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,42 +28,42 @@ dependencies:
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: activesupport
   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'
 - !ruby/object:Gem::Dependency
   name: activerecord
   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: Replace emojis as to not blow up utf8 MySQL
@@ -75,6 +75,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -96,17 +98,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.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: MySQL configured with utf-8 encoding blows up when trying to save text rows