goma 0.0.1.gamma → 0.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a89f50e2d41994b88fc95fbc6c981684f8a71043
-  data.tar.gz: 0d9c4bb7dd2dfd2836b903d62fd5689d7bee43ed
+  metadata.gz: 5ef7018f710a582f625d31c0933a64ca21c04ae6
+  data.tar.gz: f74640b684a0feaef3146ff6ab537e46c7009b8b
 SHA512:
-  metadata.gz: e1e4c13eb562fc355eb35effae5a44eca9f4f0e29d50ed69de2687689893609ef14ccc234d42eb9290b59f87091d1a596f9453405dcdaa701191fb864e5ba20d
-  data.tar.gz: 141f626b7c5a22e697bab9b7c63a4c335872e8b024be56c8e68a09e58ba9f44c464df38af417afb87d171a58c87ee1d1d30eee306ba4d788b87f82125abb840a
+  metadata.gz: 9d68a65ac82a574ab10110551e453aee53dac951d96c4cdee43822e47b86231fb554615635d1449ef690a5124f3a5f80afc8cd29fcd57ad2ac8f9e847639a9e8
+  data.tar.gz: a2f9662edacd4404694af19493b9e626319ee4fbe985c7c7fb3c8f05d07275f966dcebb56ab3212c021054ee1cd5009f3e275440c5826f19904776d78f1bf7dd

data/Gemfile

@@ -15,5 +15,4 @@ gemspec
 
 group :development, :test do
   gem 'omniauth'
-  gem 'omniauth-twitter'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    goma (0.0.1.gamma)
+    goma (0.0.1.rc1)
       rails (~> 4.0)
       warden
 
@@ -39,6 +39,12 @@ GEM
     byebug (3.1.2)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
+    capybara (2.2.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     columnize (0.8.9)
     debugger-linecache (1.2.0)
     erubis (2.7.0)
@@ -51,6 +57,7 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.4)
     mime-types (1.25.1)
+    mini_portile (0.6.0)
     minitest (4.7.5)
     minitest-ansi (0.1.3)
       ansi (~> 1.3)
@@ -58,16 +65,11 @@ GEM
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     multi_json (1.9.3)
-    oauth (0.4.7)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     omniauth (1.2.1)
       hashie (>= 1.2, < 3)
       rack (~> 1.0)
-    omniauth-oauth (1.0.1)
-      oauth
-      omniauth (~> 1.0)
-    omniauth-twitter (1.0.1)
-      multi_json (~> 1.3)
-      omniauth-oauth (~> 1.0)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -109,6 +111,8 @@ GEM
     tzinfo (0.3.39)
     warden (1.2.3)
       rack (>= 1.0)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -116,12 +120,12 @@ PLATFORMS
 DEPENDENCIES
   bcrypt (~> 3.0)
   byebug
+  capybara
   fabrication
   goma!
   minitest-ansi
   mocha
   omniauth
-  omniauth-twitter
   shoulda-context
   single_test
   sqlite3

data/Rakefile

@@ -29,5 +29,19 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
+desc "Rebuild test app's resources"
+task "rebuild_test_app" do
+  migration = 'migrate' == ARGV.last ? '' : ' --no-migration'
+  cd "test/rails_app"
+  sh "bundle exec rails d goma:scaffold User#{migration}"
+  sh "bundle exec rails g goma:scaffold User#{migration}"
+  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
 
 task default: :test

data/goma.gemspec

@@ -49,6 +49,11 @@ That's it.
 This gem is in early development phase and I do not recommend you to use this for production for a while.
 Bug reports and pull requests are welcome.
 
+I am surprised that this gem has been downloaded over 200 times, in spite of pre release versions of v0.0.1.
+And, I feel bad about there were lots of bugs and incomplete implementations in previous versions.
+
+I will release this as a release candidate, but will add lots of code before v0.0.1.
+
 Enjoy!\e[0m
 MESSAGE
 
@@ -61,6 +66,7 @@ MESSAGE
   s.add_development_dependency "mocha"
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "timecop"
+  s.add_development_dependency "capybara"
   s.add_development_dependency "minitest-ansi"
   s.add_development_dependency "single_test"
   s.add_development_dependency "byebug"

data/lib/generators/goma/erb/templates/confirmation/new.html.erb

@@ -1,9 +1,9 @@
 <h1>Resend activation instructions</h1>
 
-<%%= form_tag(:<%= name.underscore.pluralize %>_url, method: :post) do %>
+<%%= form_tag(<%= name.underscore.pluralize %>_url, method: :post) do %>
   <div class="field">
     <%%= label_tag :<%= goma_config.authentication_keys.to_field_name %> %><br>
-    <%%= text_field_tag :<%= goma_config.authentication_keys.to_field_name %>
+    <%%= text_field_tag :<%= goma_config.authentication_keys.to_field_name %> %>
   </div>
   <div class="actions">
     <%%= submit_tag "Resend activation instructions" %>

data/lib/generators/goma/erb/templates/password/edit.html.erb

@@ -1,18 +1,18 @@
 <h1>Change your password</h1>
 
-<%%= form_for(@<%= singular_table_name %>) do |f| %>
-  <%% if @<%= singular_table_name %>.errors.any? %>
+<%%= form_for(@<%= resource_name %>, url: <%= singular_table_name %>_url, html: {method: :put}) do |f| %>
+  <%% if @<%= resource_name %> && @<%= resource_name %>.errors.any? %>
     <div id="error_explanation">
-      <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
+      <h2><%%= pluralize(@<%= resource_name %>.errors.count, "error") %> prohibited this <%= resource_name %> from being saved:</h2>
 
       <ul>
-      <%% @<%= singular_table_name %>.errors.full_messages.each do |msg| %>
+      <%% @<%= resource_name %>.errors.full_messages.each do |msg| %>
         <li><%%= msg %></li>
       <%% end %>
       </ul>
     </div>
   <%% end %>
-
+  <%%= f.hidden_field :<%= goma_config.reset_password_token_to_send_attribute_name %> %>
   <div class="field">
     <%%= f.label :<%= goma_config.password_attribute_name %> %><br>
     <%%= f.password_field :<%= goma_config.password_attribute_name %> %>
@@ -22,6 +22,6 @@
     <%%= f.password_field :<%= goma_config.password_attribute_name %>_confirmation %>
   </div>
   <div class="actions">
-    <%%= f.submit %>
+    <%%= f.submit 'Change my password' %>
   </div>
 <%% end %>

data/lib/generators/goma/erb/templates/unlock/new.html.erb

@@ -3,7 +3,7 @@
 <%%= form_tag(<%= name.underscore.pluralize%>_url, method: :post) do %>
   <div class="field">
     <%%= label_tag :<%= goma_config.authentication_keys.to_field_name %> %><br>
-    <%%= text_field_tag :<%= goma_config.authentication_keys.to_field_name %>
+    <%%= text_field_tag :<%= goma_config.authentication_keys.to_field_name %> %>
   </div>
   <div class="actions">
     <%%= submit_tag "Resend unlock instructions" %>

data/lib/generators/goma/erb/templates/user/_form.html.erb

@@ -37,6 +37,6 @@
   </div>
 <% end -%>
   <div class="actions">
-    <%%= f.submit %>
+    <%%= f.submit ( @<%= singular_table_name %>.try(:persisted?) ? 'Update' : 'Sign up' ) %>
   </div>
 <%% end %>

data/lib/generators/goma/erb/templates/user/new.html.erb

@@ -1,5 +1,9 @@
 <h1>New <%= singular_table_name %></h1>
 
 <%%= render 'form' %>
+<% auth_keys = goma_config.authentication_keys - [goma_config.email_attribute_name] -%>
+<% if goma_config.modules.include?(:confirmable) && auth_keys.present? -%>
+  * If you signed up with wrong email address, please enter correct email address and <%= auth_keys.join(', ') %> and password your entered when you signed up and click 'Sign up' again.
+<% end -%>
 
 <%%= link_to 'Back', <%= index_helper %>_path %>

data/lib/generators/goma/mailer/erb/templates/activation_needed_email.text.erb

@@ -3,4 +3,4 @@ Welcome, <%%= @<%= resource_name %>.<%= goma_config.email_attribute_name %> %>
 
 You can activate your account through the link below:
 
-<%%= activate_confirmation_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %>
+<%%= confirmation_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %>

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

@@ -13,6 +13,7 @@ module Goma
         end
 
         def add_options_to_migration
+          return unless options['migration']
           if path = self.class.migration_exists?('db/migrate', migration_file_name)
             gsub_file(path,
                       "t.integer :#{goma_config.failed_attempts_attribute_name}",

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

@@ -25,9 +25,9 @@ module Goma
           end
 
           def inject_index
-            # if path = self.class.migration_exists('db/migrate', migration_file_name)
-            if behavior == :invoke
-              insert_into_file("db/migrate/#{migration_number}_#{migration_file_name}.rb", goma_oauth_index, {after: /^\s{4,}end\s*\n/})
+            return unless options['migration']
+            if path = self.class.migration_exists?('db/migrate', migration_file_name)
+              insert_into_file(path, goma_oauth_index, {after: /^\s{4,}end\s*\n/})
             end
           end
 

data/lib/generators/goma/resource_route/resource_route_generator.rb

@@ -42,8 +42,11 @@ module Goma
       end
 
       def resource_definition
-        if options[:controller_type] == 'session'
+        case options[:controller_type]
+        when 'session'
           "resource :#{file_name.singularize}"
+        when 'oauth'
+          ''
         else
           "resources :#{file_name.pluralize}"
         end
@@ -57,8 +60,6 @@ module Goma
           ', only: [:show, :new, :create]'
         when 'password'
           ', only: [:new, :create, :edit, :update]'
-        when 'oauth'
-          ', only: [:create]'
         else
           ''
         end
@@ -67,13 +68,16 @@ module Goma
       def appending_string
         if options[:controller_type] == 'confirmation' &&
           goma_config.modules.include?(:confirmable) && goma_config.email_confirmation_enabled
-          strings = []
-          strings << ' do'
-          strings << '  get :email,  on: :member'
-          strings << 'end'
-          strings.join("\n")
+          <<-BLOCK.strip_heredoc
+           do
+            get :email, on: :member
+          end
+          BLOCK
         elsif options[:controller_type] == 'oauth'
-          "\nget '/auth/:provider/callback', to: '#{file_name.pluralize}#create'"
+          <<-RUBY.strip_heredoc
+          get '/auth/:provider/callback', to: '#{file_name.pluralize}#create'
+          get '/auth/failure', to: '#{file_name.pluralize}#failure'
+          RUBY
         end
       end
     end

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

@@ -13,8 +13,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # POST <%= route_url %>
   def create
     @<%= resource_name %> = <%= resource_class_name %>.find_by_identifier(params[:<%= goma_config.authentication_keys.to_field_name %>])
-    @<%= resource_name %>.generate_confirmation_token
-    @<%= resource_name %>.send_activation_needed_email
+    @<%= resource_name %>.resend_activation_needed_email
 
     redirect_to <%= login_url %>, notice: "We are processing your request. You will receive new activation email in a few minutes."
   end
@@ -44,14 +43,19 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     if @<%= resource_name %>
       @<%= resource_name %>.confirm_email!
-      redirect_to edit_<%= resource_name %>_url, notice: 'Your new email was successfully confirmed.'
+      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."
       else
         flash.now[:alert] = "Email confirmation failed. Please make sure you used the full URL provided."
       end
-      render edit_<%= resource_name%>_url(current_<%= resource_name %>)
+
+      if current_<%= resource_name %>
+        render edit_<%= resource_name%>_url(current_<%= resource_name %>)
+      else
+        render root_url
+      end
     end
   end
 end

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

@@ -17,5 +17,10 @@ class <%= controller_class_name %>Controller < ApplicationController
     force_login(<%= resource_name %>)
     <%= specify_scope_if_needed %>redirect_back_or_to root_url, notice: "Successfully authenticated from #{omniauth[:provider]} account."
   end
+
+  def failure
+    flash[:alert] = "Could not authenticate you from #{params[:strategy].capitalize} because \"#{params[:message].humanize}\"."
+    redirect_to <%= login_url %>
+  end
 end
 <% end -%>

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

@@ -21,16 +21,17 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # GET <%= route_url %>/1/edit
   def edit
-    @reset_password_token = params[:id]
+    @<%= resource_name %> = <%= resource_class_name %>.new
+    @<%= resource_name %>.<%= goma_config.reset_password_token_to_send_attribute_name %> = params[:id]
   end
 
   # PATCH/PUT <%= route_url %>/1
   def update
-    @<%= resource_name %>, err = <%= resource_class_name %>.load_from_reset_password_token_with_error(params[:id])
+    @<%= resource_name %>, err = <%= resource_class_name %>.load_from_reset_password_token_with_error(params[:<%= resource_name %>][:<%= goma_config.reset_password_token_to_send_attribute_name %>])
 
     if @<%= resource_name %>
       @<%= resource_name %>.unlock_access! if @<%= resource_name %>.lockable? && @<%= resource_name %>.access_locked?
-      @<%= resource_name %>.change_password!(params[:<%= goma_config.password_attribute_name %>], params[:<%= goma_config.password_attribute_name %>_confirmation])
+      @<%= resource_name %>.change_password!(params[:<%= resource_name %>][:<%= goma_config.password_attribute_name %>], params[:<%= resource_name %>][:<%= goma_config.password_attribute_name %>_confirmation])
       force_login(@<%= resource_name %>)
       <%= specify_scope_if_needed %>redirect_back_or_to root_url, notice: 'Your password was changed successfully. You are now logged in.'
     else
@@ -38,10 +39,14 @@ class <%= controller_class_name %>Controller < ApplicationController
         flash.now[:alert] = "The password reset URL you visited has expired, please request a new one."
         render :new
       else
-        flash.now[:alert] = "You can't access this page without comming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+        @<%= resource_name %> = <%= resource_class_name %>.new
+        flash.now[:alert] = "You can't change your password in this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
         render :edit
       end
     end
+  rescue ActiveRecord::RecordInvalid
+    @<%= resource_name %>.<%= goma_config.reset_password_token_to_send_attribute_name %> = params[:<%= resource_name %>][:<%= goma_config.reset_password_token_to_send_attribute_name %>]
+    render :edit
   end
 end
 <% end -%>

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

@@ -9,6 +9,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   def show
     @<%= resource_name %>, err = <%= resource_class_name %>.load_from_unlock_token_with_error(params[:id])
     if @<%= resource_name %>
+      @<%= resource_name %>.unlock_access!
       flash[:notice] = "Your account has been unlocked successfully. Please continue to login."
       redirect_to <%= login_url %>
     else

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

@@ -4,6 +4,7 @@ require_dependency "<%= namespaced_file_path %>/application_controller"
 <% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
+  before_action <%= (singular_table_name == Goma.config.default_scope && !Helpers.include_scope_name_into_controller_name) ? ':require_login' : ":require_#{singular_table_name}_login" %>, only: [:edit, :update, :destroy]
   before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
 
   # GET <%= route_url %>
@@ -22,6 +23,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # GET <%= route_url %>/1/edit
   def edit
+    <%= goma_config.not_authenticated_action %> unless current_user = @user
   end
 
   # POST <%= route_url %>
@@ -36,14 +38,27 @@ class <%= controller_class_name %>Controller < ApplicationController
       redirect_back_or_to root_url, notice: "Welcome! You have signed up successfully.<%= goma_config.modules.include?(:confirmable) ? ' You will receive an email with instructions about how to activate your account in a few minutes.' : '' %>"
 <% end -%>
     else
+<% if goma_config.modules.include?(:confirmable) &&
+     (auth_keys = goma_config.authentication_keys - [goma_config.email_attribute_name]).present? -%>
+      update_email or render :new
+<% else -%>
       render :new
+<% end -%>
     end
   end
 
   # PATCH/PUT <%= route_url %>/1
   def update
+    <%= goma_config.not_authenticated_action %> unless current_user = @user
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
-      redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
+<% if goma_config.modules.include?(:confirmable) && goma_config.email_confirmation_enabled -%>
+      flash[:notice] = @<%= singular_table_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %> ?
+                       'You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirmation link to finalize confirming your new email address.' :
+                       'You updated your account successfully'
+      redirect_to @<%= singular_table_name %>
+<% else -%>
+      redirect_to @<%= singular_table_name %>, notice:'You updated your account successfully'
+<% end -%>
     else
       render :edit
     end
@@ -51,6 +66,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # DELETE <%= route_url %>/1
   def destroy
+    <%= goma_config.not_authenticated_action %> unless current_user = @user
     @<%= orm_instance.destroy %>
     redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
   end
@@ -65,5 +81,29 @@ class <%= controller_class_name %>Controller < ApplicationController
     def <%= "#{singular_table_name}_params" %>
       params.require(:<%= singular_table_name %>).permit(<%= (resource_attributes + attributes_names).map { |name| ":#{name}" }.join(', ') %>)
     end
+<% if goma_config.modules.include?(:confirmable) && auth_keys.present? -%>
+
+    def update_email
+<% if auth_keys.length == 1 -%>
+      @<%= singular_table_name %> = <%= class_name %>.find_by(<%= auth_keys.first %>: params[:<%= singular_table_name %>][:<%= auth_keys.first %>])
+<% else -%>
+      [<%= auth_keys.map{|k| ":#{k}"}.join(', ') %>].each do |key|
+        break if @<%= singular_table_name %> = <%= class_name %>.find_by(key => params[:<%= singular_table_name %>][key])
+      end
+<% end -%>
+      if @<%= singular_table_name %>.activated?
+        return false
+      end
+
+      if ( Time.now <= @<%= singular_table_name %>.<%= goma_config.confirmation_token_sent_at_attribute_name %> + <%= goma_config.activate_within %> ) &&
+        !@<%= singular_table_name %>.valid_password?(params[:<%= singular_table_name %>][:<%= goma_config.password_attribute_name %>])
+        flash[:alert] = 'This username was already registered. If you want to change your email address, please make sure you entered correct password.'
+        return false
+      end
+
+      @<%= singular_table_name %>.resend_activation_needed_email(to: params[:<%= singular_table_name %>][:<%= goma_config.email_attribute_name %>])
+      redirect_to <%= login_url %>
+    end
+<% end -%>
 end
 <% end -%>