RubyGems - jsmestad-frankie - Versions diffs - 0.4.0 → 0.4.1 - Mend

jsmestad-frankie 0.4.0 → 0.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.4.0
1	+ 0.4.1

data/frankie.gemspec CHANGED Viewed

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.name = %q{frankie}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ron Evans", "Justin Smestad"]

data/lib/frankie.rb CHANGED Viewed

@@ -12,9 +12,9 @@ require 'uri'
 gem 'mmangino-facebooker'
 require 'facebooker'
-module Frankie
+module Sinatra
-  module Configure
+  module Frankie
     def load_facebook_config(file, env=:development)
       if File.exist?(file)
         yaml = YAML.load_file(file)[env.to_s]
@@ -23,9 +23,7 @@ module Frankie
         ENV['FACEBOOKER_RELATIVE_URL_ROOT'] = yaml['canvas_page_name']
       end
     end
-  end
-  module Helpers
     def facebook_session
       @facebook_session
     end
@@ -47,145 +45,137 @@ module Frankie
       @facebook_params ||= verified_facebook_params
     end
-    private
-      def session_already_secured?
-        (@facebook_session = session[:facebook_session]) && session[:facebook_session].secured?
-      end
-      def secure_with_token!
-        if params['auth_token']
-          @facebook_session = new_facebook_session
-          @facebook_session.auth_token = params['auth_token']
-          @facebook_session.secure!
-          session[:facebook_session] = @facebook_session
-        end
-      end
-      def secure_with_facebook_params!
-        return unless request_is_for_a_facebook_canvas?
-        if ['user', 'session_key'].all? {|element| facebook_params[element]}
-          @facebook_session = new_facebook_session
-          @facebook_session.secure_with!(facebook_params['session_key'], facebook_params['user'], facebook_params['expires'])
-          session[:facebook_session] = @facebook_session
-        end
-      end
-      def create_new_facebook_session_and_redirect!
-        session[:facebook_session] = new_facebook_session
-        throw :halt, do_redirect(session[:facebook_session].login_url) unless @installation_required
+    def session_already_secured?
+      (@facebook_session = session[:facebook_session]) && session[:facebook_session].secured?
+    end
+    def secure_with_token!
+      if params['auth_token']
+        @facebook_session = new_facebook_session
+        @facebook_session.auth_token = params['auth_token']
+        @facebook_session.secure!
+        session[:facebook_session] = @facebook_session
       end
+    end
+    def secure_with_facebook_params!
+      return unless request_is_for_a_facebook_canvas?
-      def new_facebook_session
-        Facebooker::Session.create(Facebooker::Session.api_key, Facebooker::Session.secret_key)
+      if ['user', 'session_key'].all? {|element| facebook_params[element]}
+        @facebook_session = new_facebook_session
+        @facebook_session.secure_with!(facebook_params['session_key'], facebook_params['user'], facebook_params['expires'])
+        session[:facebook_session] = @facebook_session
       end
-      def capture_facebook_friends_if_available!
-        return unless request_is_for_a_facebook_canvas?
-        if friends = facebook_params['friends']
-          facebook_session.user.friends = friends.map do |friend_uid|
-            Facebooker::User.new(friend_uid, facebook_session)
-          end
+    end
+    def create_new_facebook_session_and_redirect!
+      session[:facebook_session] = new_facebook_session
+      throw :halt, do_redirect(session[:facebook_session].login_url) unless @installation_required
+    end
+    def new_facebook_session
+      Facebooker::Session.create(Facebooker::Session.api_key, Facebooker::Session.secret_key)
+    end
+    def capture_facebook_friends_if_available!
+      return unless request_is_for_a_facebook_canvas?
+      if friends = facebook_params['friends']
+        facebook_session.user.friends = friends.map do |friend_uid|
+          Facebooker::User.new(friend_uid, facebook_session)
         end
       end
-      def blank?(value)
-        (value == '0' || value.nil? || value == '')
-      end
+    end
+    def blank?(value)
+      (value == '0' || value.nil? || value == '')
+    end
-      def verified_facebook_params
-        facebook_sig_params = params.inject({}) do |collection, pair|
-          collection[pair.first.sub(/^fb_sig_/, '')] = pair.last if pair.first[0,7] == 'fb_sig_'
-          collection
-        end
-        verify_signature(facebook_sig_params, params['fb_sig'])
-        facebook_sig_params.inject(Hash.new) do |collection, pair|
-          collection[pair.first] = facebook_parameter_conversions[pair.first].call(pair.last)
-          collection
-        end
-      end
-      # 48.hours.ago in sinatra
-      def earliest_valid_session
-        now = Time.now
-        now -= (60 * 60 * 48)
-      now
+    def verified_facebook_params
+      facebook_sig_params = params.inject({}) do |collection, pair|
+        collection[pair.first.sub(/^fb_sig_/, '')] = pair.last if pair.first[0,7] == 'fb_sig_'
+        collection
       end
