From 00b7b36516d1d07300870029ad5190f06122a493 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 10 Oct 2012 19:56:35 +0200 Subject: first steps at reducing core --- users/Gemfile | 13 ++++--------- users/leap_web_users.gemspec | 8 +------- users/lib/leap_web_users.rb | 2 ++ users/lib/leap_web_users/engine.rb | 4 +--- users/lib/leap_web_users/version.rb | 3 --- 5 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 users/lib/leap_web_users/version.rb (limited to 'users') diff --git a/users/Gemfile b/users/Gemfile index 5e6ebd6..81b0ae8 100644 --- a/users/Gemfile +++ b/users/Gemfile @@ -1,17 +1,12 @@ source "http://rubygems.org" +eval(File.read(File.dirname(__FILE__) + '/../common_dependencies.rb')) +eval(File.read(File.dirname(__FILE__) + '/../ui_dependencies.rb')) + # Declare your gem's dependencies in leap_web_users.gemspec. # Bundler will treat runtime dependencies like base dependencies, and # development dependencies will be added by default to the :development group. gemspec -# jquery-rails is used by the dummy application -gem "jquery-rails" - -# Declare any dependencies that are still in development here instead of in -# your gemspec. These might include edge Rails or gems from your path or -# Git. Remember to move these dependencies to your gemspec before releasing -# your gem to rubygems.org. - # To use debugger -gem 'ruby-debug' +# gem 'ruby-debug' diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec index 94c32ff..f64a76a 100644 --- a/users/leap_web_users.gemspec +++ b/users/leap_web_users.gemspec @@ -1,6 +1,5 @@ $:.push File.expand_path("../lib", __FILE__) -require "leap_web_core/dependencies" require File.expand_path('../../lib/leap_web/version.rb', __FILE__) # Describe your gem and declare its dependencies: @@ -16,12 +15,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"] s.test_files = Dir["test/**/*"] - s.add_dependency "rails", "~> 3.2.8" s.add_dependency "leap_web_core", LeapWeb::VERSION - s.add_dependency "ruby-srp", "~> 0.1.1" - - LeapWebCore::Dependencies.add_ui_gems_to_spec(s) - - s.add_development_dependency "mocha" + s.add_dependency "ruby-srp", "~> 0.1.1" end diff --git a/users/lib/leap_web_users.rb b/users/lib/leap_web_users.rb index e1b7b1f..1ea1c40 100644 --- a/users/lib/leap_web_users.rb +++ b/users/lib/leap_web_users.rb @@ -1,3 +1,5 @@ +require "leap_web_core" +require "leap_web_core/ui_dependencies" require "leap_web_users/engine" module LeapWebUsers diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb index b6ab60e..734564b 100644 --- a/users/lib/leap_web_users/engine.rb +++ b/users/lib/leap_web_users/engine.rb @@ -1,8 +1,6 @@ # thou shall require all your dependencies in an engine. require "ruby-srp" -require "leap_web_core" -LeapWebCore::Dependencies.require_ui_gems - +require "haml-rails" module LeapWebUsers class Engine < ::Rails::Engine diff --git a/users/lib/leap_web_users/version.rb b/users/lib/leap_web_users/version.rb deleted file mode 100644 index 14e54c1..0000000 --- a/users/lib/leap_web_users/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module LeapWebUsers - VERSION = "0.0.1" -end -- cgit v1.2.3 From add8d015c87a00626b739080bd75c7e7aeb9c1df Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 11 Oct 2012 10:22:34 +0200 Subject: moved core dependency into */Gemfile with :path In order to get the rails generators and the like to work properly in engines we need to require all the dependencies in the engine.rb file. Since I want to keep that list of engines in a centralized place we still need core and we need to require it from the other engines. We don't want to require the core gem to be installed so I added it with :path option to the Gemfile. --- users/Gemfile | 3 +++ users/lib/leap_web_users.rb | 2 -- users/lib/leap_web_users/engine.rb | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'users') diff --git a/users/Gemfile b/users/Gemfile index 81b0ae8..e30033a 100644 --- a/users/Gemfile +++ b/users/Gemfile @@ -3,6 +3,9 @@ source "http://rubygems.org" eval(File.read(File.dirname(__FILE__) + '/../common_dependencies.rb')) eval(File.read(File.dirname(__FILE__) + '/../ui_dependencies.rb')) +# We require leap_web_core from here so we can use the path option. +gem "leap_web_core", :path => '../core' + # Declare your gem's dependencies in leap_web_users.gemspec. # Bundler will treat runtime dependencies like base dependencies, and # development dependencies will be added by default to the :development group. diff --git a/users/lib/leap_web_users.rb b/users/lib/leap_web_users.rb index 1ea1c40..e1b7b1f 100644 --- a/users/lib/leap_web_users.rb +++ b/users/lib/leap_web_users.rb @@ -1,5 +1,3 @@ -require "leap_web_core" -require "leap_web_core/ui_dependencies" require "leap_web_users/engine" module LeapWebUsers diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb index 734564b..9b7545e 100644 --- a/users/lib/leap_web_users/engine.rb +++ b/users/lib/leap_web_users/engine.rb @@ -1,6 +1,7 @@ # thou shall require all your dependencies in an engine. +require "leap_web_core" +require "leap_web_core/ui_dependencies" require "ruby-srp" -require "haml-rails" module LeapWebUsers class Engine < ::Rails::Engine -- cgit v1.2.3 From 3b4703b6669bb712fd078080d6f3b83af089b19e Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 11 Oct 2012 11:09:36 +0200 Subject: fixed account_flow_test - srp.authenticate now takes a single arg --- users/test/integration/api/account_flow_test.rb | 27 ++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'users') diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb index e20bcf6..66de1e5 100644 --- a/users/test/integration/api/account_flow_test.rb +++ b/users/test/integration/api/account_flow_test.rb @@ -30,40 +30,39 @@ class AccountFlowTest < ActionDispatch::IntegrationTest :password_verifier => @srp.verifier.to_s(16), :password_salt => @srp.salt.to_s(16) } + post '/users.json', :user => @user_params + @user = User.find_by_param(@login) end def teardown @user.destroy if @user # make sure we can run this test again end - test "signup and login with srp via api" do - post '/users.json', :user => @user_params - @user = User.find_by_param(@login) + test "signup response" do assert_json_response @user_params.slice(:login, :password_salt) assert_response :success - server_auth = @srp.authenticate(self, @login, @password) + end + + test "signup and login with srp via api" do + server_auth = @srp.authenticate(self) assert_nil server_auth["errors"] assert server_auth["M2"] end test "signup and wrong password login attempt" do - post '/users.json', :user => @user_params - @user = User.find_by_param(@login) - assert_json_response @user_params.slice(:login, :password_salt) - assert_response :success - server_auth = @srp.authenticate(self, @login, "wrong password") + srp = SRP::Client.new(@login, "wrong password") + server_auth = srp.authenticate(self) assert_equal ["wrong password"], server_auth["errors"]['password'] assert_nil server_auth["M2"] end test "signup and wrong username login attempt" do - post '/users.json', :user => @user_params - @user = User.find_by_param(@login) - assert_json_response @user_params.slice(:login, :password_salt) - assert_response :success + srp = SRP::Client.new("wrong_login", @password) + server_auth = nil assert_raises RECORD_NOT_FOUND do - server_auth = @srp.authenticate(self, "wronglogin", @password) + server_auth = srp.authenticate(self) end + assert_nil server_auth end end -- cgit v1.2.3 From 9416bd9b8829f57fa54d50e8b3f53f614a1b29b5 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 11 Oct 2012 11:30:02 +0200 Subject: adjusted sessions controller test to new srp api handshake.to_json now returns what we want. --- users/test/functional/sessions_controller_test.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'users') diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb index 7876d84..b6e56a7 100644 --- a/users/test/functional/sessions_controller_test.rb +++ b/users/test/functional/sessions_controller_test.rb @@ -8,7 +8,9 @@ class SessionsControllerTest < ActionController::TestCase @server_hex = 'b123' @server_rnd = @server_hex.hex @server_rnd_exp = 'e123'.hex + @salt = 'stub user salt' @server_handshake = stub :aa => @client_rnd, :bb => @server_rnd, :b => @server_rnd_exp + @server_auth = 'adfe' end test "should get login screen" do @@ -21,11 +23,13 @@ class SessionsControllerTest < ActionController::TestCase user.expects(:initialize_auth). with(@client_rnd). returns(@server_handshake) + @server_handshake.expects(:to_json). + returns({'B' => @server_hex, 'salt' => @salt}.to_json) User.expects(:find_by_param).with(user.login).returns(user) post :create, :login => user.login, 'A' => @client_hex assert_equal @server_handshake, session[:handshake] assert_response :success - assert_json_response :B => @server_hex + assert_json_response :B => @server_hex, :salt => @salt end test "should report user not found" do @@ -39,9 +43,11 @@ class SessionsControllerTest < ActionController::TestCase test "should authorize" do session[:handshake] = @server_handshake user = stub :login => "me", :id => 123 - user.expects(:authenticate!). - with(@client_rnd, @server_handshake). + @server_handshake.expects(:authenticate!). + with(@client_rnd). returns(@server_auth) + @server_handshake.expects(:to_json). + returns({:M2 => @server_auth}.to_json) User.expects(:find_by_param).with(user.login).returns(user) post :update, :id => user.login, :client_auth => @client_hex assert_nil session[:handshake] @@ -52,8 +58,8 @@ class SessionsControllerTest < ActionController::TestCase test "should report wrong password" do session[:handshake] = @server_handshake user = stub :login => "me", :id => 123 - user.expects(:authenticate!). - with(@client_rnd, @server_handshake). + @server_handshake.expects(:authenticate!). + with(@client_rnd). raises(WRONG_PASSWORD) User.expects(:find_by_param).with(user.login).returns(user) post :update, :id => user.login, :client_auth => @client_hex -- cgit v1.2.3