goma 0.0.1.rc2 → 0.0.1.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d6099fa064157ae214f3a611bc179f97732ea87
-  data.tar.gz: 5e9b12ea1433741c58da4a6b9abe08e7c4b320d9
+  metadata.gz: 398a6fc63442ad680bca1a497b146163cd7d9403
+  data.tar.gz: f55f88ac4e630605297ce4f054453ee7a3677adc
 SHA512:
-  metadata.gz: 73a52d5b437db21c532f16b6179cc3a163ebac83ae496657337b24b58351e0985b7cab88d49663d0450c1bd443093e3f7542a52423340b20fb85957dd21b1425
-  data.tar.gz: 0d62cf55a2bc7df0c209722eb3ae7e3347ea5b82b7ee549fd25dba5d16841a8d56480a8925fe84b921760352b76944cce87d0afaf50028d7eee7ea9d45631713
+  metadata.gz: eca7341609661f75c09dce50bf54a854b55a0f8d56a1fb8bbd4edf30bbe5c72fca1a098544afdb42ce6b025b41accc4d3f084f809f9d234f352ed5b4a8c5e3d5
+  data.tar.gz: 70c6036f1ba70bde98f26887287f79664d66b712f91bb1fbcb84c49fcd3172f83fa06c65cccbfce16b33a73dd704bebda255a246d86203ee9d164bc94640b475

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    goma (0.0.1.rc2)
+    goma (0.0.1.rc3)
       rails (~> 4.0)
       warden
 

data/Rakefile

@@ -25,23 +25,28 @@ require 'single_test/tasks'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = 'test/{models,controllers,integration}/*_test.rb'
   t.verbose = false
 end
 
 desc "Rebuild test app's resources"
 task "rebuild_test_app" do
-  migration = 'migrate' == ARGV.last ? '' : ' --no-migration'
+  migration = (ENV['MIGRATE'] || ENV['MIGRATION']) ? '' : ' --no-migration'
+  quiet     = ENV['VERVOSE'] ? '' : ' --quiet'
   cd "test/rails_app"
-  sh "bundle exec rails d goma:scaffold User#{migration}"
-  sh "bundle exec rails g goma:scaffold User#{migration}"
+  sh "bundle exec rails d goma:scaffold User#{migration}#{quiet}"
+  sh "bundle exec rails g goma:scaffold User#{migration}#{quiet}"
   if migration.empty?
     sh "RAILS_ENV=test bundle exec rake db:drop"
     sh "RAILS_ENV=test bundle exec rake db:create"
     sh "RAILS_ENV=test bundle exec rake db:migrate"
   end
-  sh "rm -rf test/*"
-  cd "../.."
+end
+
+desc "Run test in test app"
+task "in_app_test" do
+  cd "test/rails_app"
+  sh "bundle exec rake test"
 end
 
 desc "Run tests for all environment variables"

data/lib/generators/goma/helpers/helpers.rb

@@ -59,9 +59,42 @@ module Goma
         false
       end
 
+      def login_path
+        longer_name? ? "new_#{resource_name}_session_path" : "new_session_path"
+      end
+
       def login_url
         longer_name? ? "new_#{resource_name}_session_url" : "new_session_url"
       end
+
+      def expire(within)
+        within.inspect.gsub(/^(\d+)\s*(\w*)$/) { "#{$1.to_i + 1}.#{$2}" }
+      end
+
+      def a_resource
+        "#{resource_name.to_s.pluralize}(:#{resource_name})"
+      end
+
+      def new_resource_attributes
+        h = {}
+        i = counter
+        goma_config.authentication_keys.map do |key|
+          if key == goma_config.email_attribute_name
+            h[key] = "#{goma_scope}#{i}@example.com"
+          else
+            h[key] = "#{key}#{i}"
+          end
+        end
+        [goma_config.password_attribute_name, goma_config.password_confirmation_attribute_name].map do |key|
+          h[key] = 'password'
+        end
+        h
+      end
+
+      def counter
+        @counter ||= 0
+        @counter += 1
+      end
     end
   end
 end
@@ -71,3 +104,9 @@ class Array
     self.to_sentence(words_connector: '_', two_words_connector: '_or_', last_word_connector: '_or_')
   end
 end
+
+class Hash
+  def inspect19
+    '{ ' + map { |k, v| "#{k}: \"#{v}\"" }.join(', ') + ' }'
+  end
+end

data/lib/generators/goma/install/templates/goma.rb

@@ -35,7 +35,7 @@ Goma.configure do |config|
   # config.activation_mailer_name = nil
   # config.email_confirmation_mailer_name = nil
   # config.confirmation_keys = [ :email ]
-  # config.allow_unconfirmed_access_for = 0
+  # config.allow_unactivated_access_for = 0
   # config.activate_within = 3.days
   # config.activation_needed_email_method_name = :activation_needed_email
   # config.activation_success_email_method_name = :activation_success_email
@@ -78,7 +78,6 @@ Goma.configure do |config|
   # config.unlock_in = 1.hour
   # config.last_attempt_warning = false # TODO not yet implemented
   # config.unlock_token_attribute_name = :unlock_token
-  # config.unlock_token_sent_at_attribute_name = :unlock_token_sent_at
   # config.unlock_token_to_send_attribute_name = :raw_unlock_token
 
   ####################################################

data/lib/generators/goma/mailer/templates/mailer.rb

@@ -1,6 +1,6 @@
 <% module_namespacing do -%>
 class <%= class_name %> < ActionMailer::Base
-  default from: "<%= goma_config.mailer_sender %>"
+  default from: Goma.config(:<%= resource_name %>).mailer_sender
 
 <% goma_actions.each do |action, subject| -%>
   # Subject can be set in your I18n file at config/locales/en.yml

data/lib/generators/goma/model/active_record_generator.rb

@@ -1,4 +1,5 @@
 require 'rails/generators/active_record/model/model_generator'
+require 'generators/test_unit/goma/model/model_generator'
 
 module Goma
   module Generators
@@ -24,6 +25,8 @@ module Goma
           end
         end
 
+        hook_for :test_framework, as: 'goma:model'
+
       private
         def merge_goma_user_attributes!
           self.attributes = (goma_user_attributes.map do |attr|
@@ -69,7 +72,6 @@ module Goma
             attrs << {type: :integer,  field: goma_config.failed_attempts_attribute_name}
             attrs << {type: :datetime, field: goma_config.locked_at_attribute_name}
             attrs << {type: :string,   field: goma_config.unlock_token_attribute_name,          index: :uniq}
-            attrs << {type: :datetime, field: goma_config.unlock_token_sent_at_attribute_name}
           end
 
           if goma_config.modules.include? :recoverable

data/lib/generators/goma/scaffold/user_generator.rb

@@ -4,6 +4,8 @@ module Goma
   module Generators
     module Scaffold
       class UserGenerator < Rails::Generators::ScaffoldGenerator
+        class_option :resource_name
+
         def initialize(args, *options)
           options[0] << '--controller-type=user'
           super

data/lib/generators/goma/scaffold_controller/scaffold_controller_generator.rb

@@ -1,5 +1,6 @@
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 require 'generators/goma/helpers/helpers'
+require 'generators/test_unit/goma/scaffold/scaffold_generator'
 
 module Goma
   module Generators
@@ -19,6 +20,7 @@ module Goma
       end
 
       hook_for :template_engine, in: 'goma'
+      hook_for :test_framework, as: 'goma:scaffold'
     end
   end
 end

data/lib/generators/goma/scaffold_controller/templates/confirmation_controller.rb

@@ -46,15 +46,15 @@ class <%= controller_class_name %>Controller < ApplicationController
       redirect_to root_url, notice: 'Your new email was successfully confirmed.'
     else
       if err == :token_expired
-        flash.now[:alert] = "Your email confirmation URL has expired, please change your email again."
+        flash[:alert] = "Your email confirmation URL has expired, please change your email again."
       else
-        flash.now[:alert] = "Email confirmation failed. Please make sure you used the full URL provided."
+        flash[:alert] = "Email confirmation failed. Please make sure you used the full URL provided."
       end
 
       if current_<%= resource_name %>
-        render edit_<%= resource_name%>_url(current_<%= resource_name %>)
+        redirect_to edit_<%= resource_name%>_url(current_<%= resource_name %>)
       else
-        render root_url
+        redirect_to root_url
       end
     end
   end

data/lib/generators/goma/scaffold_controller/templates/user_controller.rb

@@ -23,7 +23,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # GET <%= route_url %>/1/edit
   def edit
-    <%= goma_config.not_authenticated_action %> unless current_user = @user
+    <%= goma_config.not_authenticated_action %> unless current_user == @user
   end
 
   # POST <%= route_url %>
@@ -49,7 +49,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # PATCH/PUT <%= route_url %>/1
   def update
-    <%= goma_config.not_authenticated_action %> unless current_user = @user
+    <%= goma_config.not_authenticated_action %> unless current_user == @user
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
 <% if goma_config.modules.include?(:confirmable) && goma_config.email_confirmation_enabled -%>
       flash[:notice] = @<%= singular_table_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %> ?
@@ -66,7 +66,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # DELETE <%= route_url %>/1
   def destroy
-    <%= goma_config.not_authenticated_action %> unless current_user = @user
+    <%= goma_config.not_authenticated_action %> unless current_user == @user
     @<%= orm_instance.destroy %>
     redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
   end

data/lib/generators/test_unit/goma/model/model_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators/test_unit/model/model_generator'
+require 'generators/goma/helpers/helpers'
+
+module TestUnit
+  module Generators
+    module Goma
+      class ModelGenerator < ::TestUnit::Generators::ModelGenerator
+        include ::Goma::Generators::Helpers
+        source_root File.expand_path('../templates', __FILE__)
+      end
+    end
+  end
+end

data/lib/generators/test_unit/goma/model/templates/fixtures.yml

@@ -0,0 +1,30 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+<% [:one, :two].each do |name| -%>
+<%= name %>:
+<% if goma_config.modules.include?(:password_authenticatable) -%>
+<% (goma_config.authentication_keys - [goma_config.email_attribute_name]).each do |key| -%>
+  <%= key %>: '<%= "#{name}_#{key}" %>'
+<% end -%>
+<% if goma_config.email_attribute_name -%>
+  <%= goma_config.email_attribute_name %>: <%= name %>@example.com
+<% end -%>
+  <%= goma_config.encrypted_password_attribute_name %>: <%%= Goma.encryptor.encrypt('password', '<%= goma_config.pepper %>') %>
+<% end -%>
+<% if goma_config.modules.include?(:confirmable) -%>
+  <%= goma_config.activated_at_attribute_name %>: <%%= Time.now.utc %>
+<% end -%>
+<% end -%>
+
+<% if goma_config.modules.include?(:confirmable) -%>
+unactivated_<%= resource_name %>:
+<% if goma_config.modules.include?(:password_authenticatable) -%>
+<% (goma_config.authentication_keys - [goma_config.email_attribute_name]).each do |key| -%>
+  <%= key %>: '<%= "unactivated_#{goma_scope}_#{key}" %>'
+<% end -%>
+<% if goma_config.email_attribute_name -%>
+  <%= goma_config.email_attribute_name %>: unactivated_<%= goma_scope %>@example.com
+<% end -%>
+  <%= goma_config.encrypted_password_attribute_name %>: <%%= Goma.encryptor.encrypt('password', '<%= goma_config.pepper %>') %>
+<% end -%>
+<% end -%>

data/lib/generators/test_unit/goma/model/templates/unit_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+<% module_namespacing do -%>
+class <%= class_name %>Test < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
+<% end -%>

data/lib/generators/test_unit/goma/scaffold/scaffold_generator.rb

@@ -0,0 +1,36 @@
+require 'rails/generators/test_unit/scaffold/scaffold_generator'
+require 'generators/goma/helpers/helpers'
+
+module TestUnit
+  module Generators
+    module Goma
+      class ScaffoldGenerator < ::TestUnit::Generators::ScaffoldGenerator
+        include ::Goma::Generators::Helpers
+        source_root File.expand_path('../templates', __FILE__)
+
+        class_option :controller_type, required: true
+        class_option :resource_name
+
+        def create_test_files
+          template "#{options[:controller_type]}_functional_test.rb",
+                   File.join("test/controllers", controller_class_path, "#{controller_file_name}_controller_test.rb")
+        end
+
+        def inject_controller_test_helpers
+          path = File.expand_path('test/test_helper.rb', destination_root)
+          File.open path do |f|
+            unless f.read =~ /class\s+ActionController::TestCase/
+              append_to_file path do
+                <<-RUBY.strip_heredoc
+                class ActionController::TestCase
+                end
+                RUBY
+              end
+            end
+          end
+          inject_into_class('test/test_helper.rb', 'ActionController::TestCase', "  include Goma::ControllerTestHelpers\n")
+        end
+      end
+    end
+  end
+end

data/lib/generators/test_unit/goma/scaffold/templates/confirmation_functional_test.rb

@@ -0,0 +1,137 @@
+require 'test_helper'
+
+<% module_namespacing do -%>
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
+  setup do
+    @<%= resource_name %> = <%= resource_name.pluralize %>(:unactivated_<%= resource_name %>)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create <%= singular_table_name %>" do
+    <%= resource_name %> = <%= resource_class_name %>.create(<%= new_resource_attributes.inspect19 %>)
+    assert_difference 'ActionMailer::Base.deliveries.size', 1 do
+      post :create, <%= goma_config.authentication_keys.to_field_name %>: <%= resource_name %>.<%= goma_config.email_attribute_name %>
+    end
+    assert_redirected_to <%= login_url %>
+    assert_match /You will receive new activation email/, flash[:notice]
+  end
+
+  test "should activate <%= resource_name %>" do
+    <%= resource_name %> = <%= resource_class_name %>.create(<%= new_resource_attributes.inspect19 %>)
+<% if goma_config.activation_success_email_method_name -%>
+    assert_difference 'ActionMailer::Base.deliveries.size', 1 do
+<% else -%>
+    assert_no_difference 'ActionMailer::Base.deliveries.size' do
+<% end -%>
+      get :show, id: <%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>
+    end
+    assert_redirected_to <%= login_url %>
+    assert_match /Your account was successfully activated/, flash[:notice]
+    <%= resource_name %>.reload
+    assert <%= resource_name %>.activated?
+  end
+
+  test "should not activate <%= resource_name %> with wrong token" do
+    <%= resource_name %> = <%= resource_class_name %>.create(<%= new_resource_attributes.inspect19 %>)
+    assert_no_difference 'ActionMailer::Base.deliveries.size' do
+      get :show, id: 'oops'
+    end
+    assert_response :success
+    assert_template :new
+    assert_match /Not found any account by this URL/, flash[:alert]
+    <%= resource_name %>.reload
+    refute <%= resource_name %>.activated?
+  end
+
+  test "should not activate <%= resource_name %> with expired token" do
+    <%= resource_name %> = <%= resource_class_name %>.create(<%= new_resource_attributes.inspect19 %>)
+    <%= resource_name %>.update_column(:<%= goma_config.confirmation_token_sent_at_attribute_name %>, <%= expire(goma_config.activate_within) %>.ago)
+    assert_no_difference 'ActionMailer::Base.deliveries.size' do
+      get :show, id: <%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>
+    end
+    assert_response :success
+    assert_template :new
+    assert_match /Your activation URL has expired/, flash[:alert]
+    <%= resource_name %>.reload
+    refute <%= resource_name %>.activated?
+  end
+
+  test "should confirm email" do
+    <%= resource_name %> = <%= resource_name.pluralize %>(:one)
+    <%= goma_config.email_attribute_name %> = <%= resource_name %>.<%= goma_config.email_attribute_name %>
+    <%= resource_name %>.update(<%= goma_config.email_attribute_name %>: 'new@example.com')
+    assert_equal 'new@example.com', <%= resource_name %>.<%= goma_config.unconfirmed_email_attribute_name %>
+    assert_equal <%= goma_config.email_attribute_name %>, <%= resource_name %>.<%= goma_config.email_attribute_name %>
+<% if goma_config.activation_success_email_method_name -%>
+    assert_difference 'ActionMailer::Base.deliveries.size', 1 do
+<% else -%>
+    assert_no_difference 'ActionMailer::Base.deliveries.size' do
+<% end -%>
+      get :email, id: <%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>
+    end
+    assert_redirected_to root_path
+    assert_match /Your new email was successfully confirmed/, flash[:notice]
+    <%= resource_name %>.reload
+    assert_equal 'new@example.com', <%= resource_name %>.<%= goma_config.email_attribute_name %>
+    assert_nil <%= resource_name %>.<%= goma_config.unconfirmed_email_attribute_name %>
+  end
+
+  test "should not confirm email with wrong token" do
+    <%= resource_name %> = <%= resource_name.pluralize %>(:one)
+    <%= goma_config.email_attribute_name %> = <%= resource_name %>.<%= goma_config.email_attribute_name %>
+    <%= resource_name %>.update(<%= goma_config.email_attribute_name %>: 'new@example.com')
+    assert_equal 'new@example.com', <%= resource_name %>.<%= goma_config.unconfirmed_email_attribute_name %>
+    assert_equal <%= goma_config.email_attribute_name %>, <%= resource_name %>.<%= goma_config.email_attribute_name %>
+    assert_no_difference 'ActionMailer::Base.deliveries.size' do
+      get :email, id: 'oops'
+    end
+    assert_redirected_to root_path
+    assert_match /Please make sure you used the full URL provided/, flash[:alert]
+    <%= resource_name %>.reload
+    assert_equal <%= goma_config.email_attribute_name %>, <%= resource_name %>.<%= goma_config.email_attribute_name %>
+    assert_equal 'new@example.com', <%= resource_name %>.<%= goma_config.unconfirmed_email_attribute_name %>
+  end
+
+  test "should not confirm email with expired token" do
+    <%= resource_name %> = <%= resource_name.pluralize %>(:one)
+    <%= goma_config.email_attribute_name %> = <%= resource_name %>.<%= goma_config.email_attribute_name %>
+    <%= resource_name %>.update(<%= goma_config.email_attribute_name %>: 'new@example.com')
+    <%= resource_name %>.update_column(:<%= goma_config.confirmation_token_sent_at_attribute_name %>, <%= expire(goma_config.confirm_email_within) %>.ago)
+    assert_equal 'new@example.com', <%= resource_name %>.<%= goma_config.unconfirmed_email_attribute_name %>
+    assert_equal <%= goma_config.email_attribute_name %>, <%= resource_name %>.<%= goma_config.email_attribute_name %>
+    assert_no_difference 'ActionMailer::Base.deliveries.size' do
+      get :email, id: <%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>
+    end
+    assert_redirected_to root_path
+    assert_match /Your email confirmation URL has expired/, flash[:alert]
+    <%= resource_name %>.reload
+    assert_equal <%= goma_config.email_attribute_name %>, <%= resource_name %>.<%= goma_config.email_attribute_name %>
+    assert_equal 'new@example.com', <%= resource_name %>.<%= goma_config.unconfirmed_email_attribute_name %>
+  end
+
+  test "should be redirected to edit_user_url when failed to confirm email with wrong token if logged in" do
+    <%= resource_name %> = <%= resource_name.pluralize %>(:one)
+    force_login(<%= resource_name %>)
+    <%= resource_name %>.update(<%= goma_config.email_attribute_name %>: 'new@example.com')
+    get :email, id: 'oops'
+    assert_redirected_to edit_user_url(<%= resource_name %>)
+    assert_match /Please make sure you used the full URL provided/, flash[:alert]
+    <%= resource_name %>.reload
+  end
+
+  test "should be redirected to edit_user_url when failed to confirm email with expired token if logged in" do
+    <%= resource_name %> = <%= resource_name.pluralize %>(:one)
+    force_login(<%= resource_name %>)
+    <%= resource_name %>.update(<%= goma_config.email_attribute_name %>: 'new@example.com')
+    <%= resource_name %>.update_column(:<%= goma_config.confirmation_token_sent_at_attribute_name %>, <%= expire(goma_config.confirm_email_within) %>.ago)
+    get :email, id: <%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>
+    assert_redirected_to edit_user_url(<%= resource_name %>)
+    assert_match /Your email confirmation URL has expired/, flash[:alert]
+  end
+
+end
+<% end -%>