exvo-auth 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/exvo-auth.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]

data/lib/exvo_auth/controllers/base.rb

@@ -11,8 +11,6 @@ module ExvoAuth::Controllers::Base
       else
         redirect_to sign_in_path
       end
-      
-      false # for Merb and older Rails
     end
   end
   

data/lib/exvo_auth/controllers/merb.rb

@@ -1,17 +1,25 @@
 module ExvoAuth::Controllers::Merb
   def self.included(base)
     base.send :include, ExvoAuth::Controllers::Base
+    base.send :include, InstanceMethods
   end
   
-  def redirect_to(*args)
-    redirect(*args)
-  end
-  
-  def find_user_by_id(id)
-    User[id]
-  end
-  
-  def current_url
-    request.full_uri if request.method == :get
+  module InstanceMethods
+    def authenticate_user!
+      super
+      throw :halt unless signed_in?
+    end 
+
+    def redirect_to(*args)
+      redirect(*args)
+    end
+
+    def find_user_by_id(id)
+      User[id]
+    end
+
+    def current_url
+      request.full_uri if request.method == :get
+    end
   end
 end

data/lib/exvo_auth/controllers/rails.rb

@@ -1,14 +1,17 @@
 module ExvoAuth::Controllers::Rails
   def self.included(base)
     base.send :include, ExvoAuth::Controllers::Base
-    helper_method :current_user, :signed_in?, :sign_in_path, :sign_up_path
+    base_send :include, InstanceMethods
+    base.helper_method :current_user, :signed_in?, :sign_in_path, :sign_up_path
   end
     
-  def find_user_by_id(id)
-    User.find(id)
-  end
-  
-  def current_url
-    request.url if request.get?
+  module InstanceMethods
+    def find_user_by_id(id)
+      User.find(id)
+    end
+
+    def current_url
+      request.url if request.get?
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Jacek Becela