meta_presenter 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ad2a5319203c66fddcad35088e1fafbed032ba0268d47dc7a5450935c5f7f9
-  data.tar.gz: fe1f7357f559f3246b972214e02c2084f3ab943c0ecc0db60ffdc34d1c882bb0
+  metadata.gz: 2520562652ee736cdd7cca496683fb093e0b8f6ef5935429504b819feb61991f
+  data.tar.gz: ab969767427ce4242ba5f70b144e277522d81c857b9393596dec839482c2aae9
 SHA512:
-  metadata.gz: 9365877877a78521bd8540624d6eb75e19375854cc4b295c1555c5d0c95504022242a1eb58dd9b6ce257c36660a83d89b70116c978cff3606763e4da8f0ebc00
-  data.tar.gz: 18382a4cfb689d8d605fec617528f3e5b11dca72ad42cf27f8fc29d047ec43614207a90350c440a0d8795006ece10d418b4e27f0acc201437b071065cae12367
+  metadata.gz: effeb19171c360f4bb06dcbef0779d60ef321c068a26544a941c33907b4875e5277eceb15dca065608ac4124aeafe00542dd1836ee6b10f3a22cfcb5c07a0d8d
+  data.tar.gz: b4c3959db506ec00f8579e791dd0bf0f76d2955837f2524a256941bc4d2cd6422ca8338464f71a251f21e6f955518047970e9ea57d4cda10451faf16b046df52

data/.travis.yml

@@ -11,14 +11,14 @@ rvm:
   - 2.4.0
   - 2.5.0
 gemfile:
-  - gemfiles/actionpack4.gemfile
-  - gemfiles/actionpack5.gemfile
+  - gemfiles/rails4.gemfile
+  - gemfiles/rails5.gemfile
 matrix:
   exclude:
     - rvm: 2.1.0
-      gemfile: gemfiles/actionpack5.gemfile
+      gemfile: gemfiles/rails5.gemfile
     - rvm: 2.2.0
-      gemfile: gemfiles/actionpack5.gemfile
+      gemfile: gemfiles/rails5.gemfile
 script: bundle exec rspec
 before_install:
   - gem install bundler -v '< 2'

data/Appraisals

@@ -3,15 +3,18 @@
 #  gem "actionpack", "3.0.0"
 #end
 
-appraise "actionpack4" do
+appraise "rails4" do
   gem "actionpack", "4.0.0"
+  gem "actionmailer", "4.0.0"
 end
 
-appraise "actionpack5" do
+appraise "rails5" do
   gem "actionpack", "5.0.0"
+  gem "actionmailer", "5.0.0"
 end
 
 # TODO: uncomment this once Rails 6 is released on April 30, 2019
-# appraise "actionpack6" do
+# appraise "rails6" do
 #   gem "actionpack", "6.0.0"
+#   gem "actionmailer", "6.0.0"
 # end

data/Gemfile.lock

@@ -2,11 +2,18 @@ PATH
   remote: .
   specs:
     meta_presenter (0.1.5)
