rest-more 0.7.1 → 0.7.2

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

@@ -20,41 +20,18 @@ module RestCore::Facebook::DefaultAttributes
 end
 
 module RestCore::Facebook::RailsUtil
-  def self.init app=Rails
-    RestCore::Config.load_for_rails(RestCore::Facebook, 'facebook', app)
-  end
-
-  module Helper
-    def rc_facebook
-      controller.send(:rc_facebook)
-    end
-  end
+  include RestCore::RailsUtilUtil
 
   def self.included controller
     # skip if included already, any better way to detect this?
     return if controller.respond_to?(:rc_facebook, true)
-
+    super
     controller.rescue_from(RestCore::Facebook::Error::AccessToken,
                            :with => :rc_facebook_on_access_token_error)
-    controller.helper(RestCore::Facebook::RailsUtil::Helper)
-    controller.instance_methods.select{ |method|
-      method.to_s =~ /^rc_facebook/
-    }.each{ |method| controller.send(:protected, method) }
   end
 
   def rc_facebook_setup options={}
-    rc_facebook_options_ctl.merge!(
-      RestCore::RailsUtilUtil.extract_options(
-        RestCore::Facebook.members, options, :reject))
-    rc_facebook_options_new.merge!(
-      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,
-    # you'll end up with default options without the ones you've passed
-    # into rc_facebook_setup.
-    rc_facebook.send(:initialize, rc_facebook_options_new)
+    super
 
     rc_facebook_check_params_signed_request # canvas
     rc_facebook_check_params_session        # i think it would be deprecated
@@ -69,7 +46,9 @@ module RestCore::Facebook::RailsUtil
 
     rc_facebook_check_rg_fbs # check rc_facebook storage
 
-    if rc_facebook_oget(:ensure_authorized) && !rc_facebook.authorized?
+    if rc_options_get(RestCore::Facebook, :ensure_authorized) &&
+       !rc_facebook.authorized?
+
       rc_facebook_authorize('ensure authorized')
       false # action halt, redirect to do authorize,
             # eagerly, as opposed to auto_authorize
@@ -78,11 +57,6 @@ module RestCore::Facebook::RailsUtil
     end
   end
 
-  # override this if you need different app_id and secret
-  def rc_facebook
-    @rc_facebook ||= RestCore::Facebook.new(rc_facebook_options_new)
-  end
-
   def rc_facebook_on_access_token_error error=nil
     rc_facebook_authorize(error, false)
   end
@@ -93,8 +67,9 @@ module RestCore::Facebook::RailsUtil
     if force_redirect || rc_facebook_auto_authorize?
       @rc_facebook_authorize_url = rc_facebook.authorize_url(
         {:redirect_uri => rc_facebook_normalized_request_uri,
-         :scope        => rc_facebook_oget(:auto_authorize_scope)}.
-        merge(rc_facebook_oget(:auto_authorize_options)))
+         :scope        =>
+           rc_options_get(RestCore::Facebook, :auto_authorize_scope)}.
+        merge(rc_options_get(RestCore::Facebook, :auto_authorize_options)))
 
       logger.debug(
       "DEBUG: Facebook: redirect to #{@rc_facebook_authorize_url}")
@@ -146,26 +121,6 @@ module RestCore::Facebook::RailsUtil
     HTML
   end
 
-  module_function
-
-  # ==================== begin options utility =======================
-  def rc_facebook_oget key
-    if rc_facebook_options_ctl.has_key?(key)
-      rc_facebook_options_ctl[key]
-    else
-      RestCore::Facebook.send("default_#{key}")
-    end
-  end
-
-  def rc_facebook_options_ctl
-    @rc_facebook_options_ctl ||= {}
-  end
-
-  def rc_facebook_options_new
-    @rc_facebook_options_new ||= {}
-  end
-  # ==================== end options utility =======================
-
 
 
   # ==================== begin facebook check ======================
@@ -235,7 +190,7 @@ module RestCore::Facebook::RailsUtil
 
   # ==================== begin check ================================
   def rc_facebook_storage_key
-    "rc_facebook_fbs_#{rc_facebook_oget(:app_id)}"
+    "rc_facebook_fbs_#{rc_options_get(RestCore::Facebook, :app_id)}"
   end
 
   def rc_facebook_check_rg_fbs
@@ -244,7 +199,9 @@ module RestCore::Facebook::RailsUtil
     rc_facebook_check_rg_cookies # in canvas, session might not work..
   end
 
-  def rc_facebook_check_rg_handler handler=rc_facebook_oget(:check_handler)
+  def rc_facebook_check_rg_handler handler=
+      rc_options_get(RestCore::Facebook, :check_handler)
+
     return if rc_facebook.authorized? || !handler
     rc_facebook.parse_fbs!(handler.call)
     logger.debug("DEBUG: Facebook: called check_handler, parsed:" \
@@ -252,16 +209,20 @@ module RestCore::Facebook::RailsUtil
   end
 
   def rc_facebook_check_rg_session
-    return if rc_facebook.authorized? || !rc_facebook_oget(:write_session) ||
+    return if rc_facebook.authorized?                             ||
+              !rc_options_get(RestCore::Facebook, :write_session) ||
               !(fbs = session[rc_facebook_storage_key])
+
     rc_facebook.parse_fbs!(fbs)
     logger.debug("DEBUG: Facebook: detected rc_facebook session, parsed:" \
                  " #{rc_facebook.data.inspect}")
   end
 
   def rc_facebook_check_rg_cookies
-    return if rc_facebook.authorized? || !rc_facebook_oget(:write_cookies) ||
+    return if rc_facebook.authorized?                             ||
+              !rc_options_get(RestCore::Facebook, :write_cookies) ||
               !(fbs = cookies[rc_facebook_storage_key])
+
     rc_facebook.parse_fbs!(fbs)
     logger.debug("DEBUG: Facebook: detected rc_facebook cookies, parsed:" \
                  " #{rc_facebook.data.inspect}")
@@ -282,13 +243,13 @@ module RestCore::Facebook::RailsUtil
   end
 
   def rc_facebook_write_rg_session
-    return if !rc_facebook_oget(:write_session)
+    return if !rc_options_get(RestCore::Facebook, :write_session)
     session[rc_facebook_storage_key] = fbs = rc_facebook.fbs
     logger.debug("DEBUG: Facebook: wrote session: fbs => #{fbs}")
   end
 
   def rc_facebook_write_rg_cookies
-    return if !rc_facebook_oget(:write_cookies)
+    return if !rc_options_get(RestCore::Facebook, :write_cookies)
     cookies[rc_facebook_storage_key] = fbs = rc_facebook.fbs
     logger.debug("DEBUG: Facebook: wrote cookies: fbs => #{fbs}")
   end
@@ -300,7 +261,8 @@ module RestCore::Facebook::RailsUtil
   def rc_facebook_normalized_request_uri
     uri = if rc_facebook_in_canvas?
             # rails 3 uses newer rack which has fullpath
-            "http://apps.facebook.com/#{rc_facebook_oget(:canvas)}" +
+            "http://apps.facebook.com/#{
+              rc_options_get(RestCore::Facebook, :canvas)}" +
             (request.respond_to?(:fullpath) ?
               request.fullpath : request.request_uri)
           else
@@ -320,13 +282,14 @@ module RestCore::Facebook::RailsUtil
   end
 
   def rc_facebook_in_canvas?
-    !rc_facebook_oget(:canvas).blank?
+    !rc_options_get(RestCore::Facebook, :canvas).blank?
   end
 
   def rc_facebook_auto_authorize?
-    !rc_facebook_oget(:auto_authorize_scope)  .blank? ||
-    !rc_facebook_oget(:auto_authorize_options).blank? ||
-     rc_facebook_oget(:auto_authorize)
+    client = RestCore::Facebook
+    !rc_options_get(client, :auto_authorize_scope)  .blank? ||
+    !rc_options_get(client, :auto_authorize_options).blank? ||
+     rc_options_get(client, :auto_authorize)
   end
   # ==================== end misc ================================
 end

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

@@ -3,7 +3,7 @@ require 'rest-core'
 
 require 'time' # for Time.parse
 
-RestCore::Flurry = RestCore::Builder.client(:api_key, :access_code) do
+RestCore::Flurry = RestCore::Builder.client(:apiKey, :apiAccessCode) do
   s = self.class # this is only for ruby 1.8!
   use s::Timeout       , 10
 
@@ -81,8 +81,8 @@ module RestCore::Flurry::Client
   end
 
   def query
-    {'apiKey'        => api_key    ,
-     'apiAccessCode' => access_code}
+    {'apiKey'        => apiKey       ,
+     'apiAccessCode' => apiAccessCode}
   end
 
   private

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

@@ -2,73 +2,12 @@
 require 'rest-core/util/rails_util_util'
 
 module RestCore::Flurry::DefaultAttributes
