example/rails/app/controllers/application_controller.rb in rest-graph-1.3.0 vs example/rails/app/controllers/application_controller.rb in rest-graph-1.4.0

@@ -8,69 +8,55 @@
   # Scrub sensitive parameters from your log
   # filter_parameter_logging :password
 
   include RestGraph::RailsUtil
 
-  before_filter :rest_graph_setup,   :only => [:index,  :url_for_standalone,
-                                                        :url_for_view_stand,
-                                                        :link_to_stand,
-                                                        :redirect_stand]
-  before_filter :filter_canvas,      :only => [:canvas, :url_for_canvas,
-                                                        :url_for_view_canvas,
-                                                        :link_to_canvas,
-                                                        :redirect_canvas]
+  before_filter :filter_common,      :only => [:index]
+  before_filter :filter_canvas,      :only => [:canvas]
   before_filter :filter_options,     :only => [:options]
   before_filter :filter_no_auto,     :only => [:no_auto]
-  before_filter :filter_diff_app_id, :only => [:app_id]
+  before_filter :filter_diff_app_id, :only => [:diff_app_id]
+  before_filter :filter_diff_canvas, :only => [:diff_canvas]
 
   def index
     render :text => rest_graph.get('me').to_json
   end
-  alias_method :canvas,  :index
-  alias_method :options, :index
+  alias_method :canvas     , :index
+  alias_method :options    , :index
+  alias_method :diff_canvas, :index
 
   def no_auto
     rest_graph.get('me')
   rescue RestGraph::Error
     render :text => 'XD'
   end
 
-  def app_id
+  def diff_app_id
     render :text => rest_graph.app_id
   end
 
-  def url_for_standalone
-    render :text => url_for(:action => 'index')
+  private
+  def filter_common
+    rest_graph_setup(:auto_authorize => true)
   end
-  alias_method :url_for_canvas, :url_for_standalone
 
-  def url_for_view_stand
-    render :inline => '<%= url_for(:action => "index") %>'
-  end
-  alias_method :url_for_view_canvas, :url_for_view_stand
-
-  def link_to_stand
-    render :inline => '<%= link_to("test", :action => "index") %>'
-  end
-  alias_method :link_to_canvas, :link_to_stand
-
-  def redirect_stand
-    redirect_to :action => 'index'
-  end
-  alias_method :redirect_canvas, :redirect_stand
-
-  private
   def filter_canvas
-    rest_graph_setup(:canvas => true,
+    rest_graph_setup(:canvas               => RestGraph.default_canvas,
                      :auto_authorize_scope => 'publish_stream')
   end
 
+  def filter_diff_canvas
+    rest_graph_setup(:canvas               => 'ToT',
+                     :auto_authorize_scope => 'email')
+  end
+
   def filter_no_auto
     rest_graph_setup(:auto_authorize => false)
   end
 
   def filter_diff_app_id
-    rest_graph_setup(:app_id => 'zzz')
+    rest_graph_setup(:app_id => 'zzz',
+                     :auto_authorize => true)
   end
 
   def filter_options
     rest_graph_setup(:auto_authorize_options => {:scope => 'bogus'})
   end