relevance-github_hook 0.6.2 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.7.0. Switch to using ActiveSupport JSON instead of the JSON gem.  The JSON gem would not play nice with ActiveSupport's to_json within Rails projects, so the JSON gem had to go.  This means timestamps are returned as real Time objects instead of strings.
+
 v0.6.2. Capture private flag and parse it to boolean from string
 
 v0.6.0. Update for latest Github json spec; maintain backwards compatibility to avoid breaking stuff

data/README.txt

@@ -6,7 +6,7 @@
 
 == FEATURES/PROBLEMS:
 
-* Provides a simple object wrapper around the post recieve hook that Github provides.  For more details on Github's post recieve hooks, see http://github.com/guides/post-receive-hooks.
+* Provides a simple object wrapper around the post receive hook that Github provides.  For more details on Github's post receive hooks, see http://github.com/guides/post-receive-hooks.
 
 == SYNOPSIS:
 
@@ -14,7 +14,7 @@
 
 == REQUIREMENTS:
 
-* json rubygem
+* activesupport
 
 == INSTALL:
 

data/Rakefile

@@ -12,5 +12,4 @@ Echoe.new('github_hook', GithubHook::VERSION) do |p|
   rdoc_template = `allison --path`.strip << ".rb"
   p.rdoc_template = rdoc_template
   p.test_pattern = 'spec/**/*_spec.rb'
-  p.dependencies = "json"
 end

