cookbook 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66fccc09592729e8aab5d9403f01231956d438110e706976b10c5bbfd30d7984
-  data.tar.gz: 5914fed8d04d5db8fd409e22e627f8f0461a4908a1c6fa21fd328c5d042da7ee
+  metadata.gz: ed17e18fbc21b1e5cd13d56061cbfb70cfa37390463f3b066c00216d990f791d
+  data.tar.gz: 6f027dbee389ea0ed9b33ded8a68aeaa9a941a1ee74b7ccb23600e555105ee5e
 SHA512:
-  metadata.gz: 8db914804526e40973d712443bdf7d5d096b8e8a838bf0a80590dfb5cf95d937b5e2d95b419fcf24d4c1841464b776aa4723ad35c30a51b7e9f97fa5ddc0e659
-  data.tar.gz: 4e848e7186bb761911e2bda14ef95587c0b6d1323cbc0a2a2be0edc25411a9bf4c4030cc90ca005a4771b3b1fcf86b61ed32b02ee8c2b90624bd34ce8806c127
+  metadata.gz: 4944c3707a8612da91fee783427a50500de9bc3a03f3ae13395f29fb2124175222fb2f22f0f0de28df92bdf15444ed02e359e91c5f5d26ef2a5371c93d36b60a
+  data.tar.gz: ed9430324055b96146b3480f570403e42117e77d5a7594805e01f1391076d5e3739e163f0d0a6868f50d7a7bc5546c09ca905df5b4b744fe9470d10bff7e7fce

data/Gemfile

@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 gem 'rails', '>= 6', '< 7'
 
 gem 'haml-rails', '>= 2.0', '< 3'
-gem 'sass-rails', '>= 6', '< 7'
+gem 'sass-rails', '>= 5', '< 7'
 
 gem 'cancancan', '>= 3.3', '< 4'
 

data/Gemfile.lock

@@ -155,18 +155,6 @@ GEM
       rdoc
       semver
     jwt (2.2.3)
-    kaminari (1.2.1)
-      activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.1)
-      kaminari-activerecord (= 1.2.1)
-      kaminari-core (= 1.2.1)
-    kaminari-actionview (1.2.1)
-      actionview
-      kaminari-core (= 1.2.1)
-    kaminari-activerecord (1.2.1)
-      activerecord
-      kaminari-core (= 1.2.1)
-    kaminari-core (1.2.1)
     loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -347,7 +335,6 @@ DEPENDENCIES
   faker
   haml-rails (>= 2.0, < 3)
   juwelier (~> 2.1.0)
-  kaminari (>= 1.2.1, < 2)
   puma (>= 4.3, < 5)
   rails (>= 6, < 7)
   rspec-html-matchers
@@ -355,7 +342,7 @@ DEPENDENCIES
   rubocop
   rubocop-rails
   rubocop-rspec
-  sass-rails (>= 6, < 7)
+  sass-rails (>= 5, < 7)
   shoulda
   shoulda-matchers (>= 4.3, < 5)
   simple_form (>= 5.1, < 6)

data/README.md

@@ -3,8 +3,6 @@ Works Cited allows you to add a list of the works cited in ActiveRecord objects,
 
 Works Cited can be configured to use CanCanCan to authorize the editing of citations. This makes it easy for you to control access.
 
-Works Cited does not require, but is compatible with Rails Admin.
-
 ## Installation
 Add this line to your application's Gemfile:
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.5

data/app/models/cookbook/use.rb

@@ -1,17 +1,37 @@
 # frozen_string_literal: true
+require 'pp'
 
 module Cookbook
   # Cookbook::Use is basically a linking table with extra information.
   class Use < ApplicationRecord
+    attr_accessor(:used_in_tables)
+
     # Relationships
-    belongs_to :use_in, polymorphic: true
-    belongs_to :use_of, polymorphic: true
+    belongs_to :use_in, polymorphic: true, inverse_of: :uses
+    belongs_to :use_of, polymorphic: true, inverse_of: :uses
+
+    class << self
+      def add_use_of(table_sym)
+        singular = table_sym.to_s.singularize
+        model_name = singular.classify.constantize.to_s
+        belongs_to singular.to_sym, class_name: model_name, foreign_key: :use_of_id, inverse_of: :uses, optional: true
+      end
 
-    # Scopes
-    scope :recipe_uses, -> { where use_in_type: 'Recipe' }
-    scope :ingredient_uses, -> { where use_of_type: 'Ingredient' }
+      def add_use_in(table_sym)
+        singular = table_sym.to_s.singularize
+        model_name = singular.classify.constantize.to_s
+        belongs_to singular.to_sym, class_name: model_name, foreign_key: :use_in_id, inverse_of: :uses, optional: true
+      end
+    end
 
     # Methods
+    def object_label
+      return use_of.name if use_of.respond_to?(:name)
+      return use_of.title if use_of.respond_to?(:title)
+
+      super
+    end
+
     def quantity_with_unit
       [quantity, unit].compact.join(' ')
     end
@@ -26,11 +46,9 @@ module Cookbook
     if defined?(RailsAdmin)
       rails_admin do
         visible false
+        object_label_method { :object_label }
         edit do
           include_all_fields
-          field :use_in do
-            visible false
-          end
         end
       end
     end

data/cookbook.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cookbook 0.1.1 ruby lib
+# stub: cookbook 0.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cookbook".freeze
-  s.version = "0.1.1"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "source_code_uri" => "http://github.com/gemvein/cookbook" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Loren Lundgren".freeze]
-  s.date = "2021-09-13"
+  s.date = "2021-09-21"
   s.description = "Cookbook allows you to associate instructions with components in a cross referenced way. Good for cooking recipes or an instruction manual for DIY projects.".freeze
   s.email = "loren.lundgren@gmail.com".freeze
   s.executables = ["rails".freeze]
@@ -192,7 +192,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>.freeze, [">= 6", "< 7"])
       s.add_runtime_dependency(%q<haml-rails>.freeze, [">= 2.0", "< 3"])
-      s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 6", "< 7"])
+      s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 5", "< 7"])
       s.add_runtime_dependency(%q<cancancan>.freeze, [">= 3.3", "< 4"])
       s.add_runtime_dependency(%q<simple_form>.freeze, [">= 5.1", "< 6"])
       s.add_runtime_dependency(%q<vanilla_nested>.freeze, [">= 1.3", "< 2"])
@@ -210,7 +210,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rails>.freeze, [">= 6", "< 7"])
       s.add_dependency(%q<haml-rails>.freeze, [">= 2.0", "< 3"])
-      s.add_dependency(%q<sass-rails>.freeze, [">= 6", "< 7"])
+      s.add_dependency(%q<sass-rails>.freeze, [">= 5", "< 7"])
       s.add_dependency(%q<cancancan>.freeze, [">= 3.3", "< 4"])
       s.add_dependency(%q<simple_form>.freeze, [">= 5.1", "< 6"])
       s.add_dependency(%q<vanilla_nested>.freeze, [">= 1.3", "< 2"])
@@ -229,7 +229,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rails>.freeze, [">= 6", "< 7"])
     s.add_dependency(%q<haml-rails>.freeze, [">= 2.0", "< 3"])
-    s.add_dependency(%q<sass-rails>.freeze, [">= 6", "< 7"])
+    s.add_dependency(%q<sass-rails>.freeze, [">= 5", "< 7"])
     s.add_dependency(%q<cancancan>.freeze, [">= 3.3", "< 4"])
     s.add_dependency(%q<simple_form>.freeze, [">= 5.1", "< 6"])
     s.add_dependency(%q<vanilla_nested>.freeze, [">= 1.3", "< 2"])

data/lib/cookbook/mixins/acts_as_use_of.rb

@@ -11,10 +11,28 @@ module Cookbook
         include InstanceMethods
 
         self.used_in = model_symbols
+        Cookbook::Use.add_use_in(table_name.to_sym)
 
         # Relationships
-        has_many :uses, as: :use_in, class_name: 'Cookbook::Use'
+        has_many :uses, as: :use_in, class_name: 'Cookbook::Use', inverse_of: :use_in
+        # Used only as a setter, not a getter
+        accepts_nested_attributes_for :uses, reject_if: :all_blank, allow_destroy: true
         associate_used_in
+
+        used_in.each do |table_sym|
+          singular = table_sym.to_s.singularize
+          model = singular.classify.constantize
+          equals_method_symbol = "#{singular}_uses_attributes=".to_sym
+          define_method(equals_method_symbol) do |values|
+            items = []
+            values.each_pair do |key, value|
+              value['use_in'] = self
+              value['use_of'] = model.find_by(id: value['use_of_id'])
+              items << value
+            end
+            self.uses_attributes = items
+          end
+        end
       end
 
       # Extended by has_cookbook mixin
@@ -27,20 +45,31 @@ module Cookbook
             model = table_sym.to_s.classify.constantize
             name = model.model_name.to_s
             uses_symbol = "#{model.model_name.param_key}_uses".to_sym
+            singular_symbol = table_sym.to_s.singularize.to_sym
 
             has_many uses_symbol, lambda {
               where(use_of_type: name)
-            }, as: :use_in, class_name: 'Cookbook::Use'
+            }, as: :use_in, class_name: 'Cookbook::Use', inverse_of: singular_symbol
+
+            # Used only as a getter, not a setter
             accepts_nested_attributes_for uses_symbol, reject_if: :all_blank, allow_destroy: true
 
-            has_many table_sym, through: :uses, source: :use_of, source_type: name
+            has_many table_sym, through: uses_symbol, source: :use_of, source_type: name
 
             if defined?(RailsAdmin)
               rails_admin do
+                include_all_fields
                 field :uses do
                   visible false
                 end
                 tables.each do |table_sym|
+                  singular = table_sym.to_s.singularize
+                  uses_symbol = "#{singular}_uses".to_sym
+                  field uses_symbol do # Show only on reload
+                    visible do
+                      !bindings[:object].new_record?
+                    end
+                  end
                   field table_sym do # We don't want these associations to show
                     visible false
                   end

data/lib/cookbook/mixins/acts_as_used_in.rb

@@ -10,20 +10,38 @@ module Cookbook
         extend ClassMethods
         include InstanceMethods
 
-        self.uses_of = model_symbols
+        self.use_of = model_symbols
         self.label_method = :name
+        Cookbook::Use.add_use_of(table_name.to_sym)
 
         # Relationships
-        has_many :uses, as: :use_of, class_name: 'Cookbook::Use'
+        has_many :uses, as: :use_of, class_name: 'Cookbook::Use', inverse_of: :use_of
         associate_uses_of
+
+        if defined?(RailsAdmin)
+          rails_admin do
+            field :uses do
+              visible false
+            end
+            self.use_of.each do |table_sym| # We don't want these associations to show
+              table_uses_sym = "#{table_sym.to_s.singularize}_uses".to_sym
+              field table_uses_sym do
+                visible false
+              end
+              field table_sym do
+                visible false
+              end
+            end
+          end
+        end
       end
 
       # Extended by acts_as_used_in mixin
       module ClassMethods
-        attr_accessor :uses_of, :label_method
+        attr_accessor :label_method, :use_of
 
         def associate_uses_of
-          uses_of.each do |table_sym|
+          self.use_of.each do |table_sym|
             model = table_sym.to_s.classify.constantize
             name = model.model_name.to_s