sorcery 0.6.1 → 0.7.1

data/lib/generators/sorcery_migration/templates/remember_me.rb

@@ -1,15 +0,0 @@
-class SorceryRememberMe < ActiveRecord::Migration
-  def self.up
-    add_column :users, :remember_me_token, :string, :default => nil
-    add_column :users, :remember_me_token_expires_at, :datetime, :default => nil
-    
-    add_index :users, :remember_me_token
-  end
-
-  def self.down
-    remove_index :users, :remember_me_token
-    
-    remove_column :users, :remember_me_token_expires_at
-    remove_column :users, :remember_me_token
-  end
-end

data/lib/generators/sorcery_migration/templates/reset_password.rb

@@ -1,13 +0,0 @@
-class SorceryResetPassword < ActiveRecord::Migration
-  def self.up
-    add_column :users, :reset_password_token, :string, :default => nil
-    add_column :users, :reset_password_token_expires_at, :datetime, :default => nil
-    add_column :users, :reset_password_email_sent_at, :datetime, :default => nil
-  end
-
-  def self.down
-    remove_column :users, :reset_password_email_sent_at
-    remove_column :users, :reset_password_token_expires_at
-    remove_column :users, :reset_password_token
-  end
-end

data/lib/generators/sorcery_migration/templates/user_activation.rb

@@ -1,17 +0,0 @@
-class SorceryUserActivation < ActiveRecord::Migration
-  def self.up
-    add_column :users, :activation_state, :string, :default => nil
-    add_column :users, :activation_token, :string, :default => nil
-    add_column :users, :activation_token_expires_at, :datetime, :default => nil
-    
-    add_index :users, :activation_token
-  end
-
-  def self.down
-    remove_index :users, :activation_token
-    
-    remove_column :users, :activation_token_expires_at
-    remove_column :users, :activation_token
-    remove_column :users, :activation_state
-  end
-end

data/lib/sorcery/controller/adapters/sinatra.rb

@@ -1,104 +0,0 @@
-module Sorcery
-  module Controller
-    module Adapters
-      # This module does the magic of translating Rails commands to Sinatra.
-      # This way the Rails code doesn't change, but it actually now calls Sinatra calls.
-      module Sinatra
-        def self.included(base)
-          base.class_eval do
-            class << self
-              # prepend a filter
-              def prepend_filter(type, path = nil, options = {}, &block)
-                return filters[type].unshift block unless path
-                path, options = //, path if path.respond_to?(:each_pair)
-                block, *arguments = compile!(type, path, block, options)
-                prepend_filter(type) do
-                  process_route(*arguments) { instance_eval(&block) }
-                end
-              end
-
-              def after_filter(filter)
-                after do
-                  send(filter)
-                end
-              end
-            end
-          end
-
-          ::Sinatra::Request.class_eval do
-            def authorization
-              env['HTTP_AUTHORIZATION'] ||
-                  env['X-HTTP_AUTHORIZATION'] ||
-                  env['X_HTTP_AUTHORIZATION'] ||
-                  env['REDIRECT_X_HTTP_AUTHORIZATION'] || nil
-            end
-          end
-
-          base.send(:include, SorceryHelpers)
-          base.send(:include, InstanceMethods)
-          base.extend(ClassMethods)
-        end
-
-        module SorceryHelpers
-
-          def request_http_basic_authentication(realm)
-            response.header['WWW-Authenticate'] = %(Basic realm="#{realm}")
-            response.status = 401
-          end
-
-          def authenticate_with_http_basic(&blk)
-            @auth ||= Rack::Auth::Basic::Request.new(request.env)
-            yield @auth.credentials if (@auth.provided? && @auth.basic? && @auth.credentials)
-          end
-
-        end
-
-        module InstanceMethods
-          def reset_session
-            session.clear
-          end
-
-          def redirect_to(*args)
-            args.pop if args.last.is_a?(Hash)
-            redirect(*args)
-          end
-
-          def root_path
-            '/'
-          end
-
-          ::Sinatra.helpers do
-            include SorceryHelpers
-          end
-
-          def cookies
-            @cookie_proxy ||= CookieProxy.new(request, response)
-          end
-        end
-
-        class CookieProxy
-          def initialize(request, response)
-            @request = request
-            @response = response
-          end
-
-          def [](key)
-            @request.cookies[key.to_s]
-          end
-
-          def []=(key, value)
-            @response.set_cookie(key, value)
-          end
-        end
-
-        module ClassMethods
-          def prepend_before_filter(filter)
-            prepend_filter(:before) do
-              send(filter)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sorcery/sinatra.rb

