rest-core 0.4.0.pre.0 → 0.4.0.pre.1

data/example/rails2/app/controllers/application_controller.rb

@@ -58,6 +58,10 @@ class ApplicationController < ActionController::Base
 
   def helper; end
 
+  def no_ns_pollution
+    render :text => Timeout::Error.name
+  end
+
   private
   def filter_common
     rc_facebook_setup(:auto_authorize => true, :canvas => '')

data/example/rails2/test/functional/application_controller_test.rb

@@ -182,4 +182,10 @@ class ApplicationControllerTest < ActionController::TestCase
                  "#{RestCore::Flurry  .default_api_key}",
       @response.body.strip
   end
+
+  def test_no_ns_pollution
+    get(:no_ns_pollution)
+    assert_response :success
+    assert_equal 'Timeout::Error', @response.body.strip
+  end
 end

data/example/rails3/app/controllers/application_controller.rb

@@ -58,6 +58,10 @@ class ApplicationController < ActionController::Base
 
   def helper; end
 
+  def no_ns_pollution
+    render :text => Timeout::Error.name
+  end
+
   private
   def filter_common
     rc_facebook_setup(:auto_authorize => true, :canvas => '')

data/example/rails3/test/functional/application_controller_test.rb

@@ -182,4 +182,10 @@ class ApplicationControllerTest < ActionController::TestCase
                  "#{RestCore::Flurry  .default_api_key}",
       @response.body.strip
   end
+
+  def test_no_ns_pollution
+    get(:no_ns_pollution)
+    assert_response :success
+    assert_equal 'Timeout::Error', @response.body.strip
+  end
 end

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

@@ -18,10 +18,8 @@ module RestCore::Facebook::DefaultAttributes
 end
 
 module RestCore::Facebook::RailsUtil
-  include RestCore
-
   def self.init app=Rails
-    Config.load_for_rails(Facebook, 'facebook', app)
+    RestCore::Config.load_for_rails(RestCore::Facebook, 'facebook', app)
   end
 
   module Helper
@@ -34,9 +32,9 @@ module RestCore::Facebook::RailsUtil
     # skip if included already, any better way to detect this?
     return if controller.respond_to?(:rc_facebook, true)
 
-    controller.rescue_from(Facebook::Error::AccessToken,
+    controller.rescue_from(RestCore::Facebook::Error::AccessToken,
                            :with => :rc_facebook_on_access_token_error)
-    controller.helper(Facebook::RailsUtil::Helper)
+    controller.helper(RestCore::Facebook::RailsUtil::Helper)
     controller.instance_methods.select{ |method|
       method.to_s =~ /^rc_facebook/
     }.each{ |method| controller.send(:protected, method) }
@@ -44,9 +42,11 @@ module RestCore::Facebook::RailsUtil
 
   def rc_facebook_setup options={}
     rc_facebook_options_ctl.merge!(
-      RailsUtilUtil.extract_options(Facebook.members, options, :reject))
+      RestCore::RailsUtilUtil.extract_options(
+        RestCore::Facebook.members, options, :reject))
     rc_facebook_options_new.merge!(
-      RailsUtilUtil.extract_options(Facebook.members, options, :select))
+      RestCore::RailsUtilUtil.extract_options(
+        RestCore::Facebook.members, options, :select))
 
     # we'll need to reinitialize rc_facebook with the new options,
     # otherwise if you're calling rc_facebook before rc_facebook_setup,
@@ -78,7 +78,7 @@ module RestCore::Facebook::RailsUtil
 
   # override this if you need different app_id and secret
   def rc_facebook
-    @rc_facebook ||= Facebook.new(rc_facebook_options_new)
+    @rc_facebook ||= RestCore::Facebook.new(rc_facebook_options_new)
   end
 
   def rc_facebook_on_access_token_error error=nil
@@ -151,7 +151,7 @@ module RestCore::Facebook::RailsUtil
     if rc_facebook_options_ctl.has_key?(key)
       rc_facebook_options_ctl[key]
     else
-      Facebook.send("default_#{key}")
+      RestCore::Facebook.send("default_#{key}")
     end
   end
 

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

@@ -7,10 +7,8 @@ module RestCore::Flurry::DefaultAttributes
 end
 
 module RestCore::Flurry::RailsUtil
-  include RestCore
-
   def self.init app=Rails
-    Config.load_for_rails(Flurry, 'flurry', app)
+    RestCore::Config.load_for_rails(RestCore::Flurry, 'flurry', app)
   end
 
   module Helper
@@ -23,7 +21,7 @@ module RestCore::Flurry::RailsUtil
     # skip if included already, any better way to detect this?
     return if controller.respond_to?(:rc_flurry, true)
 
-    controller.helper(Flurry::RailsUtil::Helper)
+    controller.helper(RestCore::Flurry::RailsUtil::Helper)
     controller.instance_methods.select{ |method|
       method.to_s =~ /^rc_flurry/
     }.each{ |method| controller.send(:protected, method) }
@@ -31,9 +29,11 @@ module RestCore::Flurry::RailsUtil
 
   def rc_flurry_setup options={}
     rc_flurry_options_ctl.merge!(
-      RailsUtilUtil.extract_options(Flurry.members, options, :reject))
+      RestCore::RailsUtilUtil.extract_options(
+        RestCore::Flurry.members, options, :reject))
     rc_flurry_options_new.merge!(
-      RailsUtilUtil.extract_options(Flurry.members, options, :select))
+      RestCore::RailsUtilUtil.extract_options(
+        RestCore::Flurry.members, options, :select))
 
     # we'll need to reinitialize rc_flurry with the new options,
     # otherwise if you're calling rc_flurry before rc_flurry_setup,
@@ -45,7 +45,7 @@ module RestCore::Flurry::RailsUtil
   end
 
   def rc_flurry
-    @rc_flurry ||= Flurry.new(rc_flurry_options_new)
+    @rc_flurry ||= RestCore::Flurry.new(rc_flurry_options_new)
   end
 
   module_function
@@ -55,7 +55,7 @@ module RestCore::Flurry::RailsUtil
     if rc_flurry_options_ctl.has_key?(key)
       rc_flurry_options_ctl[key]
     else
-      Flurry.send("default_#{key}")
+      RestCore::Flurry.send("default_#{key}")
     end
   end
 

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

@@ -43,9 +43,16 @@ module RestCore::Flurry::Client
 
   # see: http://wiki.flurry.com/index.php?title=AppMetrics
   # >> f.metrics('ActiveUsers', {}, :weeks => 4)
-  # => [["2011-09-16", 7929], ["2011-09-15", 36453], ["2011-09-14", 34026],
-  #     ["2011-09-13", 34245], ["2011-09-12", 36879], ["2011-09-11", 44101],
-  #     ["2011-09-10", 43362], ["2011-09-09", 36442], ...
+  # => [["2011-09-19",  6516], ["2011-09-18", 43920], ["2011-09-17", 45412],
+  #     ["2011-09-16", 40972], ["2011-09-15", 37587], ["2011-09-14", 34918],
+  #     ["2011-09-13", 35223], ["2011-09-12", 37750], ["2011-09-11", 45057],
+  #     ["2011-09-10", 44077], ["2011-09-09", 36683], ["2011-09-08", 34871],
+  #     ["2011-09-07", 35960], ["2011-09-06", 35829], ["2011-09-05", 37777],
+  #     ["2011-09-04", 40233], ["2011-09-03", 39306], ["2011-09-02", 33467],
+  #     ["2011-09-01", 31558], ["2011-08-31", 32096], ["2011-08-30", 34076],
+  #     ["2011-08-29", 34950], ["2011-08-28", 40456], ["2011-08-27", 41332],
+  #     ["2011-08-26", 37737], ["2011-08-25", 34392], ["2011-08-24", 33560],
+  #     ["2011-08-23", 34722]]
   def metrics path, query={}, opts={}
     if weeks = opts.delete(:weeks)
       query[:startDate] =
@@ -59,23 +66,24 @@ module RestCore::Flurry::Client
   end
 
   # >> f.weekly(f.metrics('ActiveUsers', {}, :weeks => 4))
-  # => [258213, 247935, 260418, 236995]
+  # => [244548, 270227, 248513, 257149]
   def weekly array
