hot-glue 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eedf5dcbc79766ed47352778020a633eb34324ecefb715b5e9b5476f119f80e6
-  data.tar.gz: 95e59bd0f9dc73b62c7b1d4a653a9384fed801ec9b8d672f44cc9e4636b56dc9
+  metadata.gz: 61b8c21f0bf630a68d9861b8bb70141ce7fe0da0a0f1ae71c3bb4e69da6b081d
+  data.tar.gz: 865d633fe279b4db0b2927801c82ec6de1ab630b4ffb7d24ffc539dfbb56d44d
 SHA512:
-  metadata.gz: 99c381f75071b812279eb0cda17d4e0086fafba3385e37283e838610fb2e8574d3659c7e130ef4ac2531309a564d3c4b7a1a1064475c4d370ba7de942d67dcfd
-  data.tar.gz: 5fd29976555c4dc94814afeec9759c8156db92d6df9c178ece27d7b9bbd9570db5e764f75c3b2c61a7c26391950718c181fa0b03224858e41f836654fc9a6a01
+  metadata.gz: 26901af291d1db0f028b14e320ed6c66908c90d94777c559bdba508c4e111b651357531f9fffc468cc419fbe16dda1d9bb6b86777c6e8f840631c4dfb7239e3d
+  data.tar.gz: 69775a6b4a31b142e1683c2017d2b85c1fda1f7350bb4b954948a0b06bfbb990578bed98c0eedce1534e10ad78aa44b87d27deecf027f017184aa731319c62cb

data/README.md

@@ -568,17 +568,25 @@ Please note that this example would produce non-functional code, so you would ne
 
 Hawk a foreign key that is not the object's owner to within a specified scope. 
 
-Assuming a Pet belong_to a :human, when building an Appointments scaffold, you can hawk the `pet_id` to the current human's pets. (Whoever is the authentication object.)
+Assuming a Pet belong_to a :human, when building an Appointments scaffold,
+you can hawk the `pet_id` to the current human's pets. (Whoever is the authentication object.)
 
+The hawk has two forms: a short-form (`--hawk=key`) and long form (`--hawk=key{scope})
+
+The short form looks like this. It presumes there is a 'pets' association from `current_user`
 `--hawk=pet_id`
 
+(The long form equivalent of this would be `--hawk=pet_id{current_user.pets}`)
+
 This is covered in [Example #3 in the Hot Glue Tutorial](https://jfb.teachable.com/courses/hot-glue-in-depth-tutorial/lectures/38584014)
 
-To hawk to a scope that is not the currently authenticated user, use curly braces `{...}` to specify the scope.
+To hawk to a scope that is not the currently authenticated user, use the long form with `{...}` 
+to specify the scope. Be sure to note to add the association name itself, like `users`: 
 
-`--hawk=user_id{current_user.family}`
+`--hawk=user_id{current_user.family.users}`
 
-This would hawk the Appointment's `user_id` key to any users who are within the scope of the current_user's family. 
+This would hawk the Appointment's `user_id` key to any users who are within the scope of the 
+current_user's has_many association (so, for any other "my" family, would be `current_user.family.users`). 
 
 This is covered in [Example #4 in the Hot Glue Tutorial](https://jfb.teachable.com/courses/hot-glue-in-depth-tutorial/lectures/38787505)
 
@@ -905,6 +913,12 @@ Child portals have the headings omitted automatically (there is a heading identi
 
 # VERSION HISTORY
 
+#### 2023-01-02 - v0.5.6
+- Changes the long-form of the hawk specifier to require you to use the has_many of the relationship you are hawking (previously, it was assumed). See Hawk for details
+- Adds "Regenerate me" comment to top of all generated controllers
+- Change behavior of pluralization. Now, you can use an `inflections.rb` file and non-standard pluralization will be respected.
+
+
 #### 2022-12-27 - v0.5.5 
 
 - Experimental support for Tailwind. Note I was not able to get Tailwind actually working in my app, and I'm not sure about how to think about the many flavors of Tailwind (all of which seem to be paid?). If anyone can lend a hand, the objects are now cleanly refactored so that the CSS logic is separated.

data/app/helpers/hot_glue/controller_helper.rb

@@ -78,9 +78,9 @@ module HotGlue
       @hawk_alarm = ""
       hawk_schema.each do |hawk_key,hawk_definition|
         hawk_root = hawk_definition[0]
-        hawk_scope = hawk_definition[1]
+        # hawk_scope = hawk_definition[1]
         begin
-          eval("hawk_root.#{hawk_scope}").find(modified_params[hawk_key.to_s])
+          eval("hawk_root").find(modified_params[hawk_key.to_s])
         rescue ActiveRecord::RecordNotFound => e
           @hawk_alarm << "You aren't allowed to set #{hawk_key.to_s} to #{modified_params[hawk_key.to_s]}. "
           modified_params.tap { |hs| hs.delete(hawk_key.to_s) }

data/lib/generators/hot_glue/markup_templates/erb.rb

@@ -139,9 +139,7 @@ module  HotGlue
 
       if @hawk_keys[assoc.foreign_key.to_sym]
         hawk_definition = @hawk_keys[assoc.foreign_key.to_sym]
-        hawk_root = hawk_definition[0]
-        hawk_scope = hawk_definition[1]
-        hawked_association = "#{hawk_root}.#{hawk_scope}"
+        hawked_association = hawk_definition.join(".")
       else
         hawked_association = "#{assoc.class_name}.all"
       end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -225,7 +225,7 @@ module HotGlue
         @singular = @singular.split("/").last
       end
 
-      @plural = options['plural'] || @singular + "s" # supply to override; leave blank to use default
+      @plural = options['plural'] || @singular.pluralize # respects what you set in inflections.rb, to override, use plural option
       @namespace = options['namespace'] || nil
 
 
@@ -235,9 +235,9 @@ module HotGlue
       @controller_build_folder = use_controller_name.underscore
       @controller_build_folder_singular = singular
 
-      if ! @controller_build_folder.ends_with?("s")
-        raise HotGlue::Error, "can't build with controller name #{@controller_build_folder} because it doesn't end with an 's'"
-      end
+      # if ! @controller_build_folder.ends_with?("s")
+      #   raise HotGlue::Error, "can't build with controller name #{@controller_build_folder} because it doesn't end with an 's'"
+      # end
 
       @auth = options['auth'] || "current_user"
       @auth_identifier = options['auth_identifier'] || (! @god && @auth.gsub("current_", "")) || nil
@@ -440,8 +440,12 @@ module HotGlue
             key = hawk_entry
             hawk_to = @auth
           end
+
           hawk_scope = key.gsub("_id", "").pluralize
-          @hawk_keys[key.to_sym] = [hawk_to, hawk_scope]
+          @hawk_keys[key.to_sym] = [hawk_to]
+          if @use_shorthand # only include the hawk scope if using the shorthand
+            @hawk_keys[key.to_sym] << hawk_scope
+          end
         end
 
         puts "HAWKING: #{@hawk_keys}"

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.5'
+    CURRENT = '0.5.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-27 00:00:00.000000000 Z
+date: 2023-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails