Merge branch 'master' of git.wattsworth.net:wattsworth/control-api

Gemfile.lock

@@ -50,8 +50,7 @@ GEM
     arel (9.0.0)
     arel (9.0.0)
     ast (2.4.0)
     ast (2.4.0)
     backports (3.11.4)
     backports (3.11.4)
-    bcrypt (3.1.12)
-    bcrypt (3.1.12-x64-mingw32)
+    bcrypt (3.1.13)
     bindex (0.5.0)
     bindex (0.5.0)
     bootsnap (1.3.2)
     bootsnap (1.3.2)
       msgpack (~> 1.0)
       msgpack (~> 1.0)
@@ -116,7 +115,7 @@ GEM
     cucumber-wire (0.0.1)
     cucumber-wire (0.0.1)
     daemons (1.3.0)
     daemons (1.3.0)
     database_cleaner (1.7.0)
     database_cleaner (1.7.0)
-    devise (4.5.0)
+    devise (4.6.2)
       bcrypt (~> 3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
       railties (>= 4.1.0, < 6.0)
@@ -125,8 +124,8 @@ GEM
     devise_invitable (1.7.5)
     devise_invitable (1.7.5)
       actionmailer (>= 4.1.0)
       actionmailer (>= 4.1.0)
       devise (>= 4.0.0)
       devise (>= 4.0.0)
-    devise_token_auth (1.0.0)
-      devise (> 3.5.2, < 4.6)
+    devise_token_auth (1.1.0)
+      devise (> 3.5.2, < 4.7)
       rails (>= 4.2.0, < 6)
       rails (>= 4.2.0, < 6)
     diff-lcs (1.3)
     diff-lcs (1.3)
     docile (1.3.1)
     docile (1.3.1)
@@ -269,9 +268,9 @@ GEM
       ffi (>= 0.5.0, < 2)
       ffi (>= 0.5.0, < 2)
     rdoc (4.3.0)
     rdoc (4.3.0)
     regexp_parser (1.3.0)
     regexp_parser (1.3.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
     rspec (3.8.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-expectations (~> 3.8.0)

config/environments/development.rb

@@ -76,7 +76,7 @@ Rails.application.configure do
   # enable password recovery and e-mail invitations
   # enable password recovery and e-mail invitations
   # NOTE: configure smtp.rb with SMTP server details
   # NOTE: configure smtp.rb with SMTP server details
   #
   #
-  config.send_emails = false
+  config.send_emails = true
 
 
   config.interface_url_template = lambda do |id|
   config.interface_url_template = lambda do |id|
     # change to subdomains for additional security
     # change to subdomains for additional security

config/locales/devise.en.yml

+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access 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."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+      updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again"
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"

lib/tasks/nilm.rake

+require 'factory_bot_rails'
+
+namespace :nilm do 
+  desc "Add a nilmdb database"
+  task :add, [:email, :name, :url] => [:environment] do |t, args|
+    adapter = Nilmdb::Adapter.new(args[:url])
+    service = CreateNilm.new(adapter)
+    service.run(name: args[:name], url: args[:url],
+                owner: User.find_by_email(args[:email]))
+    if service.success?
+      puts "created Nilm #{args[:name]} with owner #{args[:email]}"
+    else
+      puts args.warnings
+      puts args.errors
+    end
+  end
+end
+