flowdock-git-hook 0.2.0 → 0.2.1

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - jruby

data/Gemfile

@@ -4,9 +4,11 @@ gem "grit", ">= 2.4.1"
 gem "multi_json"
 
 group :development do
-  gem "rspec", "~> 2.6.0"
-  gem "bundler", "~> 1.0.0"
+  gem "rdoc", ">= 2.4.2"
+  gem "rspec", "~> 2.8"
+  gem "bundler", "~> 1.0"
   gem "jeweler", "~> 1.6.2"
   gem "rcov", ">= 0"
   gem "webmock", ">= 1.6.4"
+  gem "jruby-openssl", :platforms => :jruby, :require => false
 end

data/Rakefile

@@ -37,12 +37,12 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "flowdock-git-hook #{version}"
+  rdoc.title = "flowdock #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/flowdock-git-hook.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{flowdock-git-hook}
-  s.version = "0.2.0"
+  s.name = "flowdock-git-hook"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ville Lautanala"]
-  s.date = %q{2011-08-23}
-  s.email = %q{lautis@gmail.com}
+  s.date = "2012-01-17"
+  s.email = "lautis@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "LICENSE.txt",
     "README.rdoc",
@@ -32,41 +33,46 @@ Gem::Specification.new do |s|
     "spec/flowdock_git_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/flowdock/flowdock-git-hook}