-      actionpack (>= 3.0)
+      actionmailer (>= 4.0)
+      actionpack (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
     actionpack (5.2.2)
       actionview (= 5.2.2)
       activesupport (= 5.2.2)
@@ -20,6 +27,9 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
+      globalid (>= 0.3.6)
     activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -42,13 +52,18 @@ GEM
     diff-lcs (1.3)
     docile (1.3.1)
     erubi (1.8.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
     i18n (1.5.2)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     method_source (0.9.2)
+    mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nokogiri (1.10.1)

data/README.md

@@ -203,8 +203,10 @@ MetaPresenter supports Ruby >= 2.1 and ActionPack >= 4.0. If you'd like to help
 ## Specs
 To run the specs for the currently running Ruby version, run `bundle install` and then `bundle exec rspec`. To run specs for every supported version of ActionPack, run `bundle exec appraisal install` and then `bundle exec appraisal rspec`.
 
+## Gem release
+Make sure the specs pass, bump the version number in meta_presenter.gemspec, build the gem with `gem build meta_presenter.gemspec`. Then commit changes and tag the commit with the current release number with `git tag -a "vVersionNumberHere" -m "vVersionNumberHere"`. Push the commit with `git push`, then push the tags with `git push origin --tags`. Finally, push the gem with `gem push meta_presenter-version-number-here.gem`.
+
 ## TODO
-* tests for ActionMailer support
 * optional `rake meta_presenter:install` that generates the scaffolding for you. Or, you can manually create the files you want.
 * add support for layout-level presenters
 * add Rails 6 support once it comes out (hopefully just have to add a gemfiles/actionpack6.gemfile and it will run with the Appraisal suite)

data/gemfiles/rails4.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "4.0.0"
+gem "actionmailer", "4.0.0"
+
+group :development, :test do
+  gem "pry"
+  gem "rspec"
+  gem "builder"
+  gem "rb-readline"
+  gem "coveralls"
+end
+
+gemspec path: "../"

data/gemfiles/rails5.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "5.0.0"
+gem "actionmailer", "5.0.0"
+
+group :development, :test do
+  gem "pry"
+  gem "rspec"
+  gem "builder"
+  gem "rb-readline"
+  gem "coveralls"
+end
+
+gemspec path: "../"

data/lib/meta_presenter/builder.rb

@@ -31,10 +31,10 @@ module MetaPresenter
       end
     end
 
-    class NoPresenterClassDefinedError < NameError
+    class InvalidControllerError < NameError
       # Create a new error
-      def initialize(controller, action_name)
-        super("No presenter defined for #{controller.class.to_s}##{action_name}")
+      def initialize(controller)
+        super("You tried to present a #{controller.class.name} class, but only a Rails controller or mailer can be presented")
       end
     end
 
@@ -49,10 +49,6 @@ module MetaPresenter
         break if !klass.nil?
       end
 
-      if klass.nil?
-        raise NoPresenterClassDefinedError.new(controller, action_name)
-      end
-
       klass
     end
 
@@ -63,7 +59,13 @@ module MetaPresenter
     private
       def all_ancestors
         controller.class.ancestors.select do |ancestor|
-          ancestor <= ActionController::Base
+          if controller.class <= ActionController::Base
+            ancestor <= ActionController::Base
+          elsif controller.class <= ActionMailer::Base
+            ancestor <= ActionMailer::Base
+          else
+            raise InvalidControllerError.new(controller)
+          end
         end
       end
 

data/lib/meta_presenter/helpers.rb

@@ -1,5 +1,6 @@
 require 'meta_presenter/builder'
 require 'active_support/concern'
+require 'active_support/rescuable'
 
 module MetaPresenter
   # Including this module in your controller will give
@@ -34,7 +35,9 @@ module MetaPresenter
         @presenter ||= begin
           controller = self
           klass = MetaPresenter::Builder.new(controller, action_name).presenter_class
-          raise PresenterClassNotFoundError.new(controller, action_name) if klass == :undefined_presenter_class
+          if klass.nil?
+            raise PresenterClassNotFoundError.new(controller, action_name)
+          end
           klass.new(controller)
         end
       end

data/meta_presenter.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'meta_presenter'
-  s.version       = '0.1.5'
+  s.version       = '0.1.6'
   s.platform      = Gem::Platform::RUBY
   s.authors       = ['szTheory']
   s.description   = %q{Presenter pattern in your Rails controllers and actions}
@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.1.0'
 
-  s.add_dependency 'actionpack', '>= 3.0'
+  s.add_dependency 'actionpack', '>= 4.0'
+  s.add_dependency 'actionmailer', '>= 4.0'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'bundler'

data/spec/meta_presenter/builder_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
+# require 'ostruct'
 
 describe MetaPresenter::Builder do
   let(:controller_class) { ApplicationController }
-  let(:controller) { controller_class.new }
+  let(:controller) { controller_class.send(:new) }
   let(:action_name) { 'logs' }
   let(:object) { described_class.new(controller, action_name) }
 
@@ -44,6 +45,27 @@ describe MetaPresenter::Builder do
       end
     end
 
+    context "neither a controller nor a mailer" do
+      let(:controller_class) { OpenStruct }
+
+      before do
+        expect(controller_class < ActionController::Base).to_not be true
+        expect(controller_class < ActionMailer::Base).to_not be true
+      end
+
+      it { expect { subject }.to raise_error(MetaPresenter::Builder::InvalidControllerError) }
+    end
+
+    context "mailer" do
+      let(:controller_class) { ApplicationMailer }
+
+      before do
+        expect(controller_class < ActionMailer::Base).to be true
+      end
+
+      it { is_expected.to be Mailers::ApplicationPresenter }
+    end
+
     context "subclass of ApplicationController" do
       let(:controller_class) { PagesController }
 

data/spec/support/app/mailers/application_mailer.rb

@@ -0,0 +1,5 @@
+require 'action_mailer'
+
+class ApplicationMailer < ActionMailer::Base
+  include MetaPresenter::Helpers
+end

data/spec/support/app/presenters/mailers/application_presenter.rb

@@ -0,0 +1,4 @@
+module Mailers
+  class ApplicationPresenter < MetaPresenter::Base
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meta_presenter
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - szTheory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,8 @@ files:
 - gemfiles/.bundle/config
 - gemfiles/actionpack4.gemfile
 - gemfiles/actionpack5.gemfile
+- gemfiles/rails4.gemfile
+- gemfiles/rails5.gemfile
 - lib/meta_presenter.rb
 - lib/meta_presenter/base.rb
 - lib/meta_presenter/base/delegate_all_to.rb
@@ -154,9 +170,11 @@ files:
 - spec/support/app/controllers/application_controller.rb
 - spec/support/app/controllers/pages_controller.rb
 - spec/support/app/controllers/without_presenter_controller.rb
+- spec/support/app/mailers/application_mailer.rb
 - spec/support/app/presenters/admin/dashboard/inbox_presenter.rb
 - spec/support/app/presenters/admin/dashboard_presenter.rb
 - spec/support/app/presenters/application_presenter.rb
+- spec/support/app/presenters/mailers/application_presenter.rb
 - spec/support/app/presenters/pages/logs_presenter.rb
 - spec/support/app/presenters/pages/only_file_exists_presenter.rb
 - spec/support/app/presenters/pages_presenter.rb
@@ -198,9 +216,11 @@ test_files:
 - spec/support/app/controllers/application_controller.rb
 - spec/support/app/controllers/pages_controller.rb
 - spec/support/app/controllers/without_presenter_controller.rb
+- spec/support/app/mailers/application_mailer.rb
 - spec/support/app/presenters/admin/dashboard/inbox_presenter.rb
 - spec/support/app/presenters/admin/dashboard_presenter.rb
 - spec/support/app/presenters/application_presenter.rb
+- spec/support/app/presenters/mailers/application_presenter.rb
 - spec/support/app/presenters/pages/logs_presenter.rb
 - spec/support/app/presenters/pages/only_file_exists_presenter.rb
 - spec/support/app/presenters/pages_presenter.rb