reflex 0.0.2 → 0.0.3

data/README.rdoc

@@ -14,11 +14,6 @@ use it as a basis, if you get stuck.
 
 === 2. Install Reflex
 
-*WARNING!* Because the reflex gem is not yet available, the notes below are incorrect. For now, 
-simply install reflex as a rails plugin and _don't_ add it in your environment.rb or Gemfile:
-
-  $ script/plugin install git@github.com:i76/reflex.git
-
 Add the gem dependencies in your config:
 
 ==== Rails 2.3
@@ -42,7 +37,6 @@ Add the dependencies to your Gemfile
 And install them:
 
   $ bundle install
-  $ bundle lock
 
 === 3. Generate the reflex_connections migration
 
@@ -179,6 +173,8 @@ The reflex gem is far from finished. Here are some of the upcoming features:
    then it should be a matter of calling:
    `@user.twitter.update_status("I've connected my Twitter profile")`
 
+2. Better support for connecting a previously connected user
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -27,16 +27,40 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+begin
+  # Rspec 1.3.0
+  require 'spec/rake/spectask'
+
+  desc 'Default: run specs'
+  task :default => :spec
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_files = FileList["spec/**/*_spec.rb"]
+  end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+  Spec::Rake::SpecTask.new('rcov') do |t|
+    t.spec_files = FileList["spec/**/*_spec.rb"]
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec']
+  end
+  
+rescue LoadError
+  # Rspec 2.0
+  require 'rspec/core/rake_task'
+
+  desc 'Default: run specs'
+  task :default => :spec  
+  Rspec::Core::RakeTask.new do |t|
+    t.pattern = "spec/**/*_spec.rb"
+  end
+  
+  Rspec::Core::RakeTask.new('rcov') do |t|
+    t.pattern = "spec/**/*_spec.rb"
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec']
+  end
+
+rescue LoadError
+  puts "Rspec not available. Install it with: gem install rspec"  
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/reflex/authlogic/account.rb

@@ -10,11 +10,14 @@ module Reflex
         
         # Overwrite authlogic validation options so they are skipped when saving a react account:
         [:validates_uniqueness_of_login_field_options,
+         :validates_length_of_login_field_options,
+         :validates_format_of_login_field_options,
+         :validates_uniqueness_of_email_field_options,
+         :validates_length_of_email_field_options,
+         :validates_format_of_email_field_options,
          :validates_length_of_password_field_options,
          :validates_confirmation_of_password_field_options,
-         :validates_length_of_password_confirmation_field_options,
-         :validates_length_of_login_field_options,
-         :validates_format_of_login_field_options].each do |validate_options|
+         :validates_length_of_password_confirmation_field_options].each do |validate_options|
           current_options = base.send(validate_options)
           
           base.cattr_accessor "original_#{validate_options}"
@@ -42,11 +45,10 @@ module Reflex
           record = new()
           connection = record.reflex_connections.build(:provider => provider)
           
-          if react_profile
-            record.react_profile = react_profile if record.respond_to?(:react_profile=)
-          end
-          
+          record.react_profile     = react_profile                 if record.respond_to?(:react_profile=) 
+          record.persistence_token = ::Authlogic::Random.hex_token if record.respond_to?(:persistence_token=)
           record.save_without_session_maintenance
+
           [record, connection]
         end        
       end

data/lib/reflex/authlogic/authentication_process.rb

@@ -16,8 +16,9 @@ module Reflex
         reflex_controller.redirect_to(result['redirectUrl'])
       end
 
+        
       def react_provider
-       reflex_controller.params && reflex_controller.params['react_provider'] 
+        reflex_controller.params && reflex_controller.params['react_provider'] 
       end
 
       def react_oauth_session

data/lib/reflex/authlogic/callback_filter.rb

@@ -8,7 +8,7 @@ module Reflex
       def call(env)
         # if :react_callback_method is available in the session and the requested URL's query
         # contains ReactOAuthSession, change the REQUEST_METHOD to :react_callback_method
-        if env["rack.session"][:react_callback_method].present? && env["QUERY_STRING"] =~ /ReactOAuthSession/
+        if env["rack.session"][:react_callback_method].present? && env["QUERY_STRING"] =~ /ReactOAuthSession/   
           env["REQUEST_METHOD"] = env["rack.session"].delete(:react_callback_method).to_s.upcase
           
           if env["rack.session"][:react_callback_location].present?

data/lib/reflex/authlogic/connectable.rb

@@ -35,6 +35,10 @@ module Reflex
         end
 
         private
+        
+        def authenticating_via_oauth_server?
+          super
+        end        
       
         def connect_to_provider!
           if redirecting_to_oauth_server?

data/lib/reflex/authlogic/session.rb

@@ -25,6 +25,15 @@ module Reflex
 
         private
 
+        def react_provider
+          reflex_controller.params && reflex_controller.params['react_provider'] 
+        end
+        
+        # If we are already logged in, we are not going to authenticate again!
+        def authenticating_via_oauth_server?
+          attempted_record.nil? && errors.empty? && super
+        end
+
         def authenticate_oauth_session(allow_retry = true)
           # Request the React Session
           oauth_session  = Reflex::OAuthServer.token_access(reflex_controller.params)
@@ -46,10 +55,10 @@ module Reflex
           else
             # User is not yet known on React's side, so create it:
             react_profile = Reflex::OAuthServer.session_get_profile(react_oauth_session)
-      
+
             # Create a user record with a connection to this provider
             self.attempted_record, connection = klass.create_for_react(react_provider, react_profile) 
-      
+
             if !attempted_record.new_record?
               # Set the user id on react's side:
               Reflex::OAuthServer.token_set_user_id(connection.uuid, react_oauth_session)

data/lib/reflex/base.rb

@@ -3,7 +3,7 @@ require 'xmlrpc/client'
 # unfortunately react's oauth server has <nil />'s, which the ruby XMLRPC
 # library does not enable by default, because it is an XML-RPC extension:
 # http://ontosys.com/xml-rpc/extensions.php
-old_verbose, $VERBOSE = $VERBOSE, nil  
+old_verbose, $VERBOSE = $VERBOSE, nil
 begin
   XMLRPC::Config::ENABLE_NIL_PARSER = true
   XMLRPC::Config::ENABLE_NIL_CREATE = true

data/rails_generators/reflex_connection_migration/templates/create_reflex_connections.rb

@@ -8,7 +8,7 @@ class CreateReflexConnections < ActiveRecord::Migration
       t.timestamps
     end
     
-    add_index :reflex_connections, [:authorizable_type, :authorizable_id], :unique => false
+    add_index :reflex_connections, [:authorizable_type, :authorizable_id], :unique => false, :name => 'reflex_connection_authorizable'
   end
   
   def self.down

data/reflex.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reflex}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom-Eric Gerritsen"]
-  s.date = %q{2010-05-01}
+  s.date = %q{2010-05-03}
   s.description = %q{Reflex is a gem that allows you to connect your application to the React Social API}
   s.email = %q{tomeric@i76.nl}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tom-Eric Gerritsen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 +02:00
+date: 2010-05-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency