rest-core 0.3.0 → 0.4.0.pre.0

data/rest-core.gemspec

@@ -2,15 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "rest-core"
-  s.version = "0.3.0"
+  s.version = "0.4.0.pre.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = [
   "Cardinal Blue",
   "Lin Jen-Shin (godfat)"]
-  s.date = "2011-09-03"
-  s.description = "A modular Ruby REST client collection/infrastructure.\n\nIn this era of web services and mashups, we have seen a blooming of REST\nAPIs. One might wonder, how do we use these APIs easily and elegantly?\nSince REST is very simple compared to SOAP, it is not hard to build a\ndedicated client ourselves.\n\nWe have developed [rest-core][] with composable middlewares to build a\nREST client, based on the effort from [rest-graph][]. In the cases of\ncommon APIs such as Facebook, Github, and Twitter, developers can simply\nuse the built-in dedicated clients provided by rest-core, or do it yourself\nfor any other REST APIs.\n\n[rest-core]: http://github.com/cardinalblue/rest-core\n[rest-graph]: http://github.com/cardinalblue/rest-graph"
+  s.date = "2011-09-18"
+  s.description = "A modular Ruby REST client collection/infrastructure\n\nIn this era of web services and mashups, we have seen a blooming of REST\nAPIs. One might wonder, how do we use these APIs easily and elegantly?\nSince REST is very simple compared to SOAP, it is not hard to build a\ndedicated client ourselves.\n\nWe have developed [rest-core][] with composable middlewares to build a\nREST client, based on the effort from [rest-graph][]. In the cases of\ncommon APIs such as Facebook, Github, and Twitter, developers can simply\nuse the built-in dedicated clients provided by rest-core, or do it yourself\nfor any other REST APIs.\n\n[rest-core]: http://github.com/cardinalblue/rest-core\n[rest-graph]: http://github.com/cardinalblue/rest-graph"
   s.email = ["dev (XD) cardinalblue.com"]
+  s.executables = ["rib-rest-core"]
   s.files = [
   ".gitignore",
   ".gitmodules",
@@ -23,6 +24,7 @@ Gem::Specification.new do |s|
   "README.md",
   "Rakefile",
   "TODO.md",
+  "bin/rib-rest-core",
   "example/facebook.rb",
   "example/github.rb",
   "example/linkedin.rb",
@@ -67,18 +69,25 @@ Gem::Specification.new do |s|
   "example/sinatra/config.ru",
   "example/twitter.rb",
   "lib/rest-core.rb",
-  "lib/rest-core/app/ask.rb",
+  "lib/rest-core/app/dry.rb",
   "lib/rest-core/app/rest-client.rb",
   "lib/rest-core/builder.rb",
   "lib/rest-core/client.rb",
   "lib/rest-core/client/facebook.rb",
   "lib/rest-core/client/facebook/rails_util.rb",
+  "lib/rest-core/client/flurry.rb",
+  "lib/rest-core/client/flurry/rails_util.rb",
   "lib/rest-core/client/github.rb",
   "lib/rest-core/client/linkedin.rb",
+  "lib/rest-core/client/mixi.rb",
+  "lib/rest-core/client/simple.rb",
   "lib/rest-core/client/twitter.rb",
+  "lib/rest-core/client/universal.rb",
   "lib/rest-core/client_oauth1.rb",
+  "lib/rest-core/error.rb",
   "lib/rest-core/event.rb",
   "lib/rest-core/middleware.rb",
+  "lib/rest-core/middleware/bypass.rb",
   "lib/rest-core/middleware/cache.rb",
   "lib/rest-core/middleware/common_logger.rb",
   "lib/rest-core/middleware/default_headers.rb",
@@ -90,14 +99,17 @@ Gem::Specification.new do |s|
   "lib/rest-core/middleware/error_handler.rb",
   "lib/rest-core/middleware/json_decode.rb",
   "lib/rest-core/middleware/oauth1_header.rb",
+  "lib/rest-core/middleware/oauth2_header.rb",
   "lib/rest-core/middleware/oauth2_query.rb",
   "lib/rest-core/middleware/timeout.rb",
   "lib/rest-core/test.rb",
   "lib/rest-core/util/config.rb",
   "lib/rest-core/util/hmac.rb",
+  "lib/rest-core/util/rails_util_util.rb",
   "lib/rest-core/util/vendor.rb",
   "lib/rest-core/version.rb",
   "lib/rest-core/wrapper.rb",
+  "lib/rib/app/rest-core.rb",
   "pending/test_multi.rb",
   "pending/test_test_util.rb",
   "rest-core.gemspec",
@@ -118,11 +130,14 @@ Gem::Specification.new do |s|
   "test/client/facebook/test_serialize.rb",
   "test/client/facebook/test_timeout.rb",
   "test/client/twitter/test_api.rb",
-  "test/test_oauth1_header.rb"]
+  "test/test_builder.rb",
+  "test/test_client.rb",
+  "test/test_oauth1_header.rb",
+  "test/test_wrapper.rb"]
   s.homepage = "https://github.com/cardinalblue/rest-core"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"
-  s.summary = "A modular Ruby REST client collection/infrastructure."
+  s.summary = "A modular Ruby REST client collection/infrastructure"
   s.test_files = [
   "test/client/facebook/test_api.rb",
   "test/client/facebook/test_cache.rb",
@@ -138,7 +153,10 @@ Gem::Specification.new do |s|
   "test/client/facebook/test_serialize.rb",
   "test/client/facebook/test_timeout.rb",
   "test/client/twitter/test_api.rb",
-  "test/test_oauth1_header.rb"]
+  "test/test_builder.rb",
+  "test/test_client.rb",
+  "test/test_oauth1_header.rb",
+  "test/test_wrapper.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/task/gemgem.rb

@@ -12,10 +12,6 @@ module Gemgem
       s.authors     = ['Lin Jen-Shin (godfat)']
       s.email       = ['godfat (XD) godfat.org']
 
-      description   = readme.
-                      match(/DESCRIPTION:\n\n(.+?)(?=\n\n[^\n]+:\n)/m)[1].
-                      lines.to_a
-
       s.description = description.join
       s.summary     = description.first
 
@@ -34,13 +30,68 @@ module Gemgem
     path = %w[README.md README].find{ |name|
       File.exist?("#{Gemgem.dir}/#{name}")
     }
-    if path
-      File.read(path)
-    else
-      "DESCRIPTION:\n\n \n\nEND:\n"
+    @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)/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
@@ -173,13 +224,28 @@ task 'test:shell', :RUBY_OPTS do |t, args|
   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 '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))

data/test/client/facebook/test_api.rb

@@ -41,9 +41,9 @@ describe RestCore::Facebook do
                   {'User-Agent'      => 'Ruby'})).       # this is by ruby
       to_return(:body => '{"data": []}')
 
-    RestCore::Facebook.new.request(
-      {:headers => {'X-Forwarded-For' => '127.0.0.1'}},
-      [:get, 'http://example.com']).should.eq({'data' => []})
+    RestCore::Facebook.new.get('http://example.com', {},
+      {:headers => {'X-Forwarded-For' => '127.0.0.1'}} ).
+      should.eq({'data' => []})
   end
 
   should 'post right' do

data/test/client/facebook/test_misc.rb

@@ -24,20 +24,20 @@ describe RestCore::Facebook do
     rg = RestCore::Facebook.new(:accept => 'text/html',
                                 :lang   => 'zh-tw')
 
-    headers = rg.ask.call(rg.send(:build_env))[RestCore::REQUEST_HEADERS]
+    headers = rg.dry.call(rg.send(:build_env))[RestCore::REQUEST_HEADERS]
     headers['Accept'         ].should.eq 'text/html'
     headers['Accept-Language'].should.eq 'zh-tw'
   end
 
   should 'build empty query string' do
     rg = RestCore::Facebook.new
-    (rg.ask.call(rg.send(:build_env))[RestCore::REQUEST_QUERY] || {}).
+    (rg.dry.call(rg.send(:build_env))[RestCore::REQUEST_QUERY] || {}).
       should.eq({})
   end
 
   should 'create access_token in query string' do
     rg = RestCore::Facebook.new(:access_token => 'token')
-    (rg.ask.call(rg.send(:build_env))[RestCore::REQUEST_QUERY] || {}).
+    (rg.dry.call(rg.send(:build_env))[RestCore::REQUEST_QUERY] || {}).
       should.eq({'access_token' => 'token'})
   end
 

data/test/test_builder.rb

@@ -0,0 +1,14 @@
+
+require 'rest-core/test'
+
+describe RestCore::Builder do
+  should 'default app is RestCore::RestClient' do
+    RestCore::Builder.client.new.app.class.should.eq RestCore::RestClient
+  end
+
+  should 'switch default_app to RestCore::Dry' do
+    builder = RestCore::Builder.dup
+    builder.default_app = RestCore::Dry
+    builder.client.new.app.class.should.eq RestCore::Dry
+  end
+end

data/test/test_client.rb

@@ -0,0 +1,14 @@
+
+require 'rest-core/test'
+
+describe RestCore::Simple do
+  after do
+    WebMock.reset!
+    RR.verify
+  end
+
+  should 'do simple request' do
+    stub_request(:get, 'http://localhost/').to_return(:body => '[]')
+    RestCore::Simple.new.get('http://localhost/').should.eq '[]'
+  end
+end

data/test/test_oauth1_header.rb

@@ -18,7 +18,7 @@ describe RestCore::Oauth1Header do
        'oauth_version'      => '1.0'                                        ,
        'oauth_signature_method' => 'HMAC-SHA1'}
 
