orthodox 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 616ba8695069097dae8c09c0912d366b2491ea1747d683e91fce2ee86bc91456
-  data.tar.gz: 05b4176b9a0c81b779ab5ac0490e21437eb3eaec6daad9fa98ce503de0481b4a
+  metadata.gz: 3c740d0d444bd2896b459d0bda364d38cef3b9bbe943fe1a012e7deb0114d816
+  data.tar.gz: 63d17b2215420e68e9fc7510dad4adeaa4d188017b2c2330349c178d52118328
 SHA512:
-  metadata.gz: 436f151edd60aa7a0b8437aa7652d4406f95a78ae9d26aa4b05e0dd5948c86c71baf08225a58162cd50039e62688594ea8a57e433eef4b4459dea42f6b3de0a6
-  data.tar.gz: da50fc10b1b96d2a1f6b34d5ae13a57b5c9aa25b2cef9c8f9a8e719d7afa4d25595d6261493c913732fd8da36bc7f546cf9791fffe7a1080943ca975b1d361db
+  metadata.gz: 891bdc496f65fb89d4731384fac358a1d0b928da22f44dc046a08d0a79743261613872d4a561c9c8cfb879667e89ea33384e93692d2806060f6294a06f510b02
+  data.tar.gz: 37a7304318cefc33c5a110a3744b5333d1973fd0d94341be24b0fade681602cb0071e6eed7b21ccc83499488807738e4082a3ca2201229528436cf7c6581f4b8

data/lib/generators/authentication/authentication_generator.rb

@@ -9,6 +9,9 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
   
   class_option :two_factor, type: :boolean, default: false
   
+  class_option :js, type: :boolean, default: false
+  
+  
   def create_controllers
     generate "base_controller", class_name
     template "controllers/sessions_controller.rb.erb", 
@@ -40,7 +43,7 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
   end
 
   def ensure_js
-    if options[:two_factor]
+    if options[:two_factor] && options[:js]
       copy_file "javascript/tfa_forms.js", "app/javascript/packs/tfa_forms.js"
     end
   end

data/lib/generators/authentication/templates/controllers/concerns/authentication.rb.erb

@@ -8,7 +8,7 @@ module Authentication
   
   extend ActiveSupport::Concern
   
-  private
+  protected
   
   # Sign in a given record as a given type
   #
@@ -91,10 +91,10 @@ module Authentication
       helper_method :"current_#{model_name}?"
       helper_method :"#{model_name}_signed_in?"
       
-      private :"current_#{model_name}"
-      private :"current_#{model_name}?"
-      private :"#{model_name}_signed_in?"
-      private :"authenticate_#{model_name}"
+      protected :"current_#{model_name}"
+      protected :"current_#{model_name}?"
+      protected :"#{model_name}_signed_in?"
+      protected :"authenticate_#{model_name}"
       
       <%- if options[:two_factor] -%>
       # This is included if the authentication generator is run with --two-factor=true

data/lib/generators/authentication/templates/models/session.rb.erb

@@ -65,7 +65,7 @@ class <%= class_name %>Session
   def password_matches
     return unless <%= singular_name %>
     unless <%= singular_name %>.authenticate(password)
-      errors.add(:password, INVALID_CREDENTIALS)
+      errors.add(:base, INVALID_CREDENTIALS)
     end
   end
   

data/lib/generators/base_controller/base_controller_generator.rb

@@ -9,14 +9,14 @@ class BaseControllerGenerator < Rails::Generators::NamedBase
 
   def ensure_file
     template "base_controller.rb.erb", 
-             File.join("app", "controllers", plural_file_name, "base_controller.rb")
+             File.join("app", "controllers", file_name, "base_controller.rb")
   end
   
   private
   
   
   def namespace_module
-    file_name.to_s.split("/").first.classify.pluralize
+    file_name.camelize
   end
   
 end

data/lib/generators/base_controller/templates/base_controller.rb.erb

@@ -1,7 +1,7 @@
 # frozen_string_literal
 class <%= namespace_module %>::BaseController < ApplicationController
   
-  # layout "<%= plural_file_name %>"
+  # layout "<%= file_name %>"
   
   # Define methods common to all <%= file_name %> controllers here.
 end

data/lib/generators/coffeescript/coffeescript_generator.rb

@@ -3,8 +3,7 @@ class CoffeescriptGenerator < Rails::Generators::NamedBase
 
   source_root File.expand_path('../templates', __FILE__)
 
-  desc "This generator creates a coffee script file at"\
-        " app/assets/javascripts/partials"
+  desc "This generator creates a coffee script file at app/javascript/packs"
 
   argument :functions, type: :array, default: [],
                                      banner: "functionOne functionTwo"
@@ -24,13 +23,8 @@ class CoffeescriptGenerator < Rails::Generators::NamedBase
     file_name.camelize(:lower)
   end
 
-  def partial_file_name
-    "_#{file_name}"
-  end
-
   def file_path
-    Rails.root.join("app/assets/javascripts/packs",
-                    partial_file_name + ".coffee")
+    Rails.root.join("app/javascript/packs", namespace_path, "#{file_name}.coffee")
   end
 
   def namespace_path

data/lib/generators/coffeescript/templates/coffeescript.coffee.erb

@@ -1,15 +1,4 @@
-window.<%= function_name %> = do ->
+init = ->
+  # Write your code here...
 
-  init = ->
-    # Write your code here...
-
-  <%- functions.each do |functionName| %>
-  <%= functionName.camelize(:lower) %> = ->
-    # Write your function here...
-  <%- end -%>
-
-  # Add any functions you'd like to make public here:
-  return { init }
-
-# Optionally: Call init on jQuery load
-# jQuery <%= function_name %>.init
+jQuery(init)

data/lib/orthodox/version.rb

@@ -1,3 +1,3 @@
 module Orthodox
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orthodox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Bodacious
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails