merb-auth-slice-password 1.1.0 → 1.1.1

data/Rakefile

@@ -31,7 +31,7 @@ begin
     ]
 
     # Runtime dependencies
-    gemspec.add_dependency 'merb-slices',    "~> #{Merb::Slices::VERSION}"
+    gemspec.add_dependency 'merb-slices',    '~> 1.1'
     gemspec.add_dependency 'merb-auth-core', "~> #{Merb::Auth::Core::VERSION}"
     gemspec.add_dependency 'merb-auth-more', "~> #{Merb::Auth::More::VERSION}"
 

data/app/controllers/application.rb

@@ -1,5 +1,5 @@
 class MerbAuthSlicePassword::Application < Merb::Controller
-  
+
   controller_for_slice
-  
+
 end

data/app/controllers/exceptions.rb

@@ -14,20 +14,20 @@ module MerbAuthSlicePassword::ExceptionsMixin
 end
 
 Merb::Authentication.customize_default do
-  
+
   Exceptions.class_eval do
     include Merb::Slices::Support # Required to provide slice_url
-  
+
     # # This stuff allows us to provide a default view
     the_view_path = File.expand_path(File.dirname(__FILE__) / ".." / "views")
     self._template_roots ||= []
     self._template_roots << [the_view_path, :_template_location]
     self._template_roots << [Merb.dir_for(:view), :_template_location]
-    
+
     include MerbAuthSlicePassword::ExceptionsMixin
-    
+
     show_action :unauthenticated
 
   end# Exceptions.class_eval
-  
+
 end # Customize default

data/app/controllers/sessions.rb

@@ -1,16 +1,16 @@
 class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application
-  
+
   before :_maintain_auth_session_before, :exclude => [:destroy]  # Need to hang onto the redirection during the session.abandon!
   before :_abandon_session,     :only => [:update, :destroy]
   before  :_maintain_auth_session_after,  :exclude => [:destroy]  # Need to hang onto the redirection during the session.abandon!
   before :ensure_authenticated, :only => [:update]
 
   # redirect from an after filter for max flexibility
-  # We can then put it into a slice and ppl can easily 
+  # We can then put it into a slice and ppl can easily
   # customize the action
   after :redirect_after_login,  :only => :update, :if => lambda{ !(300..399).include?(status) }
   after :redirect_after_logout, :only => :destroy
-  
+
   def update
     "Add an after filter to do stuff after login"
   end
@@ -18,20 +18,20 @@ class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application
   def destroy
     "Add an after filter to do stuff after logout"
   end
-  
-  
-  private   
+
+
+  private
   # @overwritable
   def redirect_after_login
     message[:notice] = "Authenticated Successfully"
     redirect_back_or "/", :message => message, :ignore => [slice_url(:login), slice_url(:logout)]
   end
-  
+
   # @overwritable
   def redirect_after_logout
     message[:notice] = "Logged Out"
     redirect "/", :message => message
-  end  
+  end
 
   # @private
   def _maintain_auth_session_before
@@ -40,14 +40,14 @@ class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application
       @_maintain_auth_session[k] = session[k]
     end
   end
-  
+
   # @private
   def _maintain_auth_session_after
     @_maintain_auth_session.each do |k,v|
       session[k] = v
     end
   end
-  
+
   # @private
   def _abandon_session
     session.abandon!

data/app/helpers/application_helper.rb

@@ -1,64 +1,64 @@
 module Merb
   module MerbAuthSlicePassword
     module ApplicationHelper
-      
+
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path relative to the public directory, with added segments.
       def image_path(*segments)
         public_path_for(:image, *segments)
       end
-      
+
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path relative to the public directory, with added segments.
       def javascript_path(*segments)
         public_path_for(:javascript, *segments)
       end
-      
+
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path relative to the public directory, with added segments.
       def stylesheet_path(*segments)
         public_path_for(:stylesheet, *segments)
       end
-      
+
       # Construct a path relative to the public directory
-      # 
+      #
       # @param <Symbol> The type of component.
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path relative to the public directory, with added segments.
       def public_path_for(type, *segments)
         ::MerbAuthSlicePassword.public_path_for(type, *segments)
       end
-      
+
       # Construct an app-level path.
-      # 
+      #
       # @param <Symbol> The type of component.
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path within the host application, with added segments.
       def app_path_for(type, *segments)
         ::MerbAuthSlicePassword.app_path_for(type, *segments)
       end
-      
+
       # Construct a slice-level path.
-      # 
+      #
       # @param <Symbol> The type of component.
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path within the slice source (Gem), with added segments.
       def slice_path_for(type, *segments)
         ::MerbAuthSlicePassword.slice_path_for(type, *segments)
       end
-      
+
     end
   end
 end

data/config/init.rb

@@ -1,19 +1,19 @@
 #
 # ==== Standalone MerbAuthSlicePassword configuration