@@ -1,4 +0,0 @@
-if defined?(Sinatra::Base)
-  Sinatra::Base.send(:include, Sorcery::Controller::Adapters::Sinatra)
-  Sinatra::Base.send(:include, Sorcery::Controller)
-end

data/lib/sorcery/test_helpers/internal/sinatra.rb

@@ -1,74 +0,0 @@
-module Sorcery
-  module TestHelpers
-    module Internal
-      module Sinatra
-        include ::Sorcery::TestHelpers::Sinatra::CookieSessionMethods
-        include ::Sorcery::TestHelpers::Sinatra::InstanceMethods
-
-        class ::Sinatra::Application
-          class << self
-            attr_accessor :sorcery_vars
-          end
-          @sorcery_vars = {}
-
-          # NOTE: see before and after test filters in filters.rb
-
-          def save_instance_vars
-            instance_variables.each do |var|
-              self.class.sorcery_vars[:"#{var.to_s.delete("@")}"] = instance_variable_get(var)
-            end
-          end
-        end
-
-        ::RSpec::Matchers.define :redirect_to do |expected|
-          match do |actual|
-            actual.status == 302 && actual.location == expected
-          end
-        end
-
-        def clear_user_without_logout
-          get_sinatra_app(subject).instance_variable_set(:@current_user, nil)
-        end
-
-        def assigns
-          ::Sinatra::Application.sorcery_vars
-        end
-
-        def sorcery_reload!(submodules = [], options = {})
-          reload_user_class
-
-          # return to no-module configuration
-          ::Sorcery::Controller::Config.init!
-          ::Sorcery::Controller::Config.reset!
-
-          # clear all filters
-          ::Sinatra::Application.instance_variable_set(:@filters, {:before => [], :after => []})
-          load File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec', 'sinatra', 'filters.rb')
-          ::Sinatra::Application.send(:include, ::Filters)
-
-          # configure
-          ::Sorcery::Controller::Config.submodules = submodules
-          ::Sorcery::Controller::Config.user_class = nil
-          ::Sinatra::Application.send(:include, Sorcery::Controller::Adapters::Sinatra)
-          ::Sinatra::Application.send(:include, Sorcery::Controller)
-          ::Sorcery::Controller::Config.user_class = "User"
-
-          ::Sorcery::Controller::Config.user_config do |user|
-            options.each do |property, value|
-              user.send(:"#{property}=", value)
-            end
-          end
-          User.authenticates_with_sorcery!
-        end
-
-        def sorcery_controller_property_set(property, value)
-          ::Sorcery::Controller::Config.send(:"#{property}=", value)
-        end
-
-        def sorcery_controller_external_property_set(provider, property, value)
-          ::Sorcery::Controller::Config.send(provider).send(:"#{property}=", value)
-        end
-      end
-    end
-  end
-end

data/lib/sorcery/test_helpers/internal/sinatra_modular.rb

@@ -1,74 +0,0 @@
-module Sorcery
-  module TestHelpers
-    module Internal
-      module SinatraModular
-        include ::Sorcery::TestHelpers::Sinatra::CookieSessionMethods
-        include ::Sorcery::TestHelpers::Sinatra::InstanceMethods
-
-        class ::Modular
-          class << self
-            attr_accessor :sorcery_vars
-          end
-          @sorcery_vars = {}
-
-          # NOTE: see before and after test filters in filters.rb
-
-          def save_instance_vars
-            instance_variables.each do |var|
-              self.class.sorcery_vars[:"#{var.to_s.delete("@")}"] = instance_variable_get(var)
-            end
-          end
-        end
-
-        ::RSpec::Matchers.define :redirect_to do |expected|
-          match do |actual|
-            actual.status == 302 && actual.location == expected
-          end
-        end
-
-        def clear_user_without_logout
-          get_sinatra_app(subject).instance_variable_set(:@current_user, nil)
-        end
-
-        def assigns
-          ::Modular.sorcery_vars
-        end
-
-        def sorcery_reload!(submodules = [], options = {})
-          reload_user_class
-
-          # return to no-module configuration
-          ::Sorcery::Controller::Config.init!
-          ::Sorcery::Controller::Config.reset!
-
-          # clear all filters
-          ::Sinatra::Base.instance_variable_set(:@filters, {:before => [], :after => []})
-          require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec', 'sinatra', 'filters')
-          ::Sinatra::Base.send(:include, ::Filters)
-
-          # configure
-          ::Sorcery::Controller::Config.submodules = submodules
-          ::Sorcery::Controller::Config.user_class = nil
-          ::Sinatra::Base.send(:include, Sorcery::Controller::Adapters::Sinatra)
-          ::Sinatra::Base.send(:include, Sorcery::Controller)
-          ::Sorcery::Controller::Config.user_class = "User"
-
-          ::Sorcery::Controller::Config.user_config do |user|
-            options.each do |property, value|
-              user.send(:"#{property}=", value)
-            end
-          end
-          User.authenticates_with_sorcery!
-        end
-
-        def sorcery_controller_property_set(property, value)
-          ::Sorcery::Controller::Config.send(:"#{property}=", value)
-        end
-
-        def sorcery_controller_external_property_set(provider, property, value)
-          ::Sorcery::Controller::Config.send(provider).send(:"#{property}=", value)
-        end
-      end
-    end
-  end
-end

data/lib/sorcery/test_helpers/sinatra.rb

@@ -1,88 +0,0 @@
-module Sorcery
-  module TestHelpers
-    module Sinatra
-      def self.included(base)
-        base.send(:include, InstanceMethods)
-        base.send(:include, CookieSessionMethods)
-        ::Sinatra::Base.class_eval do
-          class << self
-            attr_accessor :rack_test_session
-          end
-
-          def self.inherited(subclass)
-            super
-            subclass.class_eval do
-              class << self
-                attr_accessor :rack_test_session
-              end
-            end
-          end
-
-          include CookieSessionMethods
-
-          def rack_test_session
-            self.class.rack_test_session
-          end
-        end
-      end
-
-      module InstanceMethods
-        def get_sinatra_app(app)
-          while !app.kind_of? ::Sinatra::Base do
-            app = app.instance_variable_get(:@app)
-          end
-          app
-        end
-
-        def login_user(user=nil)
-          user ||= @user
-          get_sinatra_app(app).send(:login_user, user)
-          get_sinatra_app(app).send(:after_login!, user, [user.send(user.sorcery_config.username_attribute_name), 'secret'])
-        end
-
-        def logout_user
-          get_sinatra_app(app).send(:logout)
-        end
-      end
-
-      module CookieSessionMethods
-        class SessionData
-          def initialize(cookies)
-            @cookies = cookies
-            @data = cookies['rack.session']
-            if @data
-              @data = @data.unpack("m*").first
-              @data = Marshal.load(@data)
-            else
-              @data = {}
-            end
-          end
-
-          def [](key)
-            @data[key]
-          end
-
-          def []=(key, value)
-            @data[key] = value
-            session_data = Marshal.dump(@data)
-            session_data = [session_data].pack("m*")
-            @cookies.merge("rack.session=#{Rack::Utils.escape(session_data)}", URI.parse("//example.org//"))
-            raise "session variable not set" unless @cookies['rack.session'] == session_data
-          end
-
-          def clear
-            @data = {}
-          end
-        end
-
-        def session
-          SessionData.new(cookies)
-        end
-
-        def cookies
-          rack_test_session.instance_variable_get(:@rack_mock_session).cookie_jar
-        end
-      end
-    end
-  end
-end

data/spec/rails3/Rakefile.unused

@@ -1,7 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-require 'rake'
-
-AppRoot::Application.load_tasks

data/spec/rails3/public/index.html

@@ -1,239 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Ruby on Rails: Welcome aboard</title>
-    <style type="text/css" media="screen">
-      body {
-        margin: 0;
-        margin-bottom: 25px;
-        padding: 0;
-        background-color: #f0f0f0;
-        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
-        font-size: 13px;
-        color: #333;
-      }
-
-      h1 {
-        font-size: 28px;
-        color: #000;
-      }
-
-      a  {color: #03c}
-      a:hover {
-        background-color: #03c;
-        color: white;
-        text-decoration: none;
-      }
-
-
-      #page {
-        background-color: #f0f0f0;
-        width: 750px;
-        margin: 0;
-        margin-left: auto;
-        margin-right: auto;
-      }
-
-      #content {
-        float: left;
-        background-color: white;
-        border: 3px solid #aaa;
-        border-top: none;
-        padding: 25px;
-        width: 500px;
-      }
-
-      #sidebar {
-        float: right;
-        width: 175px;
-      }
-
-      #footer {
-        clear: both;
-      }
-
-
-      #header, #about, #getting-started {
-        padding-left: 75px;
-        padding-right: 30px;
-      }
-
-
-      #header {
-        background-image: url("images/rails.png");
-        background-repeat: no-repeat;
-        background-position: top left;
-        height: 64px;
-      }
-      #header h1, #header h2 {margin: 0}
-      #header h2 {
-        color: #888;
-        font-weight: normal;
-        font-size: 16px;
-      }
-
-
-      #about h3 {
-        margin: 0;
-        margin-bottom: 10px;
-        font-size: 14px;
-      }
-
-      #about-content {
-        background-color: #ffd;
-        border: 1px solid #fc0;
-        margin-left: -55px;
-        margin-right: -10px;
-      }
-      #about-content table {
-        margin-top: 10px;
-        margin-bottom: 10px;
-        font-size: 11px;
-        border-collapse: collapse;
-      }
-      #about-content td {
-        padding: 10px;
-        padding-top: 3px;
-        padding-bottom: 3px;
-      }
-      #about-content td.name  {color: #555}
-      #about-content td.value {color: #000}
-
-      #about-content ul {
-        padding: 0;
-        list-style-type: none;
-      }
-
-      #about-content.failure {
-        background-color: #fcc;
-        border: 1px solid #f00;
-      }
-      #about-content.failure p {
-        margin: 0;
-        padding: 10px;
-      }
-
-
-      #getting-started {
-        border-top: 1px solid #ccc;
-        margin-top: 25px;
-        padding-top: 15px;
-      }
-      #getting-started h1 {
-        margin: 0;
-        font-size: 20px;
-      }
-      #getting-started h2 {
-        margin: 0;
-        font-size: 14px;
-        font-weight: normal;
-        color: #333;
-        margin-bottom: 25px;
-      }
-      #getting-started ol {
-        margin-left: 0;
-        padding-left: 0;
-      }
-      #getting-started li {
-        font-size: 18px;
-        color: #888;
-        margin-bottom: 25px;
-      }
-      #getting-started li h2 {
-        margin: 0;
-        font-weight: normal;
-        font-size: 18px;
-        color: #333;
-      }
-      #getting-started li p {
-        color: #555;
-        font-size: 13px;
-      }
-
-
-      #sidebar ul {
-        margin-left: 0;
-        padding-left: 0;
-      }
-      #sidebar ul h3 {
-        margin-top: 25px;
-        font-size: 16px;
-        padding-bottom: 10px;
-        border-bottom: 1px solid #ccc;
-      }
-      #sidebar li {
-        list-style-type: none;
-      }
-      #sidebar ul.links li {
-        margin-bottom: 5px;
-      }
-
-    </style>
-    <script type="text/javascript">
-      function about() {
-        info = document.getElementById('about-content');
-        if (window.XMLHttpRequest)
-          { xhr = new XMLHttpRequest(); }
-        else
-          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
-        xhr.open("GET","rails/info/properties",false);
-        xhr.send("");
-        info.innerHTML = xhr.responseText;
-        info.style.display = 'block'
-      }
-    </script>
-  </head>
-  <body>
-    <div id="page">
-      <div id="sidebar">
-        <ul id="sidebar-items">
-          <li>
-            <h3>Browse the documentation</h3>
-            <ul class="links">
-              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
-              <li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
-              <li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
-              <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-
-      <div id="content">
-        <div id="header">
-          <h1>Welcome aboard</h1>
-          <h2>You&rsquo;re riding Ruby on Rails!</h2>
-        </div>
-
-        <div id="about">
-          <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
-          <div id="about-content" style="display: none"></div>
-        </div>
-
-        <div id="getting-started">
-          <h1>Getting started</h1>
-          <h2>Here&rsquo;s how to get rolling:</h2>
-
-          <ol>
-            <li>
-              <h2>Use <code>rails generate</code> to create your models and controllers</h2>
-              <p>To see all available options, run it without parameters.</p>
-            </li>
-
-            <li>
-              <h2>Set up a default route and remove or rename this file</h2>
-              <p>Routes are set up in config/routes.rb.</p>
-            </li>
-
-            <li>
-              <h2>Create your database</h2>
-              <p>Run <code>rake db:migrate</code> to create your database. If you're not using SQLite (the default), edit <code>config/database.yml</code> with your username and password.</p>
-            </li>
-          </ol>
-        </div>
-      </div>
-
-      <div id="footer">&nbsp;</div>
-    </div>
-  </body>
-</html>

data/spec/sinatra/Gemfile

@@ -1,15 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'sinatra', '>= 1.2.0'
-gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'activerecord', '>= 3.0.3'
-gem 'actionmailer', '>= 3.0.3'
-gem "sorcery", '>= 0.1.0', :path => '../../'
-
-group :development, :test do
-  gem "rake"
-  gem "rspec", "~> 2.5.0"
-  gem 'ruby-debug19'
-  gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
-  gem 'timecop'
-end