smiley 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e53eb3600742e6708e0987d6954b862148881b3
-  data.tar.gz: b8d7c96b8f6f06bd42e27fc2da96fd7f436e2a59
+  metadata.gz: 4a3b0ab5e6f21a2564bf57e6fcd7f5c04818b043
+  data.tar.gz: 25d8dad4083dc276e89d2620140f1bfbaaef3044
 SHA512:
-  metadata.gz: 54597c0a81fc9a507d34c775e95a794915599a6b7c32d0423ed98dd4331809220670a8e60866b72abc28608f02135e358ed29b2696bb6a63d5044111a9193e75
-  data.tar.gz: 7cb39ed9a5dddb841ec5ed71ee6aaf14feca8ab9036dec878cd6ed9c3a5a4496dfa4a3dd7c7e899a839761cc90261717bca3cb96e0323aa4961be98e85690143
+  metadata.gz: f9df090c517b80ce7d02b26d537e17bcc15f1416a3e3bc62ed9deae4eb1da29f528ea78339b6b80a5b75114cfd11e4f2ab2311294085eed42ccffc1d9132e6bc
+  data.tar.gz: 2598b3b01fbaa9db3790f79878ea2a0899f911b72fe82be345aef7f2fa3e0642ddd44487986a8ec45ef609268fdfb5af7dec59e9b90072550c8a52c58c0a8ce6

data/Gemfile.lock

@@ -6,16 +6,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.1)
-    rake (10.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    diff-lcs (1.2.5)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.14.6)
 
 PLATFORMS
   java
@@ -23,5 +23,5 @@ PLATFORMS
 
 DEPENDENCIES
   rake (~> 10.0)
-  rspec (~> 2.13.0)
+  rspec (~> 2.13)
   smiley!

data/README.md

@@ -1,6 +1,6 @@
-[![Code Climate](https://codeclimate.com/github/iGEL/smiley.png)](https://codeclimate.com/github/iGEL/smiley) 
-[![Build Status](https://travis-ci.org/iGEL/smiley.png?branch=master)](https://travis-ci.org/iGEL/smiley) 
-(Tested: Ruby 2.0.0, 1.9.3, 1.9.2, 1.8.7, Rubinius, Jruby)
+[![Code Climate](https://codeclimate.com/github/iGEL/smiley.png)](https://codeclimate.com/github/iGEL/smiley)
+[![Build Status](https://travis-ci.org/iGEL/smiley.png?branch=master)](https://travis-ci.org/iGEL/smiley)
+(Tested: Ruby 2.1.1, 2.0.0, 1.9.3, 1.9.2, Rubinius, Jruby)
 
 Smiley
 ======
@@ -12,7 +12,7 @@ image. This way, you can use [CSS sprites](http://css-tricks.com/css-sprites/) t
 Usage
 =====
 
-First, configure the smileys you want to have converted in a yml file. If you use this lib with Ruby on Rails, the 
+First, configure the smileys you want to have converted in a yml file. If you use this lib with Ruby on Rails, the
 default position for this file is in `config/smileys.yml`.
 
 ```yml

data/Rakefile

@@ -2,4 +2,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/smiley.rb

@@ -44,7 +44,7 @@ class Smiley
 
   def parse(text)
     text = h(text).gsub(self.class.regex) do
-      %(#{$1}<em class="#{css_class(self.class.smileys[$2])}"></em>#{$3})
+      %(<em class="#{css_class(self.class.smileys[$1])}"></em>)
     end
 
     text.respond_to?(:html_safe) ? text.html_safe : text
@@ -95,8 +95,11 @@ class Smiley
     return @@regex if defined?(@@regex)
 
     before_and_after = "[.,;:!\\?\\(\\[\\{\\)\\]\\}\\-]|\\s"
-    @@regex = Regexp.compile("(^|#{before_and_after})(" +
-            smileys.keys.map { |token| Regexp.escape(token) }.join("|") +
-            ")($|#{before_and_after})", Regexp::MULTILINE)
+    @@regex = Regexp.compile(
+      "(?<=^|#{before_and_after})" +
+      "(" + smileys.keys.map { |token| Regexp.escape(token) }.join("|") + ")" +
+      "(?=$|#{before_and_after})",
+      Regexp::MULTILINE
+    )
   end
 end

data/spec/smiley_spec.rb

@@ -4,7 +4,6 @@ require 'smiley'
 describe Smiley do
   subject(:smiley) { described_class.new }
 
-
   after do
     described_class.class_eval do
       remove_class_variable :@@all_class if class_variable_defined?(:@@all_class)
@@ -56,7 +55,7 @@ describe Smiley do
     it 'return \#{Rails.root}/config/smileys.yml, if Rails.root is defined"' do
       rails = double('Rails')
       stub_const('Rails', rails)
-      rails.stub(:root) { '/home/igel/dev/example.com/' }
+      allow(rails).to receive(:root).and_return('/home/igel/dev/example.com/')
 
       expect(described_class.smiley_file).to eq('/home/igel/dev/example.com/config/smileys.yml')
     end
@@ -97,6 +96,10 @@ describe Smiley do
       expect(smiley.parse("That's so funny! :P Will tell my grandma about that :rolleyes: ")).to eq(%(That's so funny! <em class="smiley smiley-razz"></em> Will tell my grandma about that <em class="smiley smiley-rolleyes"></em> ))
     end
 
+    it 'works with smileys directly one after the other' do
+      expect(smiley.parse("That's so funny! :-) ;-)")).to eq(%(That's so funny! <em class="smiley smiley-smile"></em> <em class="smiley smiley-wink"></em>))
+    end
+
     it 'parses smileys at the beginning and end of a string' do
       expect(smiley.parse(':D So funny! ;-)')).to eq(%(<em class="smiley smiley-grin"></em> So funny! <em class="smiley smiley-wink"></em>))
     end
@@ -144,13 +147,13 @@ describe Smiley do
       erb_utils = double('ERB::Utils')
       stub_const('ERB::Utils', erb_utils)
 
-      erb_utils.should_receive(:html_escape).with('<script>alert("Hacked!")</script>').and_return('&lt;script&gt;alert(&quot;Hacked!&quot;)&lt;/script&gt;')
-      
+      expect(erb_utils).to receive(:html_escape).with('<script>alert("Hacked!")</script>').and_return('&lt;script&gt;alert(&quot;Hacked!&quot;)&lt;/script&gt;')
+
       smiley.parse('<script>alert("Hacked!")</script>')
     end
 
     it 'marks the String as HTML safe, if that method is available' do
-      String.any_instance.should_receive(:html_safe)
+      expect_any_instance_of(String).to receive(:html_safe)
 
       smiley.parse(':-)')
     end

data/spec/spec_helper.rb

@@ -4,4 +4,7 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
+  config.mock_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

metadata

@@ -1,54 +1,54 @@
 --- !ruby/object:Gem::Specification
 name: smiley
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Johannes Barre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '2.13'
 description: 
 email: igel@igels.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
-- MIT-LICENSE
-- Rakefile
 - Gemfile
 - Gemfile.lock
+- MIT-LICENSE
+- README.md
+- Rakefile
 - lib/smiley.rb
 - spec/smiley_spec.rb
 - spec/spec_helper.rb
@@ -61,17 +61,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: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A small lib to parse smileys. Use CSS to display them!