data/github_hook.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = %q{github_hook}
-  s.version = "0.6.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new("= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Sanheim"]
-  s.date = %q{2008-09-02}
+  s.date = %q{2008-09-11}
   s.description = %q{Wrapper around the github post receive JSON payload.}
   s.email = %q{opensource@thinkrelevance.com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/github_hook.rb", "README.txt"]
-  s.files = ["CHANGELOG", "github_hook.gemspec", "lib/github_hook.rb", "Manifest", "Rakefile", "README.txt", "spec/github_hook_spec.rb", "spec/helper.rb", "spec/payload.rb", "spec/vendor/bacon-0.9.0/bin/bacon", "spec/vendor/bacon-0.9.0/COPYING", "spec/vendor/bacon-0.9.0/lib/bacon.rb", "spec/vendor/bacon-0.9.0/Rakefile", "spec/vendor/bacon-0.9.0/RDOX", "spec/vendor/bacon-0.9.0/README", "spec/vendor/bacon-0.9.0/test/spec_bacon.rb"]
+  s.files = ["CHANGELOG", "github_hook.gemspec", "lib/github_hook.rb", "Manifest", "Rakefile", "README.txt", "spec/github_hook_spec.rb", "spec/helper.rb", "spec/payload.rb", "spec/vendor/bacon-0.9.0/bin/bacon", "spec/vendor/bacon-0.9.0/COPYING", "spec/vendor/bacon-0.9.0/lib/bacon.rb", "spec/vendor/bacon-0.9.0/Rakefile", "spec/vendor/bacon-0.9.0/RDOX", "spec/vendor/bacon-0.9.0/README", "spec/vendor/bacon-0.9.0/test/spec_bacon.rb", "spec/github_hook_functional_spec.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://opensource.thinkrelevance.com/wiki/github_hook}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Github_hook", "--main", "README.txt"]
@@ -16,21 +16,18 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{thinkrelevance}
   s.rubygems_version = %q{1.2.0}
   s.summary = %q{Wrapper around the github post receive JSON payload.}
-  s.test_files = ["spec/github_hook_spec.rb"]
+  s.test_files = ["spec/github_hook_functional_spec.rb", "spec/github_hook_spec.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
     if current_version >= 3 then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/lib/github_hook.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
-require 'json'
+require 'activesupport'
 require 'ostruct'
 
 class GithubHook
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
   attr_reader :before, :after, :ref, :repository, :owner, :commits
 
   def initialize(json)
-    payload = JSON.parse(json)
+    payload = ActiveSupport::JSON.decode(json)
     @before, @after, @ref = payload["before"], payload["after"], payload["ref"]
     @repository = OpenStruct.new(payload["repository"])
     @repository.private = parse_private_flag(@repository.private)
@@ -16,7 +16,7 @@ class GithubHook
   end
   
   def parse_private_flag(private_flag)
-    private_flag == "true" ? true : false
+    private_flag.to_s == "true" ? true : false
   end
   
   def create_commits(payload)

data/spec/github_hook_functional_spec.rb

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+
+describe GithubHook do
+  
+  before { @pc = GithubHook.new(FiveRunsPayLoad)}
+  
+  it "has commits" do
+    @pc.commits.should.not.be.empty
+    @pc.commits[0].sha.should == "bb7aebb382539bbd3e7a6118fc37438730c9ade5"
+    @pc.commits[0].message.should == "Note that the echoe gem is required to use the Rakefile."
+    @pc.commits[1].sha.should == "093560ad918d58f3864507f19462fd7c04f34eac"
+    @pc.commits[1].message.should == "Ignore the generated packages."
+  end
+
+end

data/spec/github_hook_spec.rb

@@ -15,7 +15,7 @@ describe GithubHook do
       commit = @pc.commits.first
       commit.url.should == "http://github.com/defunkt/github/commit/de8251ff97ee194a289832576287d6f8ad74e3d0"
       commit.message.should == "update pricing a tad"
-      commit.timestamp.should == "2008-02-15T14:36:34-08:00" 
+      commit.timestamp.should == Time.parse("2008-02-15T14:36:34-08:00")
     end
 
     it "has commit author" do
@@ -67,7 +67,7 @@ describe GithubHook do
       commit = @pc.commits.first
       commit.url.should == "http://github.com/defunkt/github/commit/41a212ee83ca127e3c8cf465891ab7216a705f59"
       commit.message.should == "okay i give in"
-      commit.timestamp.should == "2008-02-15T14:57:17-08:00"
+      commit.timestamp.should == Time.parse("2008-02-15T14:57:17-08:00")
     end
 
     it "has commit author" do
@@ -83,15 +83,18 @@ describe GithubHook do
   end
   
   describe "private project" do
-    before { @pc = GithubHook.new(PrivateProject)}
     
-    it "is private if private flag is false" do 
+    it "is private if private flag is string true" do 
+      @pc = GithubHook.new(PrivateProjectWithStringTrue)
       @pc.repository.private.should == true
     end
     
+    it "is private if private flag is literal true" do
+      @pc = GithubHook.new(PrivateProjectWithLiteralTrue)
+      @pc.repository.private.should == true
+    end
+          
   end
-    
-  
   
 end
 

data/spec/payload.rb

@@ -74,7 +74,7 @@ PayloadAfterJuly30 = <<-EOL
 }
 EOL
 
-PrivateProject = <<-EOL
+PrivateProjectWithStringTrue = <<-EOL
 { 
   "before": "5aef35982fb2d34e9d9d4502f6ede1072793222d",
   "repository": {
@@ -86,29 +86,25 @@ PrivateProject = <<-EOL
       "name": "defunkt" 
     }
   },
-  "commits": [
-    {
-      "id": "41a212ee83ca127e3c8cf465891ab7216a705f59",
-      "url": "http://github.com/defunkt/github/commit/41a212ee83ca127e3c8cf465891ab7216a705f59",
-      "author": {
-        "email": "chris@ozmm.org",
-        "name": "Chris Wanstrath" 
-      },
-      "message": "okay i give in",
-      "timestamp": "2008-02-15T14:57:17-08:00",
-      "added": ["filepath.rb"]
-    },
-    {
-      "id": "de8251ff97ee194a289832576287d6f8ad74e3d0",
-      "url": "http://github.com/defunkt/github/commit/de8251ff97ee194a289832576287d6f8ad74e3d0",
-      "author": {
-        "email": "chris@ozmm.org",
-        "name": "Chris Wanstrath" 
-      },
-      "message": "update pricing a tad",
-      "timestamp": "2008-02-15T14:36:34-08:00" 
+  "commits": [],
+  "after": "de8251ff97ee194a289832576287d6f8ad74e3d0",
+  "ref": "refs/heads/master" 
+}
+EOL
+
+PrivateProjectWithLiteralTrue = <<-EOL
+{ 
+  "before": "5aef35982fb2d34e9d9d4502f6ede1072793222d",
+  "repository": {
+    "url": "http://github.com/defunkt/github",
+    "name": "github",
+    "private": true,
+    "owner": {
+      "email": "chris@ozmm.org",
+      "name": "defunkt" 
     }
-  ],
+  },
+  "commits": [],
   "after": "de8251ff97ee194a289832576287d6f8ad74e3d0",
   "ref": "refs/heads/master" 
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: relevance-github_hook
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - Rob Sanheim
@@ -9,18 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-02 00:00:00 -07:00
+date: 2008-09-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   version_requirement: 
@@ -57,6 +48,7 @@ files:
 - spec/vendor/bacon-0.9.0/RDOX
 - spec/vendor/bacon-0.9.0/README
 - spec/vendor/bacon-0.9.0/test/spec_bacon.rb
+- spec/github_hook_functional_spec.rb
 has_rdoc: true
 homepage: http://opensource.thinkrelevance.com/wiki/github_hook
 post_install_message: 
@@ -89,4 +81,5 @@ signing_key:
 specification_version: 2
 summary: Wrapper around the github post receive JSON payload.
 test_files: 
+- spec/github_hook_functional_spec.rb
 - spec/github_hook_spec.rb