sinatra-authentication 0.2.1 → 0.2.2

data/Rakefile

@@ -6,7 +6,7 @@ begin
   
   Jeweler::Tasks.new do |gemspec|
     gemspec.name           = 'sinatra-authentication'
-    gemspec.version        = '0.2.1'
+    gemspec.version        = '0.2.2'
     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"
 elsif Object.const_defined?("MongoMapper")

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)

data/lib/sinatra-authentication.rb

@@ -225,8 +225,20 @@ module Sinatra
     end
 
     if Sinatra.const_defined?('FacebookObject')
-      def render_facebook_connect_link(text = 'Login using facebook')
-          %[<a href="#" onclick="FB.Connect.requireSession(function(){document.location = '/connect';}); return false;" class="fbconnect_login_button FBConnectButton FBConnectButton_Small">
+      def render_facebook_connect_link(text = 'Login using facebook', options = {:size => 'small'})
+          if options[:size] == 'small'
+            size = 'Small'
+          elsif options[:size] == 'medium'
+            size = 'Medium'
+          elsif options[:size] == 'large'
+            size = 'Large'
+          elsif options[:size] == 'xlarge'
+            size = 'BigPun'
+          else
+            size = 'Small'
+          end
+
+          %[<a href="#" onclick="FB.Connect.requireSession(function(){document.location = '/connect';}); return false;" class="fbconnect_login_button FBConnectButton FBConnectButton_#{size}">
               <span id="RES_ID_fb_login_text" class="FBConnectButton_Text">
                 #{text}
               </span>

data/lib/views/index.haml

@@ -1,5 +1,5 @@
 #sinatra_authentication
-  %h1 Users
+  %h1.page_title Users
   %table
     %tr
       %th

data/lib/views/login.haml

@@ -1,5 +1,5 @@
 #sinatra_authentication
-  %h1 Login
+  %h1.page_title Login
   %form{:action => "/login", :method => "post"}
     .field
       .label
@@ -13,6 +13,8 @@
       %input{:value => "login", :type => "submit"}
       %a{:href => "/signup", :class => 'sinatra_authentication_link'}
         Signup
-      .facebook_login
+    .third_party_signup
+      %h3.section_title One click login:
+      .login_link.facebook_login
         - if Sinatra.const_defined?('FacebookObject')
-          = render_facebook_connect_link
+          = render_facebook_connect_link('Login using facebook', :size => 'large')

data/lib/views/show.haml

@@ -1,5 +1,5 @@
 #sinatra_authentication
-  %h1
+  %h1.page_title
     - if @user.email
       = @user.email
     - elsif @user.fb_uid

data/lib/views/signup.haml

@@ -1,5 +1,5 @@
 #sinatra_authentication
-  %h1 Signup
+  %h1.page_title Signup
   %form{:action => "/signup", :method => "post"}
     .field
       .label
@@ -17,3 +17,8 @@
       %input{ :value => "Create account", :type => "submit" }
       %a{:href => "/login", :class => 'sinatra_authentication_link'}
         Login
+    .third_party_signup
+      %h3.section_title One click signup:
+      .login_link.facebook_login
+        - if Sinatra.const_defined?('FacebookObject')
+          = render_facebook_connect_link('Signup using facebook', :size => 'large')

data/readme.markdown

@@ -1,4 +1,4 @@
-### a little sinatra gem that implements user authentication, with support for both datamapper and rufus-tokyo
+### A little sinatra gem that implements user authentication, with support for datamapper, mongomapper and rufus-tokyo
 
 ## INSTALLATION:
 

data/sinatra-authentication.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-authentication}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Justus Spransy"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-authentication
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Max Justus Spransy