rest-more 1.0.2 → 2.0.0

data/lib/rest-more.rb

@@ -4,11 +4,9 @@ require 'rest-core'
 module RestCore
   autoload :Config  , 'rest-core/util/config'
 
-  autoload :Bing    , 'rest-core/client/bing'
   autoload :Dropbox , 'rest-core/client/dropbox'
   autoload :Facebook, 'rest-core/client/facebook'
   autoload :Github  , 'rest-core/client/github'
   autoload :Linkedin, 'rest-core/client/linkedin'
-  autoload :Mixi    , 'rest-core/client/mixi'
   autoload :Twitter , 'rest-core/client/twitter'
 end

data/lib/rest-more/test.rb

@@ -1,3 +1,14 @@
 
 require 'rest-core/test'
 require 'rest-more'
+
+module TestHelper
+  module_function
+  def normalize_query query
+    '?' + query[1..-1].split('&').sort.join('&')
+  end
+
+  def normalize_url url
+    url.sub(/\?.+/){ |query| TestHelper.normalize_query(query) }
+  end
+end

data/lib/rest-more/version.rb

@@ -1,4 +1,4 @@
 
 module RestMore
-  VERSION = '1.0.2'
+  VERSION = '2.0.0'
 end

data/rest-more.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = "rest-more"
-  s.version = "1.0.2"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [
   "Cardinal Blue",
   "Lin Jen-Shin (godfat)"]
-  s.date = "2012-07-13"
+  s.date = "2012-10-31"
   s.description = "Various REST clients such as Facebook and Twitter built with [rest-core][]\n\n[rest-core]: https://github.com/cardinalblue/rest-core"
   s.email = ["dev (XD) cardinalblue.com"]
   s.executables = ["rib-rest-core"]
@@ -23,34 +23,8 @@ Gem::Specification.new do |s|
   "Rakefile",
   "TODO.md",
   "bin/rib-rest-core",
-  "doc/ToC.md",
-  "doc/dependency.md",
-  "doc/design.md",
-  "doc/rest-graph.md",
   "doc/tutorial/facebook.md",
-  "example/async.rb",
-  "example/facebook.rb",
   "example/multi.rb",
-  "example/rails2/Gemfile",
-  "example/rails2/README",
-  "example/rails2/Rakefile",
-  "example/rails2/app/controllers/application_controller.rb",
-  "example/rails2/app/views/application/helper.html.erb",
-  "example/rails2/config/boot.rb",
-  "example/rails2/config/environment.rb",
-  "example/rails2/config/environments/development.rb",
-  "example/rails2/config/environments/production.rb",
-  "example/rails2/config/environments/test.rb",
-  "example/rails2/config/initializers/cookie_verification_secret.rb",
-  "example/rails2/config/initializers/new_rails_defaults.rb",
-  "example/rails2/config/initializers/session_store.rb",
-  "example/rails2/config/preinitializer.rb",
-  "example/rails2/config/rest-core.yaml",
-  "example/rails2/config/routes.rb",
-  "example/rails2/log",
-  "example/rails2/test/functional/application_controller_test.rb",
-  "example/rails2/test/test_helper.rb",
-  "example/rails2/test/unit/rails_util_test.rb",
   "example/rails3/Gemfile",
   "example/rails3/README",
   "example/rails3/Rakefile",
@@ -73,8 +47,6 @@ Gem::Specification.new do |s|
   "example/rainbows.rb",
   "example/simple.rb",
   "example/sinatra/config.ru",
-  "lib/rest-core/client/bing.rb",
-  "lib/rest-core/client/bing/rails_util.rb",
   "lib/rest-core/client/dropbox.rb",
   "lib/rest-core/client/facebook.rb",
   "lib/rest-core/client/facebook/rails_util.rb",
@@ -82,8 +54,6 @@ Gem::Specification.new do |s|
   "lib/rest-core/client/github/rails_util.rb",
   "lib/rest-core/client/linkedin.rb",
   "lib/rest-core/client/linkedin/rails_util.rb",
-  "lib/rest-core/client/mixi.rb",
-  "lib/rest-core/client/mixi/rails_util.rb",
   "lib/rest-core/client/twitter.rb",
   "lib/rest-core/client/twitter/rails_util.rb",
   "lib/rest-core/util/config.rb",
@@ -93,11 +63,11 @@ Gem::Specification.new do |s|
   "lib/rest-more/version.rb",
   "lib/rib/app/rest-core.rb",
   "rest-more.gemspec",
-  "test/bing/test_api.rb",
+  "task/.gitignore",
+  "task/gemgem.rb",
   "test/dropbox/test_api.rb",
   "test/facebook/config/rest-core.yaml",
   "test/facebook/test_api.rb",
-  "test/facebook/test_cache.rb",
   "test/facebook/test_default.rb",
   "test/facebook/test_error.rb",
   "test/facebook/test_handler.rb",