-    start = Time.parse(array.last.first).to_i
+    start = Time.parse(array.first.first).to_i
     array.group_by{ |(date, value)|
       current = Time.parse(date).to_i
-      (current - start) / (86400*7)
+      - (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(&:+) }
   end
 
   # >> f.sum(f.weekly(f.metrics('ActiveUsers', {}, :weeks => 4)))
-  # => [258213, 495870, 768771, 982343]
+  # => [1020437, 775889, 505662, 257149]
   def sum array
-    array.map.with_index{ |num, index|
-      num + array[1, index].inject(0, &:+)
-    }
+    reverse = array.reverse
+    reverse.map.with_index{ |_, index|
+      reverse[1, index].inject(reverse.first, &:+)
+    }.reverse
   end
 
   def query

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

@@ -45,7 +45,3 @@ module RestCore::Mixi::Client
 end
 
 RestCore::Mixi.send(:include, RestCore::Mixi::Client)
-
-$m = RestCore::Mixi.new(:consumer_key    => '87b9651a2291e4853ac0',
-                        :consumer_secret => '98866989c89c42e47d7d38394637faa84341ebb4',
-                        :redirect_uri => 'http://pic-collage.com')

data/lib/rest-core/version.rb

@@ -1,4 +1,4 @@
 
 module RestCore
-  VERSION = '0.4.0.pre.0'
+  VERSION = '0.4.0.pre.1'
 end

data/rest-core.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = "rest-core"
-  s.version = "0.4.0.pre.0"
+  s.version = "0.4.0.pre.1"
 
   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-18"
+  s.date = "2011-09-19"
   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"]
@@ -129,6 +129,7 @@ Gem::Specification.new do |s|
   "test/client/facebook/test_parse.rb",
   "test/client/facebook/test_serialize.rb",
   "test/client/facebook/test_timeout.rb",
+  "test/client/flurry/test_metrics.rb",
   "test/client/twitter/test_api.rb",
   "test/test_builder.rb",
   "test/test_client.rb",
@@ -152,6 +153,7 @@ Gem::Specification.new do |s|
   "test/client/facebook/test_parse.rb",
   "test/client/facebook/test_serialize.rb",
   "test/client/facebook/test_timeout.rb",
+  "test/client/flurry/test_metrics.rb",
   "test/client/twitter/test_api.rb",
   "test/test_builder.rb",
   "test/test_client.rb",

data/test/client/facebook/test_load_config.rb

@@ -2,7 +2,6 @@
 require 'rest-core/test'
 
 require 'rest-core/util/config'
-::Rails = Object.new
 
 describe RestCore::Config do
 
@@ -22,9 +21,10 @@ describe RestCore::Config do
   end
 
   should 'honor rails config' do
-    mock(Rails).env { 'test' }
-    mock(Rails).root{ File.dirname(__FILE__) }
-    RestCore::Config.load_for_rails(@klass, 'facebook')
+    app = Object.new
+    mock(app).env { 'test' }
+    mock(app).root{ File.dirname(__FILE__) }
+    RestCore::Config.load_for_rails(@klass, 'facebook', app)
     check
   end
 

data/test/client/flurry/test_metrics.rb

@@ -0,0 +1,83 @@
+
+require 'rest-core/test'
+
+require 'time'
+
+describe RestCore::Flurry do
+  after do
+    WebMock.reset!
+    RR.verify
+  end
+
+  before do
+    startDate = '2011-08-23'
+    endDate   = '2011-09-19'
+    @flurry = RestCore::Flurry.new
+    stub(@flurry).Time.stub!.now{ Time.parse(endDate) }
+    stub_request(:get,
+      "http://api.flurry.com/appMetrics/ActiveUsers?" \
+      "startDate=#{startDate}&endDate=#{endDate}").
+      to_return(:body =>
+        '{"@startDate":"2011-08-23",
+          "@metric":"ActiveUsersByDay",
+          "@endDate":"2011-09-19",
+          "@version":"1.0",
+          "@generatedDate":"9/19/11 5:54 AM",
+          "day":
+            [{"@value":"34722","@date":"2011-08-23"},
+             {"@value":"33560","@date":"2011-08-24"},
+             {"@value":"34392","@date":"2011-08-25"},
+             {"@value":"37737","@date":"2011-08-26"},
+             {"@value":"41332","@date":"2011-08-27"},
+             {"@value":"40456","@date":"2011-08-28"},
+             {"@value":"34950","@date":"2011-08-29"},
+             {"@value":"34076","@date":"2011-08-30"},
+             {"@value":"32096","@date":"2011-08-31"},
+             {"@value":"31558","@date":"2011-09-01"},
+             {"@value":"33467","@date":"2011-09-02"},
+             {"@value":"39306","@date":"2011-09-03"},
+             {"@value":"40233","@date":"2011-09-04"},
+             {"@value":"37777","@date":"2011-09-05"},
+             {"@value":"35829","@date":"2011-09-06"},
+             {"@value":"35960","@date":"2011-09-07"},
+             {"@value":"34871","@date":"2011-09-08"},
+             {"@value":"36683","@date":"2011-09-09"},
+             {"@value":"44077","@date":"2011-09-10"},
+             {"@value":"45057","@date":"2011-09-11"},
+             {"@value":"37750","@date":"2011-09-12"},
+             {"@value":"35223","@date":"2011-09-13"},
+             {"@value":"34918","@date":"2011-09-14"},
+             {"@value":"37587","@date":"2011-09-15"},
+             {"@value":"40972","@date":"2011-09-16"},
+             {"@value":"45412","@date":"2011-09-17"},
+             {"@value":"43920","@date":"2011-09-18"},
+             {"@value":"6516","@date":"2011-09-19"}]}')
+
+    @active_users =
+      [["2011-09-19",  6516], ["2011-09-18", 43920], ["2011-09-17", 45412],
+       ["2011-09-16", 40972], ["2011-09-15", 37587], ["2011-09-14", 34918],
+       ["2011-09-13", 35223], ["2011-09-12", 37750], ["2011-09-11", 45057],
+       ["2011-09-10", 44077], ["2011-09-09", 36683], ["2011-09-08", 34871],
+       ["2011-09-07", 35960], ["2011-09-06", 35829], ["2011-09-05", 37777],
+       ["2011-09-04", 40233], ["2011-09-03", 39306], ["2011-09-02", 33467],
+       ["2011-09-01", 31558], ["2011-08-31", 32096], ["2011-08-30", 34076],
+       ["2011-08-29", 34950], ["2011-08-28", 40456], ["2011-08-27", 41332],
+       ["2011-08-26", 37737], ["2011-08-25", 34392], ["2011-08-24", 33560],
+       ["2011-08-23", 34722]]
+
+    @weekly = [244548, 270227, 248513, 257149]
+  end
+
+  should 'metrics("ActiveUsers")' do
+    @flurry.metrics('ActiveUsers', {}, :weeks => 4).should.eq @active_users
+
+  end
+
+  should 'weekly(metrics("ActiveUsers"))' do
+    @flurry.weekly(@active_users).should.eq @weekly
+  end
+
+  should 'sum(weekly(metrics("ActiveUsers")))' do
+    @flurry.sum(@weekly).should.eq [1020437, 775889, 505662, 257149]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.0
+  version: 0.4.0.pre.1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000Z
+date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2152729180 !ruby/object:Gem::Requirement
+  requirement: &2168955760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152729180
+  version_requirements: *2168955760
 description: ! 'A modular Ruby REST client collection/infrastructure
 
 
@@ -172,6 +172,7 @@ files:
 - test/client/facebook/test_parse.rb
 - test/client/facebook/test_serialize.rb
 - test/client/facebook/test_timeout.rb
+- test/client/flurry/test_metrics.rb
 - test/client/twitter/test_api.rb
 - test/test_builder.rb
 - test/test_client.rb
@@ -215,6 +216,7 @@ test_files:
 - test/client/facebook/test_parse.rb
 - test/client/facebook/test_serialize.rb
 - test/client/facebook/test_timeout.rb
+- test/client/flurry/test_metrics.rb
 - test/client/twitter/test_api.rb
 - test/test_builder.rb
 - test/test_client.rb