facebookcl 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/commands/base.rb

@@ -1,6 +1,4 @@
 module FacebookCommands; class << self
-  public
-  
   def method_missing(command, *args)
     puts "#{command} is not supported"
   end

data/commands/help.rb

@@ -1,6 +1,4 @@
 module FacebookCommands; class << self
-  public
-
   def help(*args)
     if (args.first == 'help')
       puts 'help'

data/commands/info.rb

@@ -1,6 +1,4 @@
 module FacebookCommands; class << self
-  public
-
   def info(*args)
     if (args.first == 'help')
       puts 'info'

data/commands/picture.rb

@@ -1,8 +1,6 @@
 require 'optparse'
 
 module FacebookCommands; class << self
-  public
-
   def picture(*args)
     if (args.first == 'help')
       puts 'picture <friend>'

data/commands/stream.rb

@@ -1,8 +1,6 @@
 require 'optparse'
 
 module FacebookCommands; class << self
-  public
-
   def stream(*args)
     if args.empty?
       puts 'stream by itself does nothing'

data/commands/wall.rb

@@ -1,6 +1,4 @@
 module FacebookCommands; class << self
-  public
-
   def wall(*args)
     if args.empty?
       puts 'wall by itself does nothing'

data/facebookcl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebookcl}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Bishop"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "commands/stream.rb",
      "commands/wall.rb",
      "facebookcl.gemspec",
+     "lib/facebook_server.rb",
      "lib/facebookcl.rb"
   ]
   s.homepage = %q{http://github.com/jubishop/facebookcl}

data/lib/facebook_server.rb

@@ -0,0 +1,36 @@
+class FacebookAuthServer < TCPServer
+  def serve_and_extract_access_token_from_user_agent_flow
+    serve_content_and_return_request(%Q{
+      <script>
+        window.location.replace(window.location.toString().replace('#', '?'));
+      </script>})
+
+    request = serve_content_and_return_request(%q{
+      Success! You can now close this window and return to FacebookCL.
+      <script>
+        window.close();
+      </script>})
+
+    extract_access_token_from_request(request)
+  end
+
+  private
+
+  HTTP_HEADER = "HTTP/1.1 200/OK\r\nContent-type:text/html\r\n\r\n"
+
+  def serve_content_and_return_request(content)
+    session = accept
+    session.print HTTP_HEADER
+
+    request = session.gets.strip
+
+    session.print(content)
+    session.close
+
+    request
+  end
+
+  def extract_access_token_from_request(request)
+    request.gsub(/^GET \/\?access_token=/, '').gsub(/ HTTP.*$/, '')
+  end
+end

data/lib/facebookcl.rb

@@ -10,9 +10,11 @@ require 'uri'
 # runtime dependencies
 require 'json'
 
-module FacebookCL; class << self
-  public
+# helper libs
+__DIR__ = File.dirname(__FILE__)
+require __DIR__ + '/facebook_server.rb'
 
+module FacebookCL; class << self
   APP_ID = 119412046078 # FacebookCL
   SERVER_PORT = 6682 # my birthday ;o)
   GRAPH_URL = 'graph.facebook.com'
@@ -52,22 +54,11 @@ module FacebookCL; class << self
           auth_url
       end
 
-      serve_content(%Q{
-        <script>
-          window.location.replace(window.location.toString().replace('#', '?'));
-        </script>})
-
-      request = serve_content(%q{
-        Success! You can now close this window and return to FacebookCL.
-        <script>
-          window.close();
-        </script>})
+      server = FacebookAuthServer.new(NEXT_URL, SERVER_PORT)
+      self.access_token =
+        server.serve_and_extract_access_token_from_user_agent_flow
+      server.close
 
-      @server.close
-
-      self.access_token = request.
-        gsub(/^GET \/\?access_token=/, '').
-        gsub(/ HTTP.*$/, '')
       self.uid = get('me')['id']
 
       puts "Saving authentication data to #{config_filename}"
@@ -116,18 +107,4 @@ module FacebookCL; class << self
       value
     end
   end
-
-  def serve_content(content)
-    @server ||= TCPServer.new(NEXT_URL, SERVER_PORT)
-
-    session = @server.accept
-    session.print "HTTP/1.1 200/OK\r\nContent-type:text/html\r\n\r\n"
-
-    request = session.gets.strip
-
-    session.print content
-    session.close
-
-    request
-  end
 end; end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facebookcl
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Justin Bishop
@@ -56,6 +56,7 @@ files:
 - commands/stream.rb
 - commands/wall.rb
 - facebookcl.gemspec
+- lib/facebook_server.rb
 - lib/facebookcl.rb
 has_rdoc: true
 homepage: http://github.com/jubishop/facebookcl