@@ -109,17 +79,14 @@ Gem::Specification.new do |s|
   "test/facebook/test_parse.rb",
   "test/facebook/test_serialize.rb",
   "test/facebook/test_timeout.rb",
-  "test/mixi/test_api.rb",
   "test/twitter/test_api.rb"]
   s.homepage = "https://github.com/cardinalblue/rest-more"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
   s.summary = "Various REST clients such as Facebook and Twitter built with [rest-core][]"
   s.test_files = [
-  "test/bing/test_api.rb",
   "test/dropbox/test_api.rb",
   "test/facebook/test_api.rb",
-  "test/facebook/test_cache.rb",
   "test/facebook/test_default.rb",
   "test/facebook/test_error.rb",
   "test/facebook/test_handler.rb",
@@ -131,18 +98,17 @@ Gem::Specification.new do |s|
   "test/facebook/test_parse.rb",
   "test/facebook/test_serialize.rb",
   "test/facebook/test_timeout.rb",
-  "test/mixi/test_api.rb",
   "test/twitter/test_api.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-core>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<rest-core>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<rest-core>, [">= 1.0.0"])
+      s.add_dependency(%q<rest-core>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<rest-core>, [">= 1.0.0"])
+    s.add_dependency(%q<rest-core>, [">= 2.0.0"])
   end
 end

data/task/.gitignore

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

data/task/gemgem.rb

@@ -0,0 +1,267 @@
+
+require 'pathname'
+
+module Gemgem
+  class << self
+    attr_accessor :dir, :spec
+  end
+
+  module_function
+  def create
+    yield(spec = Gem::Specification.new{ |s|
+      s.authors     = ['Lin Jen-Shin (godfat)']
+      s.email       = ['godfat (XD) godfat.org']
+
+      s.description = description.join
+      s.summary     = description.first
+
+      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\2[^#\n]+\n))/m).map(&:first)
+        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'][/[^\n]+\n\n[^\n]+/]}"
+    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
+
+  def write
+    File.open("#{dir}/#{spec.name}.gemspec", 'w'){ |f|
+      f << split_lines(spec.to_ruby) }
+  end
+
+  def split_lines ruby
+    ruby.gsub(/(.+?)\[(.+?)\]/){ |s|
+      if $2.index(',')
+        "#{$1}[\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
+      else
+        s
+      end
+    }
+  end
+
+  def all_files
+    @all_files ||= find_files(Pathname.new(dir)).map{ |file|
+      if file.to_s =~ %r{\.git/|\.git$}
+        nil
+      else
+        file.to_s
+      end
+    }.compact.sort
+  end
+
+  def gem_files
+    @gem_files ||= all_files - ignored_files
+  end
+
+  def ignored_files
+    @ignored_file ||= all_files.select{ |path| ignore_patterns.find{ |ignore|
+      path =~ ignore && !git_files.include?(path)}}
+  end
+
+  def git_files
+    @git_files ||= if File.exist?("#{dir}/.git")
+                     `git ls-files`.split("\n")
+                   else
+                     []
+                   end
+  end
+
+  # protected
+  def find_files path
+    path.children.select(&:file?).map{|file| file.to_s[(dir.size+1)..-1]} +
+    path.children.select(&:directory?).map{|dir| find_files(dir)}.flatten
+  end
+
+  def ignore_patterns
+    @ignore_files ||= expand_patterns(
+      gitignore.split("\n").reject{ |pattern|
+        pattern.strip == ''
+      }).map{ |pattern| %r{^([^/]+/)*?#{Regexp.escape(pattern)}(/[^/]+)*?$} }
+  end
+
+  def expand_patterns pathes
+    pathes.map{ |path|
+      if path !~ /\*/
+        path
+      else
+        expand_patterns(
+          Dir[path] +
+          Pathname.new(File.dirname(path)).children.select(&:directory?).
+            map{ |prefix| "#{prefix}/#{File.basename(path)}" })
+      end
+    }.flatten
+  end
+
+  def gitignore
+    if File.exist?(path = "#{dir}/.gitignore")
+      File.read(path)
+    else
+      ''
+    end
+  end
+end
+
+namespace :gem do
+
+desc 'Install gem'
+task :install => [:build] do
+  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_tag}")
+end
+
+desc 'Build gem'
+task :build => [:spec] do
+  sh("#{Gem.ruby} -S gem build #{Gemgem.spec.name}.gemspec")
+  sh("mkdir -p pkg")
+  sh("mv #{Gemgem.gem_tag}.gem pkg/")
+end
+
+desc 'Release gem'
+task :release => [:spec, :check, :build] do
+  sh("git tag #{Gemgem.gem_tag}")
+  sh("git push")
+  sh("git push --tags")
+  sh("#{Gem.ruby} -S gem push pkg/#{Gemgem.gem_tag}.gem")
+end
+
+task :check do
+  ver = Gemgem.spec.version.to_s
+
+  if ENV['VERSION'].nil?
+    puts("\e[35mExpected "                                  \
+         "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
+    exit(1)
+
+  elsif ENV['VERSION'] != ver
+    puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
+         "\e[35mbut got\n         "                         \
+         "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
+    exit(2)
+  end
+end
+
+end # of gem namespace
+
+desc 'Run tests in memory'
+task :test do
+  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'
+task :doc => ['gem:spec'] do
+  sh("yardoc -o rdoc --main README.md" \
+     " --files #{Gemgem.spec.extra_rdoc_files.join(',')}")
+end
+
+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
+  puts `#{Gem.ruby} -S #{$PROGRAM_NAME} -T`
+end

data/test/dropbox/test_api.rb

@@ -19,7 +19,7 @@ describe RC::Dropbox do
       :body => '{}', :status => status)
 
     lambda{
-      RC::Dropbox.new.delete('123')
+      RC::Dropbox.new.delete('123').tap{}
     }.should.raise(klass)
 
     WebMock.reset!

data/test/facebook/config/rest-core.yaml

@@ -3,6 +3,6 @@ test:
   facebook:
     app_id: 41829
     secret: <%= 'r41829'.reverse %>
-    json_decode: false
+    json_response: false
     lang: zh-tw
     auto_authorize_scope: 'publish_stream'

data/test/facebook/test_api.rb

@@ -19,10 +19,8 @@ describe RC::Facebook do
       :headers => {'Accept'          => 'text/plain',
                    'Accept-Language' => 'zh-tw',
                    'Accept-Encoding' => 'gzip, deflate', # this is by ruby
-                  }.merge(RUBY_VERSION < '1.9.2' ?
-                  {} :
-                  {'User-Agent'      => 'Ruby'})).       # this is by ruby
-      to_return(:body => '{"data": []}')
+                   'User-Agent'      => 'Ruby'           # this is by ruby
+                  }).to_return(:body => '{"data": []}')
 
     RC::Facebook.new(:site   => 'http://nothing.godfat.org/',
                      :lang   => 'zh-tw',
@@ -35,11 +33,9 @@ describe RC::Facebook do
       :headers => {'Accept'          => 'application/json',
                    'Accept-Language' => 'en-us',
                    'Accept-Encoding' => 'gzip, deflate', # this is by ruby
+                   'User-Agent'      => 'Ruby',          # this is by ruby
                    'X-Forwarded-For' => '127.0.0.1',
-                  }.merge(RUBY_VERSION < '1.9.2' ?
-                  {} :
-                  {'User-Agent'      => 'Ruby'})).       # this is by ruby
-      to_return(:body => '{"data": []}')
+                  }).to_return(:body => '{"data": []}')
 
     RC::Facebook.new.get('http://example.com', {},
       {:headers => {'X-Forwarded-For' => '127.0.0.1'}} ).
