rest-more 0.7.0 → 0.7.1

data/.gitmodules

@@ -1,3 +1,6 @@
 [submodule "task"]
 	path = task
 	url = git://github.com/godfat/gemgem.git
+[submodule "rest-core"]
+	path = rest-core
+	url = git://github.com/cardinalblue/rest-core.git

data/.travis.yml

@@ -9,5 +9,5 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-2.0
+  - rbx
   - jruby

data/CHANGES.md

@@ -1,7 +1,26 @@
 # CHANGES
 
+## rest-more 0.7.1 -- 2011-10-31
+
+### Bugs fixes
+
+* [Mixi] Fixed `RC::Mixi.new(:access_token => 'access_token')` which is not
+  working before.
+
+### Enhancement
+
+* [Mixi] `RC::Mixi#authorize!` now works like `RC::Facebook#authorize!`
+  That is now we pass code like this: `mixi.authorize!(:code => code)`
+
+* `RestCore::Config` and `RestCore::RailsUtilUtil` are now moved to rest-more
+
 ## rest-more 0.7.0 -- 2011-10-08
 
 * Extracted from [rest-core][] 0.4.0
+* [Facebook] Added `RC::Facebook#parse_fbsr!` which can parse Facebook's new
+  cookie. Also, `RC::Facebook#parse_cookies!` would look for that too.
+* [Facebook] Fixed that parsing an invalid signed_request would raise an
+  error. From now on it would simply ignore it and wipe out the data.
+* [Flurry] Some minor updates.
 
 [rest-core]: https://github.com/cardinalblue/rest-core

data/Rakefile

@@ -3,7 +3,8 @@
 require "#{dir = File.dirname(__FILE__)}/task/gemgem"
 Gemgem.dir = dir
 
-($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib" )).uniq!
+($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib" ) <<
+               File.expand_path("#{Gemgem.dir}/rest-core/lib")).uniq!
 
 desc 'Generate gemspec'
 task 'gem:spec' do
@@ -17,6 +18,9 @@ task 'gem:spec' do
 
     s.authors  = ['Cardinal Blue', 'Lin Jen-Shin (godfat)']
     s.email    = ['dev (XD) cardinalblue.com']
+
+    # exclude rest-core
+    s.files.reject!{ |f| f.start_with?('rest-core/') }
   end
 
   Gemgem.write

data/lib/rest-core/client/facebook.rb

@@ -73,7 +73,7 @@ module RestCore::Facebook::Client
     data['access_token'] || data['oauth_token'] if data.kind_of?(Hash)
   end
 
-  def access_token=  token
+  def access_token= token
     data['access_token'] = token if data.kind_of?(Hash)
   end
 
@@ -247,7 +247,7 @@ module RestCore::Facebook::Client
   end
 
   def fbs_without_sig cookies
-    cookies.reject{ |(k, v)| k == 'sig' }.sort.map{ |a| a.join('=') }
+    cookies.reject{ |(k, _)| k == 'sig' }.sort.map{ |a| a.join('=') }
   end
 
   def merge_data lhs, rhs

data/lib/rest-core/client/flurry.rb

@@ -68,7 +68,7 @@ module RestCore::Flurry::Client
       - (current - start) / (86400*7)
     # calling .last to discard week numbers created by group_by
     }.sort.map(&:last).map{ |week|
-      week.map{ |(date, num)| num }.inject(&:+) }
+      week.map{ |(_, num)| num }.inject(&:+) }
   end
 
   # >> f.sum(f.weekly(f.metrics('ActiveUsers', {}, :weeks => 4)))
@@ -98,7 +98,7 @@ module RestCore::Flurry::Client
 
     [query.merge(:startDate => startDate,
                  :endDate   => endDate),
-     opts.reject{ |k| [:days, :weeks, :months].include?(k) }]
+     opts.reject{ |k, _| [:days, :weeks, :months].include?(k) }]
   end
 end
 

data/lib/rest-core/client/mixi.rb

@@ -16,7 +16,7 @@ RestCore::Mixi = RestCore::Builder.client(
     use s::JsonDecode    , true
   end
 
-  use s::Defaults      , :data     => lambda{{}}
+  use s::Defaults      , :data => lambda{{}}
 end
 
 module RestCore::Mixi::Client
@@ -26,6 +26,10 @@ module RestCore::Mixi::Client
     data['access_token'] if data.kind_of?(Hash)
   end
 
+  def access_token= token
+    data['access_token'] = token if data.kind_of?(Hash)
+  end
+
   def authorize_url queries={}
     url('https://mixi.jp/connect_authorize.pl',
         {:client_id     => consumer_key,
@@ -33,12 +37,11 @@ module RestCore::Mixi::Client
          :scope         => 'r_profile'}.merge(queries))
   end
 
-  def authorize! code, payload={}, opts={}
+  def authorize! payload={}, opts={}
     pl = {:client_id     => consumer_key   ,
           :client_secret => consumer_secret,
           :redirect_uri  => redirect_uri   ,
-          :grant_type    => 'authorization_code',
-          :code          => code}.merge(payload)
+          :grant_type    => 'authorization_code'}.merge(payload)
 
     self.data = post('https://secure.mixi-platform.com/2/token', pl, {}, opts)
   end

data/lib/rest-core/client/twitter.rb

@@ -19,7 +19,7 @@ RestCore::Twitter = RestCore::Builder.client(:data) do
     use s::JsonDecode  , true
   end
 
-  use s::Defaults      , :data     => lambda{{}}
+  use s::Defaults      , :data => lambda{{}}
 end
 
 class RestCore::Twitter::Error < RestCore::Error

data/lib/rest-core/util/config.rb

@@ -0,0 +1,55 @@
+
+require 'erb'
+require 'yaml'
+
+module RestCore; end
+module RestCore::Config
+  extend self
+
+  DefaultModuleName = 'DefaultAttributes'
+
+  def load_for_rails klass, namespace=nil, app=Rails
+    root = File.expand_path(app.root)
+    path = ["#{root}/config/rest-core.yaml", # YAML should use .yaml
+            "#{root}/config/rest-core.yml" ].find{|p| File.exist?(p)}
+    return if path.nil?
+    RestCore::Config.load(klass, path, app.env, namespace)
+  end
+
+  def load klass, path, env, namespace=nil
+    config   = YAML.load(ERB.new(File.read(path)).result(binding))
+    defaults = config[env]
+    return false unless defaults
+    return false unless defaults[namespace] if namespace
+    data = if namespace
+             defaults[namespace]
+           else
+             defaults
+           end
+    raise ArgumentError.new("#{data} is not a hash") unless
+      data.kind_of?(Hash)
+
+    mod = if klass.const_defined?(DefaultModuleName)
+            klass.const_get(DefaultModuleName)
+          else
+            klass.send(:const_set, DefaultModuleName, Module.new)
+          end
+
+    singleton_class = if klass.respond_to?(:singleton_class)
+                        klass.singleton_class
+                      else
+                        class << klass; self; end
+                      end
+
+    klass.send(:extend, mod) unless singleton_class < mod
+
+    mod.module_eval(data.inject(["extend self\n"]){ |r, (k, v)|
+      # quote strings, leave others free (e.g. false, numbers, etc)
+      r << <<-RUBY
+        def default_#{k}
+          #{v.kind_of?(String) ? "'#{v}'" : v}
+        end
+      RUBY
+    }.join, __FILE__, __LINE__)
+  end
+end

data/lib/rest-core/util/rails_util_util.rb

@@ -0,0 +1,19 @@
+
+module RestCore; end
+module RestCore::RailsUtilUtil
+  module Cache
+    def []    key       ;  read(key)                ; end
+    def []=   key, value; write(key, value)         ; end
+    def store key, value,
+              options={}; write(key, value, options); end
+  end
+
+  module_function
+  def extract_options members, options, method
+    # Hash[] is for ruby 1.8.7
+    # map(&:to_sym) is for ruby 1.8.7
+    Hash[options.send(method){ |(k, v)| members.map(&:to_sym).member?(k) }]
+  end
+end
+
+ActiveSupport::Cache::Store.send(:include, RestCore::RailsUtilUtil::Cache)

data/lib/rest-more.rb

@@ -2,6 +2,8 @@
 require 'rest-core'
 
 module RestCore
+  autoload :Config  , 'rest-core/util/config'
+
   autoload :Github  , 'rest-core/client/github'
   autoload :Twitter , 'rest-core/client/twitter'
   autoload :Linkedin, 'rest-core/client/linkedin'

data/lib/rest-more/test.rb

@@ -0,0 +1,3 @@
+
+require 'rest-core/test'
+require 'rest-more'

data/lib/rest-more/version.rb

@@ -1,4 +1,4 @@
 
 module RestMore
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/rest-more.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = "rest-more"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   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 = "2011-10-08"
+  s.date = "2011-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.files = [
@@ -71,7 +71,10 @@ Gem::Specification.new do |s|
   "lib/rest-core/client/simple.rb",
   "lib/rest-core/client/twitter.rb",
   "lib/rest-core/client/universal.rb",
+  "lib/rest-core/util/config.rb",
+  "lib/rest-core/util/rails_util_util.rb",
   "lib/rest-more.rb",
+  "lib/rest-more/test.rb",
   "lib/rest-more/version.rb",
   "rest-more.gemspec",
   "task/.gitignore",
@@ -91,6 +94,7 @@ Gem::Specification.new do |s|
   "test/client/facebook/test_serialize.rb",
   "test/client/facebook/test_timeout.rb",
   "test/client/flurry/test_metrics.rb",
+  "test/client/mixi/test_api.rb",
   "test/client/twitter/test_api.rb"]
   s.homepage = "https://github.com/cardinalblue/rest-more"
   s.require_paths = ["lib"]
@@ -111,6 +115,7 @@ Gem::Specification.new do |s|
   "test/client/facebook/test_serialize.rb",
   "test/client/facebook/test_timeout.rb",
   "test/client/flurry/test_metrics.rb",
+  "test/client/mixi/test_api.rb",
   "test/client/twitter/test_api.rb"]
 
   if s.respond_to? :specification_version then

data/test/client/facebook/test_api.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   after do

data/test/client/facebook/test_cache.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   after do

data/test/client/facebook/test_default.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   should 'honor default attributes' do

data/test/client/facebook/test_error.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook::Error do
   after do

data/test/client/facebook/test_handler.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   after do

data/test/client/facebook/test_load_config.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 require 'rest-core/util/config'
 

data/test/client/facebook/test_misc.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   after do

data/test/client/facebook/test_oauth.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   before do

data/test/client/facebook/test_old.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   after do

data/test/client/facebook/test_page.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   after do

data/test/client/facebook/test_parse.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
 

data/test/client/facebook/test_serialize.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   after do

data/test/client/facebook/test_timeout.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Facebook do
   after do

data/test/client/flurry/test_metrics.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 require 'time'
 
@@ -70,7 +70,6 @@ describe RestCore::Flurry do
 
   should 'metrics("ActiveUsers")' do
     @flurry.metrics('ActiveUsers', {}, :weeks => 4).should.eq @active_users
-
   end
 
   should 'weekly(metrics("ActiveUsers"))' do

data/test/client/mixi/test_api.rb

@@ -0,0 +1,20 @@
+
+require 'rest-more/test'
+
+describe RC::Mixi do
+  after do
+    WebMock.reset!
+    RR.verify
+  end
+
+  should 'get right' do
+    stub_request(:get, 'http://api.mixi-platform.com/me').
+      to_return(:body => '{"status": "OK"}')
+
+    RC::Mixi.new.get('me').should.eq({'status' => 'OK'})
+  end
+
+  should 'be able to set access_token' do
+    RC::Mixi.new(:access_token => 'QQ').access_token.should.eq 'QQ'
+  end
+end

data/test/client/twitter/test_api.rb

@@ -1,5 +1,5 @@
 
-require 'rest-core/test'
+require 'rest-more/test'
 
 describe RestCore::Twitter do
   after do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-more
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-08 00:00:00.000000000Z
+date: 2011-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-core
-  requirement: &2160791120 !ruby/object:Gem::Requirement
+  requirement: &2160851080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160791120
+  version_requirements: *2160851080
 description: ! 'Various REST clients such as Facebook and Twitter built with [rest-core][]
 
 
@@ -92,7 +92,10 @@ files:
 - lib/rest-core/client/simple.rb
 - lib/rest-core/client/twitter.rb
 - lib/rest-core/client/universal.rb
+- lib/rest-core/util/config.rb
+- lib/rest-core/util/rails_util_util.rb
 - lib/rest-more.rb
+- lib/rest-more/test.rb
 - lib/rest-more/version.rb
 - rest-more.gemspec
 - task/.gitignore
@@ -112,6 +115,7 @@ files:
 - test/client/facebook/test_serialize.rb
 - test/client/facebook/test_timeout.rb
 - test/client/flurry/test_metrics.rb
+- test/client/mixi/test_api.rb
 - test/client/twitter/test_api.rb
 homepage: https://github.com/cardinalblue/rest-more
 licenses: []
@@ -152,4 +156,5 @@ test_files:
 - test/client/facebook/test_serialize.rb
 - test/client/facebook/test_timeout.rb
 - test/client/flurry/test_metrics.rb
+- test/client/mixi/test_api.rb
 - test/client/twitter/test_api.rb