jobshop 0.0.37 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d5aae0bc0ef493f3af548a3924df2d7d3bfa20d
-  data.tar.gz: f3ec4420b0e9698bbfec1ba3d50c376c4fb8a261
+  metadata.gz: c86e7e67c1715d920f77caf807a4bc4e5d0d5dec
+  data.tar.gz: b61cde16d2ba6177ecc3bbb62d4b7e165692b92b
 SHA512:
-  metadata.gz: 49cb1d2eda3f5e7cb29c119f8a6bc631784ab432479602df79327d6ea760be14a51d9b27fcb092765791d2646cf633f26583dd6a2c459ae0ff726e436604600d
-  data.tar.gz: 8a715e7172f5d4acef51079c0ae58153416aee02a905278b9bf33b1a716e07fab7e0af0cae39b91bc8e8af0146cb6e2bd2d783cd1e19288e0cf6892107b0373b
+  metadata.gz: bb5e90365faeb6483033e4c16a776e399908ba489557ed89672bad4d864c176004ed729b41adcd5626d458f7a92e1b3e5a515ac601098e3fba86e5fac27d6cf2
+  data.tar.gz: bed3c0155ecd9c441f018d28f119fae407067cdb01965d770479fd496070b8c328d56dcdd0ad47ee08a5a1e90c07ef3badeb9f64188950820369f6712ad757b8

data/app/controllers/jobshop/teams/lookups_controller.rb

@@ -9,17 +9,9 @@ module Jobshop
     end
 
     def create
-      email_addresses = params[:user][:email].split(",").map(&:strip).take(5)
+      emails = params[:user][:email].split(",").map(&:strip).take(5)
 
-      @lookup = Jobshop::User
-        .where(email: email_addresses)
-        .joins(:team)
-        .select("jobshop_users.id AS id",
-                "email",
-                "jobshop_teams.name AS team_name")
-        .group_by(&:email)
-
-      @lookup.each_pair do |email, teams|
+      Jobshop::Team.grouped_by_email(emails).each_pair do |email, teams|
         Jobshop::TeamsMailer.found_teams(email, teams).deliver_later
       end
 

data/app/mailers/jobshop/teams_mailer.rb

@@ -1,10 +1,10 @@
 module Jobshop
   class TeamsMailer < ApplicationMailer
-    def found_teams(email, teams)
-      @email = email
+    def found_teams(user, teams)
+      @user = user
       @teams = teams
 
-      mail(to: @email, subject: "We found your Jobshop Teams!")
+      mail(to: @user.email, subject: "We found your Jobshop Teams!")
     end
   end
 end

data/app/models/jobshop/team.rb

@@ -4,6 +4,16 @@ module Jobshop
     has_many :users, class_name: "Jobshop::User"
     has_one :default_dashboard, class_name: "Jobshop::Dashboard"
 
+    scope :grouped_by_email, ->(email_addresses) {
+      Jobshop::User
+        .where(email: email_addresses)
+        .joins(:team)
+        .includes(:team)
+        .each_with_object({}) { |user, teams|
+          (teams[user.email] ||= []) << user.team
+        }
+    }
+
     def generate_registration_token
       raw, encrypted = Devise.token_generator.generate(
         self.class, :registration_token)

data/app/views/jobshop/teams/registrations/new.html.haml

@@ -22,8 +22,9 @@
             = f.fields_for(f.object.user) do |uf|
               = uf.input :email
               %p
-                Pick a strong password, ideally being: longer than 8 characters,
-                of mixed upper/lower case, including numbers and symbols.
+                Pick a strong password. Ideally it will be longer than eight
+                characters, have mixed upper/lower case, and include numbers
+                and symbols.
               = uf.input :password
               = uf.input :password_confirmation
               = f.button :submit, "Next »".html_safe

data/app/views/jobshop/teams_mailer/found_teams.text.erb

@@ -1,7 +1,7 @@
-Hi <%= @email %>,
+Hi <%= @user.email %>,
 
 We found the following teams linked to your email address:
 
 <% @teams.each do |team| %>
-  You belong to: <%= team.team_name %>
+  You belong to: <%= team.name %>
 <% end %>

data/lib/jobshop/templates/dummy_template.rb

@@ -24,13 +24,25 @@ end
 
 # Mailer previews don't really play nice with Engines so in the dummy app we
 # create an initializer to expose them properly.
-initializer "expose_mailer_previews.rb", <<-INITIALIZER.strip_heredoc
-  Rails.application.configure do
-    config.action_mailer.preview_path = "\#{Jobshop::Engine.root}/spec/mailers"
+initializer "jobshop_expose_mailer_previews.rb", <<-INITIALIZER.strip_heredoc
+  if Rails.env.development? || Rails.env.test?
+    Rails.application.configure do
+      config.action_mailer.preview_path = "\#{Jobshop::Engine.root}/spec/mailers"
+    end
+  end
+INITIALIZER
+
+# This allows us to easily use the localhost hostname in development.
+initializer "jobshop_tld_length.rb", <<-INITIALIZER.strip_heredoc
+  if Rails.env.development? || Rails.env.test?
+    Rails.application.configure do
+      config.action_dispatch.tld_length = 0
+    end
   end
 INITIALIZER
 
 route "mount Jobshop::Engine => \"/\""
 
+rake "db:drop:all"
 rake "db:create"
 rake "db:migrate"

data/lib/jobshop/templates/quick_install.rb

@@ -1,25 +1,26 @@
-SECRETS_YML_URI = URI.parse("https://raw.githubusercontent.com/jobshop/jobshop/master/lib/jobshop/templates/secrets.yml.erb")
-
 require "tempfile"
 require "net/http"
 
 # Add jobshop to the application `Gemfile`.
 gem "jobshop", "~> 0.0.11"
 
-#require "pry"; binding.pry
-template_body = Net::HTTP.start(SECRETS_YML_URI.host,
-                                SECRETS_YML_URI.port,
-                                use_ssl: true) do |http|
-  http.request(Net::HTTP::Get.new(SECRETS_YML_URI))
-end.body
+def template_body(uri)
+  uri = URI.parse(uri)
+  Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+    http.request(Net::HTTP::Get.new(uri))
+  end.body
+end
+
+# The generated config/secrets.yml file uses hardcoded values for
+# test/development environments. Generate secrets pragmatically.
+SECRETS_YML_URI = "https://raw.githubusercontent.com/" +
+                  "jobshop/jobshop/" +
+                  "master/lib/jobshop/templates/secrets.yml.erb"
 
 secrets_tempfile = Tempfile.new(["secrets", ".yml.erb"])
-puts secrets_tempfile.path
-secrets_tempfile.write(template_body)
+secrets_tempfile.write(template_body(SECRETS_YML_URI))
 secrets_tempfile.close
 
-# The generated config/secrets.yml file uses hardcoded values for
-# test/development environments. Generate secrets pragmatically.
 remove_file "config/secrets.yml"
 template secrets_tempfile.path, "config/secrets.yml"
 secrets_tempfile.unlink

data/lib/jobshop/version.rb

@@ -6,7 +6,7 @@ module Jobshop
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 37
+    TINY  = 41
     PRE   = nil
 
     CODE_NAME = "bump it up prime".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobshop
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.41
 platform: ruby
 authors:
 - Frank J. Mattia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails