rest-graph 1.9.1 → 2.0.0

data/task/.gitignore

@@ -0,0 +1 @@
+*.rbc

data/task/gemgem.rb

@@ -11,23 +11,87 @@ module Gemgem
     yield(spec = Gem::Specification.new{ |s|
       s.authors     = ['Lin Jen-Shin (godfat)']
       s.email       = ['godfat (XD) godfat.org']
-      s.homepage    = "https://github.com/godfat/#{s.name}"
 
-      s.summary     = File.read("#{Gemgem.dir}/README").
-                      match(/DESCRIPTION:\n\n(.+?)\n\n/m)[1]
-      s.description = s.summary
+      s.description = description.join
+      s.summary     = description.first
 
-      s.extra_rdoc_files = %w[CHANGES CONTRIBUTORS LICENSE TODO]
-      s.rdoc_options     = %w[--main README]
       s.rubygems_version = Gem::VERSION
       s.date             = Time.now.strftime('%Y-%m-%d')
       s.files            = gem_files
       s.test_files       = gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
+      s.executables      = Dir['bin/*'].map{ |f| File.basename(f) }
       s.require_paths    = %w[lib]
     })
+    spec.homepage ||= "https://github.com/godfat/#{spec.name}"
     spec
   end
 
+  def readme
+    path = %w[README.md README].find{ |name|
+      File.exist?("#{Gemgem.dir}/#{name}")
+    }
+    @readme ||=
+      if path
+        ps = File.read(path).scan(/#+[^\n]+\n\n.+?(?=\n\n#+[^\n]+\n)/m)
+        ps.inject({'HEADER' => ps.first}){ |r, s, i|
+          r[s[/\w+/]] = s
+          r
+        }
+      else
+        {}
+      end
+  end
+
+  def description
+    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
+  end
+
+  def changes
+    path = %w[CHANGES.md CHANGES].find{ |name|
+      File.exist?("#{Gemgem.dir}/#{name}")
+    }
+    @changes ||=
+      if path
+        date = '\d+{4}\-\d+{2}\-\d{2}'
+        File.read(path).match(
+          /([^\n]+#{date}\n\n(.+?))(?=\n\n[^\n]+#{date}\n|\Z)/m)[1]
+      else
+        ''
+      end
+  end
+
+  def ann_md
+    "##{readme['HEADER'].sub(/([\w\-]+)/, "[\\1](#{spec.homepage})")}\n\n" \
+    "##{readme['DESCRIPTION'][/[^\n]+\n\n[^\n]+/]}\n\n"                    \
+    "### CHANGES:\n\n"                                                     \
+    "###{changes}\n\n"                                                     \
+    "##{readme['INSTALLATION']}\n\n"                                       +
+    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS']}" else '' end
+  end
+
+  def ann_html
+    gem 'nokogiri'
+    gem 'kramdown'
+
+    IO.popen('kramdown', 'r+') do |md|
+      md.puts Gemgem.ann_md
+      md.close_write
+      require 'nokogiri'
+      html = Nokogiri::XML.parse("<gemgem>#{md.read}</gemgem>")
+      html.css('*').each{ |n| n.delete('id') }
+      html.root.children.to_html
+    end
+  end
+
+  def ann_email
+    "#{readme['HEADER'].sub(/([\w\-]+)/, "\\1 <#{spec.homepage}>")}\n\n" \
+    "#{readme['DESCRIPTION']}\n\n"                                       \
+    "#{readme['INSTALLATION']}\n\n"                                      +
+    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS']}\n\n" else '' end  +
+    "## CHANGES:\n\n"                                                    \
+    "##{changes}\n\n"
+  end
+
   def gem_tag
     "#{spec.name}-#{spec.version}"
   end
@@ -82,7 +146,7 @@ module Gemgem
 
   def ignore_patterns
     @ignore_files ||= expand_patterns(
-      File.read("#{dir}/.gitignore").split("\n").reject{ |pattern|
+      gitignore.split("\n").reject{ |pattern|
         pattern.strip == ''
       }).map{ |pattern| %r{^([^/]+/)*?#{Regexp.escape(pattern)}(/[^/]+)*?$} }
   end
@@ -99,6 +163,14 @@ module Gemgem
       end
     }.flatten
   end
+
+  def gitignore
+    if File.exist?(path = "#{dir}/.gitignore")
+      File.read(path)
+    else
+      ''
+    end
+  end
 end
 
 namespace :gem do
@@ -127,23 +199,52 @@ task :check do
   ver = Gemgem.spec.version.to_s
 
   if ENV['VERSION'].nil?
-    puts("\x1b[35mExpected "                                        \
-         "\x1b[33mVERSION\x1b[35m=\x1b[33m#{ver}\x1b[m")
+    puts("\e[35mExpected "                                  \
+         "\e[33mVERSION\e[35m=\e[33m#{ver}\e[m")
     exit(1)
 
   elsif ENV['VERSION'] != ver
-    puts("\x1b[35mExpected \x1b[33mVERSION\x1b[35m=\x1b[33m#{ver} " \
-         "\x1b[35mbut got\n         "                               \
-         "\x1b[33mVERSION\x1b[35m=\x1b[33m#{ENV['VERSION']}\x1b[m")
+    puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
+         "\e[35mbut got\n         "                         \
+         "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[m")
     exit(2)
   end
 end
 
 end # of gem namespace
 
-desc 'Run tests'
+desc 'Run tests in memory'
 task :test do
-  sh("#{Gem.ruby} -I lib -S bacon test/test_*.rb")
+  require 'bacon'
+  Bacon.extend(Bacon::TestUnitOutput)
+  Bacon.summary_on_exit
+  $LOAD_PATH.unshift('lib')
+  Dir['./test/**/test_*.rb'].each{ |file| require file[0..-4] }
+end
+
+desc 'Run tests with shell'
+task 'test:shell', :RUBY_OPTS do |t, args|
+  files = Dir['test/**/test_*.rb'].join(' ')
+
+  cmd = [Gem.ruby, args[:RUBY_OPTS],
+         '-I', 'lib', '-S', 'bacon', '--quiet', files]
+
+  sh(cmd.compact.join(' '))
+end
+
+desc 'Generate ann markdown'
+task 'ann:md' => ['gem:spec'] do
+  puts Gemgem.ann_md
+end
+
+desc 'Generate ann html'
+task 'ann:html' => ['gem:spec'] do
+  puts Gemgem.ann_html
+end
+
+desc 'Generate ann email'
+task 'ann:email' => ['gem:spec'] do
+  puts Gemgem.ann_email
 end
 
 desc 'Generate rdoc'
@@ -152,15 +253,13 @@ task :doc => ['gem:spec'] do
      " --files #{Gemgem.spec.extra_rdoc_files.join(',')}")
 end
 
-desc 'Removed ignored files'
+desc 'Remove ignored files'
 task :clean => ['gem:spec'] do
   trash = "~/.Trash/#{Gemgem.spec.name}/"
   sh "mkdir -p #{trash}" unless File.exist?(File.expand_path(trash))
   Gemgem.ignored_files.each{ |file| sh "mv #{file} #{trash}" }
 end
 
-
 task :default do
-  Rake.application.options.show_task_pattern = /./
-  Rake.application.display_tasks_and_comments
+  puts `#{Gem.ruby} -S #{$PROGRAM_NAME} -T`
 end

data/test/test_default.rb

@@ -7,25 +7,21 @@ end
 
 describe RestGraph do
   should 'honor default attributes' do
-    TestHelper.attrs_no_callback.each{ |name|
-      RestGraph.new.send(name).should ==
-        RestGraph.send("default_#{name}")
-
-      RestGraph.new.send(name).should ==
-        RestGraph::DefaultAttributes.send("default_#{name}")
+    RestGraph.members.reject{ |name|
+      name.to_s =~ /method$|handler$|detector$/ }.each{ |name|
+        RestGraph.new.send(name).should ==
+        RestGraph    .send("default_#{name}")
     }
   end
 
   should 'use module to override default attributes' do
-    module BlahAttributes
+    klass = RestGraph.dup
+    klass.send(:extend, Module.new do
       def default_app_id
         '1829'
       end
-    end
+    end)
 
-    TestHelper.ensure_rollback{
-      RestGraph.send(:extend, BlahAttributes)
-      RestGraph.default_app_id.should == '1829'
-    }
+    klass.new.app_id.should == '1829'
   end
 end

data/test/test_parse.rb

@@ -100,6 +100,10 @@ describe RestGraph do
     rg.data                                 .should == {}
   end
 
+  should 'parse invalid signed_request' do
+    RestGraph.new.parse_signed_request!('bad').should == nil
+  end
+
   should 'fallback to ruby-hmac if Digest.new raise an runtime error' do
     key, data = 'top', 'secret'
     digest = OpenSSL::HMAC.digest('sha256', key, data)

data/test/test_timeout.rb

@@ -6,16 +6,16 @@ else
 end
 
 describe RestGraph do
+  after do
+    WebMock.reset!
+    RR.verify
+  end
+
   should 'respect timeout' do
-    stub_request(:get, 'https://graph.facebook.com/me').to_return(
-      lambda{ |r| sleep(0.05); '{}' })
-    e = nil
-    begin
-      RestGraph.new(:timeout => 0.01).get('me')
-      nil.should == 'timeout must be thrown'
-    rescue Timeout::Error => e
-    end
-    e.should.kind_of?(Timeout::Error)
+    stub_request(:get, 'https://graph.facebook.com/me').
+      to_return(:body => '{}')
+    mock.proxy(Timeout).timeout(numeric)
+    RestGraph.new.get('me').should == {}
   end
 
   should 'override timeout' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-graph
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,139 +10,39 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-07 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &2153137640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153137640
-- !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: &2153136940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153136940
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2153136260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153136260
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &2153135660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153135660
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2153135040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153135040
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: &2153134480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153134480
-- !ruby/object:Gem::Dependency
-  name: ruby-hmac
-  requirement: &2153118560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153118560
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &2153118020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153118020
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: &2153117440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153117440
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &2153116840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153116840
-description: A lightweight Facebook Graph API client
+date: 2011-10-08 00:00:00.000000000Z
+dependencies: []
+description: ! 'A lightweight Facebook Graph API client
+
+
+  We have moved the development from rest-graph to [rest-core][].
+
+  By now on, we would only fix bugs in rest-graph rather than adding
+
+  features, and we would only backport important changes from rest-core
+
+  once in a period. If you want the latest goodies, please see [rest-core][]
+
+  Otherwise, you can stay with rest-graph with bugs fixes.
+
+
+  [rest-core]: https://github.com/cardinalblue/rest-core'
 email:
 - dev (XD) cardinalblue.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGES
-- CONTRIBUTORS
-- LICENSE
-- TODO
+extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
-- CHANGES
+- .travis.yml
+- CHANGES.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
-- README
 - README.md
 - Rakefile
-- TODO
+- TODO.md
 - doc/ToC.md
 - doc/dependency.md
 - doc/design.md
@@ -178,6 +78,7 @@ files:
 - example/rails3/app/views/application/helper.html.erb
 - example/rails3/config.ru
 - example/rails3/config/application.rb
+- example/rails3/config/boot.rb
 - example/rails3/config/environment.rb
 - example/rails3/config/environments/development.rb
 - example/rails3/config/environments/production.rb
@@ -199,6 +100,7 @@ files:
 - lib/rest-graph/test_util.rb
 - lib/rest-graph/version.rb
 - rest-graph.gemspec
+- task/.gitignore
 - task/gemgem.rb
 - test/common.rb
 - test/config/rest-graph.yaml
@@ -219,12 +121,10 @@ files:
 - test/test_serialize.rb
 - test/test_test_util.rb
 - test/test_timeout.rb
-homepage: https://github.com/godfat/
+homepage: https://github.com/cardinalblue/rest-graph
 licenses: []
 post_install_message: 
-rdoc_options:
-- --main
-- README
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -241,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A lightweight Facebook Graph API client