+  s.homepage = "http://github.com/flowdock/flowdock-git-hook"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Git Post-Receive hook for Flowdock}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Git Post-Receive hook for Flowdock"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<grit>, [">= 2.4.1"])
       s.add_runtime_dependency(%q<multi_json>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 1.6.4"])
+      s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
     else
       s.add_dependency(%q<grit>, [">= 2.4.1"])
       s.add_dependency(%q<multi_json>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<rdoc>, [">= 2.4.2"])
+      s.add_dependency(%q<rspec>, ["~> 2.8"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 1.6.4"])
+      s.add_dependency(%q<jruby-openssl>, [">= 0"])
     end
   else
     s.add_dependency(%q<grit>, [">= 2.4.1"])
     s.add_dependency(%q<multi_json>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<rdoc>, [">= 2.4.2"])
+    s.add_dependency(%q<rspec>, ["~> 2.8"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 1.6.4"])
+    s.add_dependency(%q<jruby-openssl>, [">= 0"])
   end
 end
 

data/lib/flowdock/git/builder.rb

@@ -33,7 +33,7 @@ module Flowdock
       end
 
       def to_hash
-        {
+        encode({
           :before   => @before,
           :after    => @after,
           :ref      => @ref,
@@ -42,7 +42,7 @@ module Flowdock
           :repository => {
             :name => File.basename(Dir.pwd).sub(/\.git$/,'')
           }
-        }.merge(if @before == "0000000000000000000000000000000000000000"
+        }).merge(if @before == "0000000000000000000000000000000000000000"
           {:created => true}
         elsif @after == "0000000000000000000000000000000000000000"
           {:deleted => true}
@@ -56,6 +56,29 @@ module Flowdock
       def filter(diffs)
         diffs.select { |e| yield e }.map { |diff| diff.b_path }
       end
+
+      # This only works on Ruby 1.9
+      def encode_as_utf8(obj)
+        if obj.is_a? Hash
+          obj.each_pair do |key, val|
+            encode_as_utf8(val)
+          end
+        elsif obj.is_a?(Array)
+          obj.each do |val|
+            encode_as_utf8(val)
+          end
+        elsif obj.is_a?(String) && obj.encoding != Encoding::UTF_8
+          if !obj.force_encoding("UTF-8").valid_encoding?
+            obj.force_encoding("ISO-8859-1").encode!(Encoding::UTF_8, :invalid => :replace, :undef => :replace)
+          end
+        end
+        obj
+      end
+
+      def encode(hash)
+        return hash unless "".respond_to? :encode
+        encode_as_utf8(hash)
+      end
     end
   end
 end

data/spec/builder_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Git Payload Builder" do
@@ -17,14 +18,14 @@ describe "Git Payload Builder" do
 
   it "detects new branch and sets created=true in data" do
     hash = Flowdock::Git::Builder.new(@repo, "refs/heads/master", "0000000000000000000000000000000000000000", @after).to_hash
-    hash[:created].should == true
-    hash[:deleted].should_not == true
+    hash[:created].should eq(true)
+    hash[:deleted].should_not eq(true)
   end
 
   it "detects deleted branch and sets deleted=true in data" do
     hash = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, "0000000000000000000000000000000000000000").to_hash
-    hash[:deleted].should == true
-    hash[:created].should_not == true
+    hash[:deleted].should eq(true)
+    hash[:created].should_not eq(true)
   end
 
   it "doesn't include commits in branch delete" do
@@ -38,6 +39,48 @@ describe "Git Payload Builder" do
       @hash = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, @after).to_hash
     end
 
+    if RUBY_VERSION > '1.9'
+      it "properly sets encoding for UTF-8 content" do
+        builder = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, "0000000000000000000000000000000000000000")
+        builder.stub(:commits).and_return([
+          {
+            :id => "0000000000000000000000000000000000000001",
+            :message => "This message contains UTF-8: ö".force_encoding("ASCII-8BIT"),
+            :timestamp => Time.now.iso8601,
+            :author => {
+              :name => "Föö Bär".force_encoding("ASCII-8BIT"),
+              :email => "foo@example.com"
+            },
+            :removed => [],
+            :added => [],
+            :modified => []
+          }
+        ])
+        builder.to_hash[:commits][0][:message].encoding.should eq(Encoding::UTF_8)
+        builder.to_hash[:commits][0][:message].should == "This message contains UTF-8: ö"
+      end
+
+      it "encodes ISO-8859-1 to UTF-8" do
+        builder = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, "0000000000000000000000000000000000000000")
+        builder.stub(:commits).and_return([
+          {
+            :id => "0000000000000000000000000000000000000001",
+            :message => "This message contains UTF-8: ö".encode("ISO-8859-1").force_encoding("ASCII-8BIT"),
+            :timestamp => Time.now.iso8601,
+            :author => {
+              :name => "Föö Bär".encode("ISO-8859-1").force_encoding("ASCII-8BIT"),
+              :email => "foo@example.com"
+            },
+            :removed => [],
+            :added => [],
+            :modified => []
+          }
+        ])
+        builder.to_hash[:commits][0][:author][:name].encoding.should eq(Encoding::UTF_8)
+        builder.to_hash[:commits][0][:author][:name].should == "Föö Bär"
+      end
+    end
+
     it "contains before" do
       @hash[:before].should == @before
     end
@@ -60,8 +103,8 @@ describe "Git Payload Builder" do
       end
 
       it "has commit author information" do
-        @hash[:commits].first[:author][:name].should == "Ville Lautanala"
-        @hash[:commits].first[:author][:email].should == "lautis@gmail.com"
+        @hash[:commits].first[:author][:name].should eq("Ville Lautanala")
+        @hash[:commits].first[:author][:email].should eq("lautis@gmail.com")
       end
 
       it "has commit id" do

data/spec/flowdock_git_spec.rb

@@ -17,6 +17,14 @@ describe "Flowdock Git Hook" do
     }.should_not raise_error
   end
 
+  it "encodes content as UTF-8" do
+    @repo = Grit::Repo.new(".")
+    @before = "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51"
+    @after = "a66d3ce668ae6f2a42d54d811962724200d5b32b"
+    @repo.stub!(:path).and_return("/foo/bar/flowdock-git-hook/.git")
+    @hash = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, @after).to_hash
+  end
+
   it "builds payload" do
     stub_request(:post, "https://api.flowdock.com/v1/git/flowdock-token")
     Flowdock::Git.post("refs/heads/master", "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51", "a1a94ba4bfa5f855676066861604b8edae1a20f5", :token => "flowdock-token")
@@ -40,7 +48,7 @@ describe "Flowdock Git Hook" do
     end
 
     it "encodes tags suitable for URI" do
-      Flowdock::Git.new(:token => "flowdock-token", :tags => "foo%bar").send(:tags).should include("foo%25bar")
+      Flowdock::Git.new(:token => "flowdock-token", :tags => ["foo%bar"]).send(:tags).should include("foo%25bar")
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flowdock-git-hook
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ville Lautanala
@@ -14,103 +15,144 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 +03:00
-default_executable: 
+date: 2012-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: grit
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 2
         - 4
         - 1
         version: 2.4.1
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  name: grit
   prerelease: false
   type: :runtime
-  name: multi_json
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  name: multi_json
+  prerelease: false
+  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: rspec
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 2
-        - 6
-        - 0
-        version: 2.6.0
+        - 4
+        - 2
+        version: 2.4.2
+  name: rdoc
+  prerelease: false
+  type: :development
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 8
+        version: "2.8"
+  name: rspec
   prerelease: false
   type: :development
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+        version: "1.0"
+  name: bundler
   prerelease: false
   type: :development
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 6
         - 2
         version: 1.6.2
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
   type: :development
-  name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  name: rcov
   prerelease: false
   type: :development
-  name: webmock
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 6
         - 4
         version: 1.6.4
-  requirement: *id007
+  name: webmock
+  prerelease: false
+  type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jruby-openssl
+  prerelease: false
+  type: :development
+  requirement: *id009
 description: 
 email: lautis@gmail.com
 executables: []
@@ -123,6 +165,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -136,7 +179,6 @@ files:
 - spec/builder_spec.rb
 - spec/flowdock_git_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/flowdock/flowdock-git-hook
 licenses: 
 - MIT
@@ -146,23 +188,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Git Post-Receive hook for Flowdock