@@ -50,7 +46,7 @@ describe RC::Facebook do
     stub_request(:post, 'https://graph.facebook.com/feed/me').
       with(:body => 'message=hi%20there').to_return(:body => 'ok')
 
-    RC::Facebook.new(:json_decode => false).
+    RC::Facebook.new(:json_response => false).
       post('feed/me', :message => 'hi there').should == 'ok'
   end
 
@@ -60,7 +56,7 @@ describe RC::Facebook do
       to_return(:body => 'ok')
 
     rg = RC::Facebook.new(
-      :json_decode => false, :access_token => 'wrong',
+      :json_response => false, :access_token => 'wrong',
       :app_id => '1', :secret => '2')
     rg.get('me', {}, :secret => true).should.eq 'ok'
     rg.url('me', {}, :secret => true).should.eq \
@@ -73,9 +69,9 @@ describe RC::Facebook do
     stub_request(:get, 'https://graph.facebook.com/woot').
       to_return(:body => 'bad json')
 
-    rg = RC::Facebook.new(:json_decode => true)
-    rg.get('woot', {}, :json_decode => false).should.eq 'bad json'
-    rg.json_decode.should == true
+    rg = RC::Facebook.new(:json_response => true)
+    rg.get('woot', {}, :json_response => false).should.eq 'bad json'
+    rg.json_response.should == true
   end
 
   should 'not raise exception when encountering error' do
@@ -91,7 +87,7 @@ describe RC::Facebook do
     stub(o = Object.new).to_s{ 'i am mock' }
     stub_request(:get, "https://graph.facebook.com/search?q=i%20am%20mock").
       to_return(:body => 'ok')
-    RC::Facebook.new(:json_decode => false).
+    RC::Facebook.new(:json_response => false).
       get('search', :q => o).should.eq 'ok'
   end
 end