-    @auth = RestCore::Oauth1Header.new(RestCore::Ask.new,
+    @auth = RestCore::Oauth1Header.new(RestCore::Dry.new,
       nil, nil, nil,
       'GDdmIQH6jhtmLUypg82g',
       'MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98')

data/test/test_wrapper.rb

@@ -0,0 +1,30 @@
+
+require 'rest-core/test'
+
+describe RestCore::Wrapper do
+  should 'wrap around simple middleware' do
+    wrapper = RestCore::Bypass.dup
+    wrapper.send(:include, RestCore::Wrapper)
+    client = RestCore::Builder.client do
+      use wrapper do
+        use RestCore::Bypass
+      end
+      run RestCore::Dry
+    end
+
+    client.new.app.call({1=>2}).should.eq({1=>2})
+  end
+
+  should 'default app is RestCore::Dry' do
+    wrapper = Class.new
+    wrapper.send(:include, RestCore::Wrapper)
+    wrapper.new.wrapped.class.should.eq RestCore::Dry
+  end
+
+  should 'switch default_app to RestCore::RestClient' do
+    wrapper = Class.new
+    wrapper.send(:include, RestCore::Wrapper)
+    wrapper.default_app = RestCore::RestClient
+    wrapper.new.wrapped.class.should.eq RestCore::RestClient
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0.pre.0
+  prerelease: 6
 platform: ruby
 authors:
 - Cardinal Blue
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000 Z
+date: 2011-09-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2164656700 !ruby/object:Gem::Requirement
+  requirement: &2152729180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,8 +22,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164656700
-description: ! 'A modular Ruby REST client collection/infrastructure.
+  version_requirements: *2152729180
+description: ! 'A modular Ruby REST client collection/infrastructure
 
 
   In this era of web services and mashups, we have seen a blooming of REST
@@ -51,7 +51,8 @@ description: ! 'A modular Ruby REST client collection/infrastructure.
   [rest-graph]: http://github.com/cardinalblue/rest-graph'
 email:
 - dev (XD) cardinalblue.com
-executables: []
+executables:
+- rib-rest-core
 extensions: []
 extra_rdoc_files: []
 files:
@@ -66,6 +67,7 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- bin/rib-rest-core
 - example/facebook.rb
 - example/github.rb
 - example/linkedin.rb
@@ -110,18 +112,25 @@ files:
 - example/sinatra/config.ru
 - example/twitter.rb
 - lib/rest-core.rb
-- lib/rest-core/app/ask.rb
+- lib/rest-core/app/dry.rb
 - lib/rest-core/app/rest-client.rb
 - lib/rest-core/builder.rb
 - lib/rest-core/client.rb
 - lib/rest-core/client/facebook.rb
 - lib/rest-core/client/facebook/rails_util.rb
+- lib/rest-core/client/flurry.rb
+- lib/rest-core/client/flurry/rails_util.rb
 - lib/rest-core/client/github.rb
 - lib/rest-core/client/linkedin.rb
+- lib/rest-core/client/mixi.rb
+- lib/rest-core/client/simple.rb
 - lib/rest-core/client/twitter.rb
+- lib/rest-core/client/universal.rb
 - lib/rest-core/client_oauth1.rb
+- lib/rest-core/error.rb
 - lib/rest-core/event.rb
 - lib/rest-core/middleware.rb
+- lib/rest-core/middleware/bypass.rb
 - lib/rest-core/middleware/cache.rb
 - lib/rest-core/middleware/common_logger.rb
 - lib/rest-core/middleware/default_headers.rb
@@ -133,14 +142,17 @@ files:
 - lib/rest-core/middleware/error_handler.rb
 - lib/rest-core/middleware/json_decode.rb
 - lib/rest-core/middleware/oauth1_header.rb
+- lib/rest-core/middleware/oauth2_header.rb
 - lib/rest-core/middleware/oauth2_query.rb
 - lib/rest-core/middleware/timeout.rb
 - lib/rest-core/test.rb
 - lib/rest-core/util/config.rb
 - lib/rest-core/util/hmac.rb
+- lib/rest-core/util/rails_util_util.rb
 - lib/rest-core/util/vendor.rb
 - lib/rest-core/version.rb
 - lib/rest-core/wrapper.rb
+- lib/rib/app/rest-core.rb
 - pending/test_multi.rb
 - pending/test_test_util.rb
 - rest-core.gemspec
@@ -161,7 +173,10 @@ files:
 - test/client/facebook/test_serialize.rb
 - test/client/facebook/test_timeout.rb
 - test/client/twitter/test_api.rb
+- test/test_builder.rb
+- test/test_client.rb
 - test/test_oauth1_header.rb
+- test/test_wrapper.rb
 homepage: https://github.com/cardinalblue/rest-core
 licenses: []
 post_install_message: 
@@ -177,15 +192,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A modular Ruby REST client collection/infrastructure.
+summary: A modular Ruby REST client collection/infrastructure
 test_files:
 - test/client/facebook/test_api.rb
 - test/client/facebook/test_cache.rb
@@ -201,4 +216,7 @@ test_files:
 - test/client/facebook/test_serialize.rb
 - test/client/facebook/test_timeout.rb
 - test/client/twitter/test_api.rb
+- test/test_builder.rb
+- test/test_client.rb
 - test/test_oauth1_header.rb
+- test/test_wrapper.rb