cadenero 0.0.2.a → 0.0.2.a1

data/spec/features/users/sign_in_spec.rb

@@ -6,8 +6,8 @@ feature 'User sign in' do
     @user ||= { email: "user@example.com", password: "password", password_confirmation: "password" }
   end
 
-  def sign_in_account_user(user)
-    @user = { email: user.email, password: "password", password_confirmation: "password" }
+  def account_user(user)
+    @user = { email: user.email, password: "password" }
   end
 
   def find_account_by_email
@@ -16,30 +16,49 @@ feature 'User sign in' do
   end
 
   def sign_in_user(url, user)
-    post "#{url}", user: user
+    post "#{url}", format: :json, user: user
     find_account_by_email
   end
 
   let(:account) { FactoryGirl.create(:account_with_schema) }
-  let(:errors_redirect_ro_sign_in) {{errors: "Please sign in. posting the user json credentials to /v1/sign_in", links: "/v1/sign_in"}.to_json}
+  let(:errors_redirect_ro_sign_in) {{errors: %Q{Please sign in. posting the user json credentials as: {"user": {"email": "testy2@example.com", "password": "changeme"}} to /v1/sessions}, links: "/v1/sessions"}.to_json}
   let(:errors_invalid_email_or_password)  {{ errors: {user:["Invalid email or password"]} }.to_json} 
-  let(:sign_in_url) { "http://#{account.subdomain}.example.com/v1/sign_in" }
+  let(:sessions_url) { "http://#{account.subdomain}.example.com/v1/sessions" }
   let(:root_url) { "http://#{account.subdomain}.example.com/v1" }
 
   within_account_subdomain do
     scenario "signs in as an account owner successfully" do
-      get root_url
+      get cadenero.v1_root_url(:subdomain => account.subdomain)
       expect(last_response.body).to eql(errors_redirect_ro_sign_in)
-      sign_in_user sign_in_url, sign_in_account_user(account.owner)
+      expect(last_response.status).to eq 422
+      sign_in_user sessions_url, account_user(account.owner)
+      expect(last_response.status).to eq 201
+      expect(JSON.parse(last_response.body)["user"]["account_ids"]).to eq [account.id]
+      user_email = JSON.parse(last_response.body)["user"]["email"]
+      get root_url
+      expect(JSON.parse(last_response.body)["message"]).to have_content user_email
+    end
+  end
+
+  within_account_subdomain do
+    scenario "signout as an account owner successfully" do
+      sign_in_user sessions_url, account_user(account.owner)
       expect(last_response.status).to eq 201
       expect(JSON.parse(last_response.body)["user"]["account_ids"]).to eq [account.id]
+      user_email = JSON.parse(last_response.body)["user"]["email"]
+      delete sessions_url, id: account.owner.id
+      expect(last_response.status).to eq 201
+      expect(JSON.parse(last_response.body)["message"]).to have_content "Successful logout"
+      get cadenero.v1_root_url(:subdomain => account.subdomain)
+      expect(last_response.body).to eql(errors_redirect_ro_sign_in)
+      expect(last_response.status).to eq 422
     end
   end
 
   it "attempts sign in with an invalid password and fails" do
     get cadenero.v1_root_url(:subdomain => account.subdomain)
     expect(last_response.body).to eql(errors_redirect_ro_sign_in)
-    sign_in_user sign_in_url, { email: "user@example.com", password: "", password_confirmation: "" }
+    sign_in_user sessions_url, { email: "user@example.com", password: "", password_confirmation: "" }
     expect(last_response.status).to eq 422
     expect(last_response.body).to eql(errors_invalid_email_or_password)
   end
@@ -47,7 +66,7 @@ feature 'User sign in' do
   it "attempts sign in with an invalid email address and fails" do
     get cadenero.v1_root_url(:subdomain => account.subdomain)
     expect(last_response.body).to eql(errors_redirect_ro_sign_in)
-    sign_in_user sign_in_url, { email: "foo@example.com", password: "password", password_confirmation: "password" }
+    sign_in_user sessions_url, { email: "foo@example.com", password: "password", password_confirmation: "password" }
     expect(last_response.status).to eq 422
     expect(last_response.body).to eql(errors_invalid_email_or_password)
   end
@@ -56,7 +75,7 @@ feature 'User sign in' do
     other_account = FactoryGirl.create(:account)
     get cadenero.v1_root_url(:subdomain => account.subdomain)
     expect(last_response.body).to eql(errors_redirect_ro_sign_in)
-    sign_in_user sign_in_url, { email: other_account.owner.email, password: "", password_confirmation: "" }
+    sign_in_user sessions_url, { email: other_account.owner.email, password: "", password_confirmation: "" }
     expect(last_response.status).to eq 422
     expect(last_response.body).to eql(errors_invalid_email_or_password)
   end  

data/spec/features/users/sign_up_spec.rb

@@ -10,7 +10,7 @@ end
 
 def sign_up_user(url)
   create_account_user
-  post "#{url}/v1/sign_up", user: @user
+  post "#{url}/v1/users", user: @user
   find_account_by_email
 end
 