-# 
-# This configuration/environment file is only loaded by bin/slice, which can be 
+#
+# This configuration/environment file is only loaded by bin/slice, which can be
 # used during development of the slice. It has no effect on this slice being
 # loaded in a host application. To run your slice in standalone mode, just
 # run 'slice' from its directory. The 'slice' command is very similar to
-# the 'merb' command, and takes all the same options, including -i to drop 
+# the 'merb' command, and takes all the same options, including -i to drop
 # into an irb session for example.
 #
 # The usual Merb configuration directives and init.rb setup methods apply,
 # including use_orm and before_app_loads/after_app_loads.
 #
-# If you need need different configurations for different environments you can 
+# If you need need different configurations for different environments you can
 # even create the specific environment file in config/environments/ just like
-# in a regular Merb application. 
+# in a regular Merb application.
 #
 # In fact, a slice is no different from a normal # Merb application - it only
 # differs by the fact that seamlessly integrates into a so called 'host'
@@ -26,18 +26,18 @@ Merb::Config.use do |c|
   # Sets up a custom session id key which is used for the session persistence
   # cookie name.  If not specified, defaults to '_session_id'.
   # c[:session_id_key] = '_session_id'
-  
+
   # The session_secret_key is only required for the cookie session store.
   c[:session_secret_key]  = '8355682a717c7e6b2f84dd731f7fb338087793b1'
-  
-  # There are various options here, by default Merb comes with 'cookie', 
-  # 'memory', 'memcache' or 'container'.  
-  # You can of course use your favorite ORM instead: 
+
+  # There are various options here, by default Merb comes with 'cookie',
+  # 'memory', 'memcache' or 'container'.
+  # You can of course use your favorite ORM instead:
   # 'datamapper', 'sequel' or 'activerecord'.
   c[:session_store] = 'cookie'
-  
+
   # When running a slice standalone, you're usually developing it,
   # so enable template reloading by default.
   c[:reload_templates] = true
-  
+
 end

data/lib/merb-auth-slice-password/merbtasks.rb

@@ -1,13 +1,13 @@
 namespace :slices do
   namespace :"merb-auth-slice-password" do
-  
+
     desc "Install MerbAuthSlicePassword"
     task :install => [:preflight, :setup_directories, :copy_assets, :migrate]
-    
+
     desc "Test for any dependencies"
     task :preflight do # see slicetasks.rb
     end
-  
+
     desc "Setup directories"
     task :setup_directories do
       puts "Creating directories for host application"
@@ -21,7 +21,7 @@ namespace :slices do
         end
       end
     end
-    
+
     desc "Copy stub files to host application"
     task :stubs do
       puts "Copying stubs for MerbAuthSlicePassword - resolves any collisions"
@@ -30,10 +30,10 @@ namespace :slices do
       copied.each { |f| puts "- copied #{f}" }
       preserved.each { |f| puts "! preserved override as #{f}" }
     end
-    
+
     desc "Copy stub files and views to host application"
     task :patch => [ "stubs", "freeze:views" ]
-  
+
     desc "Copy public assets to host application"
     task :copy_assets do
       puts "Copying assets for MerbAuthSlicePassword - resolves any collisions"
@@ -42,16 +42,16 @@ namespace :slices do
       copied.each { |f| puts "- copied #{f}" }
       preserved.each { |f| puts "! preserved override as #{f}" }
     end
-    
+
     desc "Migrate the database"
     task :migrate do # see slicetasks.rb
     end
-    
-    desc "Freeze MerbAuthSlicePassword into your app (only merb-auth-slice-password/app)" 
+
+    desc "Freeze MerbAuthSlicePassword into your app (only merb-auth-slice-password/app)"
     task :freeze => [ "freeze:app" ]
 
     namespace :freeze do
-      
+
       desc "Freezes MerbAuthSlicePassword by installing the gem into application/gems using merb-freezer"
       task :gem do
         begin
@@ -60,7 +60,7 @@ namespace :slices do
           puts "! dependency 'merb-freezer' missing"
         end
       end
-      
+
       desc "Freezes MerbAuthSlicePassword by copying all files from merb-auth-slice-password/app to your application"
       task :app do
         puts "Copying all merb-auth-slice-password/app files to your application - resolves any collisions"
@@ -69,8 +69,8 @@ namespace :slices do
         copied.each { |f| puts "- copied #{f}" }
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
-      
-      desc "Freeze all views into your application for easy modification" 
+
+      desc "Freeze all views into your application for easy modification"
       task :views do
         puts "Copying all view templates to your application - resolves any collisions"
         copied, preserved = MerbAuthSlicePassword.mirror_files_for :view
@@ -78,8 +78,8 @@ namespace :slices do
         copied.each { |f| puts "- copied #{f}" }
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
-      
-      desc "Freeze all models into your application for easy modification" 
+
+      desc "Freeze all models into your application for easy modification"
       task :models do
         puts "Copying all models to your application - resolves any collisions"
         copied, preserved = MerbAuthSlicePassword.mirror_files_for :model
@@ -87,10 +87,10 @@ namespace :slices do
         copied.each { |f| puts "- copied #{f}" }
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
-      
+
       desc "Freezes MerbAuthSlicePassword as a gem and copies over merb-auth-slice-password/app"
       task :app_with_gem => [:gem, :app]
-      
+
       desc "Freezes MerbAuthSlicePassword by unpacking all files into your application"
       task :unpack do
         puts "Unpacking MerbAuthSlicePassword files to your application - resolves any collisions"
@@ -99,8 +99,8 @@ namespace :slices do
         copied.each { |f| puts "- copied #{f}" }
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
-      
+
     end
-    
+
   end
 end

data/lib/merb-auth-slice-password/slicetasks.rb

@@ -1,18 +1,18 @@
 namespace :slices do
-  namespace :"merb-auth-slice-password" do 
-    
+  namespace :"merb-auth-slice-password" do
+
     # add your own merb-auth-slice-password tasks here
-    
+
     # implement this to test for structural/code dependencies
     # like certain directories or availability of other files
     desc "Test for any dependencies"
     task :preflight do
     end
-    
+
     # implement this to perform any database related setup steps
     desc "Migrate the database"
     task :migrate do
     end
-    
+
   end
 end

data/lib/merb-auth-slice-password/spectasks.rb

@@ -1,21 +1,21 @@
 require "spec/rake/spectask"
 namespace :slices do
   namespace :"merb-auth-slice-password" do
-      
+
     desc "Run slice specs within the host application context"
     task :spec => [ "spec:explain", "spec:default" ]
-    
+
     namespace :spec do
-      
+
       slice_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-      
+
       task :explain do
         puts "\nNote: By running MerbAuthSlicePassword specs inside the application context any\n" +
              "overrides could break existing specs. This isn't always a problem,\n" +
              "especially in the case of views. Use these spec tasks to check how\n" +
              "well your application conforms to the original slice implementation."
       end
-      
+
       Spec::Rake::SpecTask.new('default') do |t|
         t.spec_opts = ["--format", "specdoc", "--colour"]
         t.spec_files = Dir["#{slice_root}/spec/**/*_spec.rb"].sort
@@ -36,7 +36,7 @@ namespace :slices do
         t.spec_opts = ["--format", "specdoc", "--colour"]
         if(ENV['CONTROLLER'])
           t.spec_files = Dir["#{slice_root}/spec/controllers/**/#{ENV['CONTROLLER']}_spec.rb"].sort
-        else    
+        else
           t.spec_files = Dir["#{slice_root}/spec/controllers/**/*_spec.rb"].sort
         end
       end
@@ -59,8 +59,8 @@ namespace :slices do
         t.libs = ['lib', 'server/lib' ]
         t.spec_files = Dir["#{slice_root}/spec/**/*_spec.rb"].sort
       end
-      
+
     end
-    
+
   end
 end

data/spec/spec_helper.rb

@@ -32,8 +32,8 @@ Merb::Plugins.config[:merb_slices][:search_path]   = File.join(File.dirname(__FI
 # - testing standalone, without being installed as a gem and no host application
 # - testing from within the host application; its root will be used
 Merb.start_environment(
-  :testing => true, 
-  :adapter => 'runner', 
+  :testing => true,
+  :adapter => 'runner',
   :environment => ENV['MERB_ENV'] || 'test',
   :merb_root => Merb.root,
   :session_store => 'memory'
@@ -42,17 +42,17 @@ Merb.start_environment(
 module Merb
   module Test
     module SliceHelper
-      
+
       # The absolute path to the current slice
       def current_slice_root
         @current_slice_root ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
       end
-      
+
       # Whether the specs are being run from a host application or standalone
       def standalone?
         Merb.root == ::MerbAuthSlicePassword.root
       end
-      
+
     end
   end
 end

data/stubs/app/controllers/sessions.rb

@@ -3,17 +3,17 @@ class MerbAuthSlicePassword::Sessions < MerbAuthSlicePassword::Application
   after :redirect_after_login,  :only => :update, :if => lambda{ !(300..399).include?(status) }
   after :redirect_after_logout, :only => :destroy
 
-  private   
+  private
   # @overwritable
   def redirect_after_login
     message[:notice] = "Authenticated Successfully"
     redirect_back_or "/", :message => message, :ignore => [slice_url(:login), slice_url(:logout)]
   end
-  
+
   # @overwritable
   def redirect_after_logout
     message[:notice] = "Logged Out"
     redirect "/", :message => message
   end
-  
+
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: merb-auth-slice-password
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -14,58 +15,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +00:00
+date: 2010-06-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-slices
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: merb-auth-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 1
+        version: 1.1.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: merb-auth-more
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 1
+        version: 1.1.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -116,23 +124,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Merb Slice that provides UI for password strategy of merb-auth.