-  def default_log_method ; Rails.logger.method(:debug); end
-  def default_cache      ; Rails.cache                ; end
-  def default_api_key    ; nil                        ; end
-  def default_access_code; nil                        ; end
+  def default_log_method; Rails.logger.method(:debug); end
+  def default_cache     ; Rails.cache                ; end
 end
 
 module RestCore::Flurry::RailsUtil
-  def self.init app=Rails
-    RestCore::Config.load_for_rails(RestCore::Flurry, 'flurry', app)
-  end
-
-  module Helper
-    def rc_flurry
-      controller.send(:rc_flurry)
-    end
-  end
-
-  def self.included controller
-    # skip if included already, any better way to detect this?
-    return if controller.respond_to?(:rc_flurry, true)
-
-    controller.helper(RestCore::Flurry::RailsUtil::Helper)
-    controller.instance_methods.select{ |method|
-      method.to_s =~ /^rc_flurry/
-    }.each{ |method| controller.send(:protected, method) }
-  end
-
-  def rc_flurry_setup options={}
-    rc_flurry_options_ctl.merge!(
-      RestCore::RailsUtilUtil.extract_options(
-        RestCore::Flurry.members, options, :reject))
-    rc_flurry_options_new.merge!(
-      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,
-    # you'll end up with default options without the ones you've passed
-    # into rc_flurry_setup.
-    rc_flurry.send(:initialize, rc_flurry_options_new)
-
-    true # keep going
-  end
-
-  def rc_flurry
-    @rc_flurry ||= RestCore::Flurry.new(rc_flurry_options_new)
-  end
-
-  module_function
-
-  # ==================== begin options utility =======================
-  def rc_flurry_oget key
-    if rc_flurry_options_ctl.has_key?(key)
-      rc_flurry_options_ctl[key]
-    else
-      RestCore::Flurry.send("default_#{key}")
-    end
-  end
-
-  def rc_flurry_options_ctl
-    @rc_flurry_options_ctl ||= {}
-  end
-
-  def rc_flurry_options_new
-    @rc_flurry_options_new ||= {}
-  end
-  # ==================== end options utility =======================
+  include RestCore::RailsUtilUtil
 end
 
 RestCore::Flurry::RailsUtil.init(Rails)

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

@@ -16,3 +16,6 @@ RestCore::Github = RestCore::Builder.client do
     use s::JsonDecode  , true
   end
 end
+
+require 'rest-core/client/github/rails_util' if
+  Object.const_defined?(:Rails)

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

@@ -0,0 +1,13 @@
+
+require 'rest-core/util/rails_util_util'
+
+module RestCore::Github::DefaultAttributes
+  def default_log_method; Rails.logger.method(:debug); end
+  def default_cache     ; Rails.cache                ; end
+end
+
+module RestCore::Github::RailsUtil
+  include RestCore::RailsUtilUtil
+end
+
+RestCore::Github::RailsUtil.init(Rails)

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

@@ -57,3 +57,5 @@ end
 
 RestCore::Linkedin.send(:include, RestCore::ClientOauth1)
 RestCore::Linkedin.send(:include, RestCore::Linkedin::Client)
+require 'rest-core/client/linkedin/rails_util' if
+  Object.const_defined?(:Rails)

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

@@ -0,0 +1,13 @@
+
+require 'rest-core/util/rails_util_util'
+
+module RestCore::Linkedin::DefaultAttributes
+  def default_log_method; Rails.logger.method(:debug); end
+  def default_cache     ; Rails.cache                ; end
+end
+
+module RestCore::Linkedin::RailsUtil
+  include RestCore::RailsUtilUtil
+end
+
+RestCore::Linkedin::RailsUtil.init(Rails)

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

@@ -48,3 +48,5 @@ module RestCore::Mixi::Client
 end
 
 RestCore::Mixi.send(:include, RestCore::Mixi::Client)
+require 'rest-core/client/mixi/rails_util' if
+  Object.const_defined?(:Rails)

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

@@ -0,0 +1,13 @@
+
+require 'rest-core/util/rails_util_util'
+
+module RestCore::Mixi::DefaultAttributes
+  def default_log_method; Rails.logger.method(:debug); end
+  def default_cache     ; Rails.cache                ; end
+end
+
+module RestCore::Mixi::RailsUtil
+  include RestCore::RailsUtilUtil
+end
+
+RestCore::Mixi::RailsUtil.init(Rails)

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

@@ -99,3 +99,5 @@ end
 
 RestCore::Twitter.send(:include, RestCore::ClientOauth1)
 RestCore::Twitter.send(:include, RestCore::Twitter::Client)
+require 'rest-core/client/twitter/rails_util' if
+  Object.const_defined?(:Rails)

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

@@ -0,0 +1,13 @@
+
+require 'rest-core/util/rails_util_util'
+
+module RestCore::Twitter::DefaultAttributes
+  def default_log_method; Rails.logger.method(:debug); end
+  def default_cache     ; Rails.cache                ; end
+end
+
+module RestCore::Twitter::RailsUtil
+  include RestCore::RailsUtilUtil
+end
+
+RestCore::Twitter::RailsUtil.init(Rails)

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

@@ -8,11 +8,118 @@ module RestCore::RailsUtilUtil
               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) }]
+  module InstanceMethod
+    module_function # to mark below private in controllers
+    def rc_setup client, options={}
+      rc_options_ctl(client).merge!(
+        rc_options_extract(client.members, options, :reject))
+
+      rc_options_new(client).merge!(
+        rc_options_extract(client.members, options, :select))
+    end
+
+    def rc_options_get client, key
+      if rc_options_ctl(client).has_key?(key)
+        rc_options_ctl(client)[key]
+      else
+        client.send("default_#{key}")
+      end
+    end
+
+    def rc_options_ctl client
+      @rc_options_ctl              ||= {}
+      @rc_options_ctl[client.name] ||= {}
+    end
+
+    def rc_options_new client
+      @rc_options_new              ||= {}
+      @rc_options_new[client.name] ||= {}
+    end
+
+    def rc_options_extract 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
+
+  def self.included rails_util, name=rails_util.name[/(\w+)::\w+$/, 1]
+     extend_rails_util(rails_util, name)
+    include_rails_util(rails_util, name)
+          setup_helper(rails_util, name)
+  end
+
+  def self.extend_rails_util rails_util, name
+    meth = name.downcase
+    mod  = if rails_util.const_defined?(:ClassMethod)
+             rails_util.const_get(:ClassMethod)
+           else
+             Module.new
+           end
+    mod.module_eval(<<-RUBY, __FILE__, __LINE__)
+    def init app=Rails
+      RestCore::Config.load_for_rails(RestCore::#{name}, '#{meth}', app)
+    end
+
+    def included controller
+      # skip if included already, any better way to detect this?
+      return if controller.private_instance_methods.include?(:rc_#{meth})
+
+      controller.send(:include, RestCore::RailsUtilUtil::InstanceMethod)
+
+      controller.helper(RestCore::#{name}::RailsUtil::Helper)
+      controller.instance_methods.select{ |method|
+        method.to_s =~ /^rc_#{meth}/
+      }.each{ |method| controller.send(:private, method) }
+    end
+    RUBY
+    rails_util.send(:extend, mod)
+    rails_util.const_set(:ClassMethod, mod)
+  end
+
+  def self.include_rails_util rails_util, name
+    meth = name.downcase
+    mod  = if rails_util.const_defined?(:InstanceMethod)
+             rails_util.const_get(:InstanceMethod)
+           else
+             Module.new
+           end
+    mod.module_eval(<<-RUBY, __FILE__, __LINE__)
+    def rc_#{meth}
+      client = RestCore::#{name}
+      @rc_#{meth} ||= client.new(rc_options_new(client))
+    end
+
+    def rc_#{meth}_setup options={}
+      client = RestCore::#{name}
+      rc_setup(client, options)
+
+      # we'll need to reinitialize rc_#{meth} with the new options,
+      # otherwise if you're calling rc_#{meth} before rc_#{meth}_setup,
+      # you'll end up with default options without the ones you've passed
+      # into rc_#{meth}_setup.
+      rc_#{meth}.send(:initialize, rc_options_new(client))
+
+      true # keep going
+    end
+    RUBY
+    rails_util.send(:include, mod)
+    rails_util.const_set(:InstanceMethod, mod)
+  end
+
+  def self.setup_helper rails_util, name
+    meth = name.downcase
+    mod  = if rails_util.const_defined?(:Helper)
+             rails_util.const_get(:Helper)
+           else
+             Module.new
+           end
+    mod.module_eval(<<-RUBY, __FILE__, __LINE__)
+    def rc_#{meth}
+      controller.send(:rc_#{meth})
+    end
+    RUBY
+    rails_util.const_set(:Helper, mod)
   end
 end