@@ -21,6 +21,6 @@ feature "User signup" do
     sign_up_user root_url
     expect(last_response.status).to eq 201
     expect(JSON.parse(last_response.body)["user"]["account_ids"]).to eq [account.id]
-    expect(last_request.url).to eq "#{root_url}v1/sign_up"
+    expect(last_request.url).to eq "#{root_url}v1/users"
   end
 end

data/spec/generators/install_generator_spec.rb

@@ -16,30 +16,7 @@ describe Cadenero::Generators::InstallGenerator do
     Dir["#{Rails.root}/db/migrate/*.rb"].sort
   end
 
-  it "copies over the migrations" do
-    migrations.should be_empty
-    capture(:stdout) do
-      described_class.start(["--user-class=User", "--no-migrate", "--current-user-helper=current_user"], :destination => Rails.root)
-    end
-
-    # Ensure cadenero migrations have been copied over
-    migrations.should_not be_empty
-
-    # Ensure initializer has been created
-    #cadenero_initializer = File.readlines("#{Rails.root}/config/initializers/cadenero.rb")
-    #cadenero_initializer[0].strip.should == %q{Cadenero.user_class = "User"}
-
-    # Ensure cadenero_user is added to ApplicationController
-    application_controller = File.read("#{Rails.root}/app/controllers/application_controller.rb")
-    expected_cadenero_user_method = %Q{
-  def cadenero_user
-    current_user
-  end
-  helper_method :cadenero_user
-
-}
-    application_controller.should include(expected_cadenero_user_method)
-  end
+  
 
   it "seeds the database" do
     Cadenero::V1::Account.count.should == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cadenero
 version: !ruby/object:Gem::Version
-  version: 0.0.2.a
+  version: 0.0.2.a1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-api
@@ -235,9 +235,9 @@ files:
 - app/assets/stylesheets/cadenero/v1/users.css
 - app/controllers/cadenero/application_controller.rb
 - app/controllers/cadenero/v1/account/dashboard_controller.rb
+- app/controllers/cadenero/v1/account/sessions_controller.rb
 - app/controllers/cadenero/v1/account/users_controller.rb
 - app/controllers/cadenero/v1/accounts_controller.rb
-- app/controllers/cadenero/v1/sessions_controller.rb
 - app/extenders/controllers/application_controller_decorator.rb
 - app/helpers/cadenero/application_helper.rb
 - app/helpers/cadenero/v1/accounts_helper.rb
@@ -282,6 +282,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/db/seeds.rb
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
@@ -292,8 +293,14 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/dummy/spec/spec_helper.rb
+- spec/dummy/tmp/cache/assets/D0B/E90/sprockets%2F2c56f5dc65ded8014ad1226c5c985124
+- spec/dummy/tmp/cache/assets/D86/490/sprockets%2Faaf0d4667cf7ef62869d70539bc77af7
+- spec/dummy/tmp/cache/assets/DA6/CC0/sprockets%2F1c575d7a7db598dfcf41536ccc83f01e
+- spec/dummy/tmp/cache/assets/DB6/250/sprockets%2F0f882b7b9528900cfec89e8b2fffcc38
+- spec/dummy/tmp/cache/assets/E18/9D0/sprockets%2F1f79e8f926ea465ded9dcc552cd56bff
 - spec/dummy/tmp/ember-rails/ember-data.js
 - spec/dummy/tmp/ember-rails/ember.js
+- spec/dummy/tmp/restart.txt
 - spec/features/accounts/sign_up_spec.rb
 - spec/features/cadenero/account_spec.rb
 - spec/features/users/sign_in_spec.rb
@@ -348,6 +355,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/db/seeds.rb
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
@@ -358,8 +366,14 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/dummy/spec/spec_helper.rb
+- spec/dummy/tmp/cache/assets/D0B/E90/sprockets%2F2c56f5dc65ded8014ad1226c5c985124
+- spec/dummy/tmp/cache/assets/D86/490/sprockets%2Faaf0d4667cf7ef62869d70539bc77af7
+- spec/dummy/tmp/cache/assets/DA6/CC0/sprockets%2F1c575d7a7db598dfcf41536ccc83f01e
+- spec/dummy/tmp/cache/assets/DB6/250/sprockets%2F0f882b7b9528900cfec89e8b2fffcc38
+- spec/dummy/tmp/cache/assets/E18/9D0/sprockets%2F1f79e8f926ea465ded9dcc552cd56bff
 - spec/dummy/tmp/ember-rails/ember-data.js
 - spec/dummy/tmp/ember-rails/ember.js
+- spec/dummy/tmp/restart.txt
 - spec/features/accounts/sign_up_spec.rb
 - spec/features/cadenero/account_spec.rb
 - spec/features/users/sign_in_spec.rb

data/app/controllers/cadenero/v1/sessions_controller.rb

@@ -1,13 +0,0 @@
-require_dependency "cadenero/application_controller"
-
-module Cadenero::V1
-  class Account::SessionsController < Cadenero::ApplicationController
-    def create
-      if env['warden'].authenticate(:scope => :user)
-        render json: current_user, status: 201
-      else
-        render json: {errors: {user:["Invalid email or password"]}}, status: 422
-      end
-    end
-  end
-end