dog_biscuits 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0509c8a392aedb1d7f6d239fde0188a315e6ec74c8dcb3f3fbfe6b05c5ba38b5'
-  data.tar.gz: 33ebc3f71aa281cd9b6e0f8a79cadce50585c99217f0503703dd6bf9fc8e9709
+  metadata.gz: 71c03a6e89458b01913889f32d2b524be47258e9b88c707fd7e789b95d7aa1ee
+  data.tar.gz: 0a4cb9cc5f6a6e0b7262dbe969b0f81c367498833e0f9b748a576f77b646aff4
 SHA512:
-  metadata.gz: 1ad74c758a037d24a6976eb5fd06e556e4465f88e35dd117fd58434b19da40799cce6eea40d880f3496c81d74ccbe10dde926a4cccb50a3998c50d863ce23c8a
-  data.tar.gz: 482b542e04c1dc9d1b73b06f8f4eeb910c939212d6abdc3be4cf2db5f551846e6d0242bc73cb0091a049c64b5143f211dea06f9e5780a0fedd3e91d8e6f33dfa
+  metadata.gz: 84362a1e341973479f6cf4996970c866dcc98e5c57090879b4d72ae5696f4e2f821f443876d77666f3f496fc59f0aa6b19881fac211531193ce5c30386aec10e
+  data.tar.gz: 6f43da07453911a68d54d957dbf76ce2049ac5374e254b5feb93662d1467097223d4a11585e2eac4c7898c9d2139ac58641e1595e0410e92c722e862d5e1b79d

data/lib/dog_biscuits/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DogBiscuits
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

data/lib/generators/dog_biscuits/presenter/presenter_generator.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+require 'rails/generators'
+require 'rails/generators/model_helpers'
+
+class DogBiscuits::PresenterGenerator < Rails::Generators::NamedBase
+  include Rails::Generators::ModelHelpers
+  source_root File.expand_path('../../work/templates', __FILE__)
+
+  desc '
+This generator makes the following changes to your application:
+    The DogBiscuits Presenter generator makes the following changes to your application:
+    1. Creates the presenter
+       '
+
+  def banner
+    say_status("info", "Creating presenter for: #{class_name}", :blue)
+  end
+
+  # This is in a separate generator to try and get round the NameError on first run
+  #   caused when calling constantize on class_name (ie. the model class) in the template
+  def presenter_template
+    template('presenter.rb.erb', File.join('app/presenters/hyrax', class_path, "#{file_name}_presenter.rb"))
+    rescue NameError => e
+      say_status("error", e.message, :red)
+  end
+end

data/lib/generators/dog_biscuits/work/work_generator.rb

@@ -44,7 +44,11 @@ This generator makes the following changes to your application:
     say_status("info", "RUNNING rails generate hyrax:work #{class_name}", :blue)
     generate "hyrax:work #{class_name}", '-f'
   end
-
+  
+  def create_actor
+    template('actor.rb.erb', File.join('app/actors/hyrax/actors', class_path, "#{file_name}_actor.rb"))
+  end
+  
   def create_indexer
     if options[:skipmodel]
       say_status("info", "SKIPPING INDEXER GENERATION", :blue)
@@ -52,7 +56,7 @@ This generator makes the following changes to your application:
       template('indexer.rb.erb', File.join('app/indexers', class_path, "#{file_name}_indexer.rb"))
     end
   end
-
+  
   def create_model
     if options[:skipmodel]
       say_status("info", "SKIPPING MODEL GENERATION", :blue)
@@ -60,15 +64,15 @@ This generator makes the following changes to your application:
       template('model.rb.erb', File.join('app/models/', class_path, "#{file_name}.rb"))
     end
   end
-
-  def create_presenter
-    template('presenter.rb.erb', File.join('app/presenters/hyrax', class_path, "#{file_name}_presenter.rb"))
+  
+  def create_form
+    template('form.rb.erb', File.join('app/forms/hyrax', class_path, "#{file_name}_form.rb"))
   end
-
-  def create_actor
-    template('actor.rb.erb', File.join('app/actors/hyrax/actors', class_path, "#{file_name}_actor.rb"))
+  
+  def create_presenter
+    generate "dog_biscuits:presenter #{class_name}", '-f'
   end
-
+  
   def create_attribute_rows
     attributes_file = "app/views/hyrax/#{file_name.pluralize}/_attribute_rows.html.erb"
     copy_file '_attribute_rows.html.erb', attributes_file
@@ -85,12 +89,6 @@ This generator makes the following changes to your application:
   def imagify
     generate "dog_biscuits:imagify #{class_name}", '-f' if File.exist?('config/initializers/version.rb') && File.read('config/initializers/version.rb').include?('Hyku')
   end
-  
-  # Sometimes we see a name error NameError because *_form.rb references the Model which hasn't yet been loaded
-  #  rescue doesn't help, so run this last to ensure files are all in place before the error
-  def create_form
-    template('form.rb.erb', File.join('app/forms/hyrax', class_path, "#{file_name}_form.rb"))
-  end
 
   def display_readme
     readme 'README'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dog_biscuits
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Julie Allinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyrax
@@ -437,6 +437,7 @@ files:
 - lib/generators/dog_biscuits/imagify_generator.rb
 - lib/generators/dog_biscuits/install_generator.rb
 - lib/generators/dog_biscuits/locales_generator.rb
+- lib/generators/dog_biscuits/presenter/presenter_generator.rb
 - lib/generators/dog_biscuits/schema_org_generator.rb
 - lib/generators/dog_biscuits/templates/_date_template.html.erb
 - lib/generators/dog_biscuits/templates/app/controllers/catalog_controller.rb
@@ -504,7 +505,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: DogBiscuits provides re-usable models, vocabularies and other services for