-      def verify_signature(facebook_sig_params,expected_signature)
-        raw_string = facebook_sig_params.map{ |*args| args.join('=') }.sort.join
-        actual_sig = Digest::MD5.hexdigest([raw_string, Facebooker::Session.secret_key].join)
-        raise Facebooker::Session::IncorrectSignature if actual_sig != expected_signature
-        raise Facebooker::Session::SignatureTooOld if Time.at(facebook_sig_params['time'].to_f) < earliest_valid_session
-        true
-      end
-      def facebook_parameter_conversions
-        @facebook_parameter_conversions ||= Hash.new do |hash, key|
-          lambda{|value| value}
-        end.merge(
-          'time' => lambda{|value| Time.at(value.to_f)},
-          'in_canvas' => lambda{|value| !blank?(value)},
-          'added' => lambda{|value| !blank?(value)},
-          'expires' => lambda{|value| blank?(value) ? nil : Time.at(value.to_f)},
-          'friends' => lambda{|value| value.split(/,/)}
-        )
+      verify_signature(facebook_sig_params, params['fb_sig'])
+      facebook_sig_params.inject(Hash.new) do |collection, pair|
+        collection[pair.first] = facebook_parameter_conversions[pair.first].call(pair.last)
+        collection
       end
-      def do_redirect(*args)
-        if request_is_for_a_facebook_canvas?
-          fbml_redirect_tag(args)
-        else
-          redirect args[0]
-        end
-      end
-      def fbml_redirect_tag(url)
-        "<fb:redirect url=\"#{url}\" />"
-      end
-      def request_is_for_a_facebook_canvas?
-        return false if params["fb_sig_in_canvas"].nil?
-        params["fb_sig_in_canvas"] == "1"
+    end
+    # 48.hours.ago in sinatra
+    def earliest_valid_session
+      now = Time.now
+      now -= (60 * 60 * 48)
+    now
+    end
+    def verify_signature(facebook_sig_params,expected_signature)
+      raw_string = facebook_sig_params.map{ |*args| args.join('=') }.sort.join
+      actual_sig = Digest::MD5.hexdigest([raw_string, Facebooker::Session.secret_key].join)
+      raise Facebooker::Session::IncorrectSignature if actual_sig != expected_signature
+      raise Facebooker::Session::SignatureTooOld if Time.at(facebook_sig_params['time'].to_f) < earliest_valid_session
+      true
+    end
+    def facebook_parameter_conversions
+      @facebook_parameter_conversions ||= Hash.new do |hash, key|
+        lambda{|value| value}
+      end.merge(
+        'time' => lambda{|value| Time.at(value.to_f)},
+        'in_canvas' => lambda{|value| !blank?(value)},
+        'added' => lambda{|value| !blank?(value)},
+        'expires' => lambda{|value| blank?(value) ? nil : Time.at(value.to_f)},
+        'friends' => lambda{|value| value.split(/,/)}
+      )
+    end
+    def do_redirect(*args)
+      if request_is_for_a_facebook_canvas?
+        fbml_redirect_tag(args)
+      else
+        redirect args[0]
       end
-      def application_is_installed?
+    end
+    def fbml_redirect_tag(url)
+      "<fb:redirect url=\"#{url}\" />"
+    end
+    def request_is_for_a_facebook_canvas?
+      return false if params["fb_sig_in_canvas"].nil?
+      params["fb_sig_in_canvas"] == "1"
+    end
+    def application_is_installed?
       facebook_params['added']
-      end
-      def ensure_authenticated_to_facebook
-        set_facebook_session || create_new_facebook_session_and_redirect!
-      end
-      def ensure_application_is_installed_by_facebook_user
-        @installation_required = true
-        authenticated_and_installed = ensure_authenticated_to_facebook && application_is_installed?
-        application_is_not_installed_by_facebook_user unless authenticated_and_installed
-        authenticated_and_installed
-      end
-      def application_is_not_installed_by_facebook_user
-        throw :halt, do_redirect(session[:facebook_session].install_url)
-      end
+    end
-      def set_fbml_format
-        params['format']="fbml" if request_is_for_a_facebook_canvas?
-      end
-      def fb_url_for(url)
-        url = "" if url == "/"
-        url = URI.escape(url)
-        return url if !request_is_for_a_facebook_canvas?
-        "http://apps.facebook.com/#{ENV['FACEBOOKER_RELATIVE_URL_ROOT']}/#{url}"
-      end
-  end
+    def ensure_authenticated_to_facebook
+      set_facebook_session || create_new_facebook_session_and_redirect!
+    end
+    def ensure_application_is_installed_by_facebook_user
+      @installation_required = true
+      authenticated_and_installed = ensure_authenticated_to_facebook && application_is_installed?
+      application_is_not_installed_by_facebook_user unless authenticated_and_installed
+      authenticated_and_installed
+    end
+    def application_is_not_installed_by_facebook_user
+      throw :halt, do_redirect(session[:facebook_session].install_url)
+    end
+    def set_fbml_format
+      params['format']="fbml" if request_is_for_a_facebook_canvas?
+    end
-  def self.registered(app)
-    app.configure Frankie::Configure
-    app.helpers Frankie::Helpers
+    def fb_url_for(url)
+      url = "" if url == "/"
+      url = URI.escape(url)
+      return url if !request_is_for_a_facebook_canvas?
+      "http://apps.facebook.com/#{ENV['FACEBOOKER_RELATIVE_URL_ROOT']}/#{url}"
+    end
   end
+  register Frankie
 end
-Sinatra::Base.register Frankie

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsmestad-frankie
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ron Evans