sinatra-authentication 0.1.0 → 0.1.1

data/Rakefile

@@ -6,7 +6,7 @@ begin
   
   Jeweler::Tasks.new do |gemspec|
     gemspec.name           = 'sinatra-authentication'
-    gemspec.version        = '0.1.0'
+    gemspec.version        = '0.1.1'
     gemspec.description    = "Simple authentication plugin for sinatra."
     gemspec.summary        = "Simple authentication plugin for sinatra."
     gemspec.homepage       = "http://github.com/maxjustus/sinatra-authentication"

data/lib/models/abstract_user.rb

@@ -4,7 +4,7 @@ if Object.const_defined?("DataMapper")
   require 'dm-validations'
   require Pathname(__FILE__).dirname.expand_path + "datamapper_user.rb"
   require Pathname(__FILE__).dirname.expand_path + "dm_adapter.rb"
-elsif Object.const_defined?("Rufus")
+elsif Object.const_defined?("Rufus") && Rufus.const_defined?("Tokyo")
   require Pathname(__FILE__).dirname.expand_path + "rufus_tokyo_user.rb"
   require Pathname(__FILE__).dirname.expand_path + "tc_adapter.rb"
 end

data/lib/models/rufus_tokyo_user.rb

@@ -36,9 +36,9 @@ class TcUser
   def self.query(&block)
     connection = TcUserTable.new
     result_set = connection.query(&block)
-    result_set.collect! { |result_hash| TcUser.new(result_hash) }
+    output = result_set.collect { |result_hash| TcUser.new(result_hash) }
     connection.close
-    result_set
+    output
   end
 
   def self.get(key)
@@ -153,7 +153,17 @@ class TcUser
   end
 end
 
-class TcUserTable < Rufus::Tokyo::Table
+if Rufus::Tokyo.const_defined?('Table')
+  class TokyoTableDad < Rufus::Tokyo::Table
+  end
+elsif Rufus::Edo.const_defined?('Table')
+  class TokyoTableDad < Rufus::Edo::Table
+  end
+else
+  throw 'wtf?'
+end
+
+class TcUserTable < TokyoTableDad
   @@path = false
   def initialize
     #make this path configurable somehow

data/readme.markdown

@@ -120,8 +120,12 @@ Just remember to specify '/reciever' as the path to the xd-receiver file in your
 The render_login_logout helper 'logout' link will log the user out of facebook and your app.
 
 I've also included a little helper method 'render_facebook_connect_link' for rendering the facebook connect link with the correct 'onconnect' javascript callback.
-The callback redirects to '/connect' which is important because the way I've implemented facebook connect support is by pinging '/connect' after the user
-successfully connects with facebook. If you choose to render the connect button yourself, be sure to have the 'onconnect' callback include "window.location = '/connect'".
+The callback redirects to '/connect'.
+This is important because the way I've implemented facebook connect support is by pinging '/connect' after the user
+successfully connects with facebook.
+
+If you choose to render the connect button yourself, be sure to have the 'onconnect' callback include "window.location = '/connect'".
+
 '/connect' redirects to '/' on completion.
 
 The 'render_facebook_connect_link' helper uses html instead of fbml, so ajax requests to '/login' or "/users/#{user.id}/edit"

data/sinatra-authentication.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-authentication}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Justus Spransy"]
-  s.date = %q{2009-11-27}
+  s.date = %q{2009-12-05}
   s.description = %q{Simple authentication plugin for sinatra.}
   s.email = %q{maxjustus@gmail.com}
   s.files = [

data/test/lib/tc_sinbook.rb

@@ -15,9 +15,9 @@ facebook do
   url 'peoplewithjetpacks.com:4568/'
   callback 'peoplewithjetpacks.com:4568/'
 end
- 
+
 set :port, 4568
- 
+
 get '/' do
   haml :main
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-authentication
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Max Justus Spransy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -06:00
+date: 2009-12-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency