po_box 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b10bd76b362d28e5cc7d9c09eda401a900209a05637ba7ff6155228c08e18b9
-  data.tar.gz: 5bbe38a406dfd5635b322ca98838e2f58cfe7e556f0dd19629daa5021c541086
+  metadata.gz: cf5765334ed345c096a6e2432f6775772afc81d3830e9d668e3df23fb782a45f
+  data.tar.gz: bb13be4eaf786de61adf885bb0b3bc0df69c6740f3a94b5067512465c73d656c
 SHA512:
-  metadata.gz: d59fc6330e0dab345da2e9c7281036138965239a8d1a8a560f274caeaba48da76031c182068dfe888541f6eefee2954142a00144c686406383d3eaaf2be4f9f8
-  data.tar.gz: d3512b157ab338591529e9de8a4036df12fa58db8697206b6d94ec5795364caeca313469e81d2441ea77c222b648d859fb2594b1ccee938c023608d675cb8d98
+  metadata.gz: 688da89cf7a2dc81c270580a85ebf838aeb9209c14644ccb297dd90faa81743a3631981b43f057a3637e484bb6ea88d1f3b5f19baa249fc3823c8436410854d1
+  data.tar.gz: 9c82e7fdbd57649e2f2e0cdd93d56ffa3532216dcc2bd9df123d3c8f79e5340acfed35acb0c606b3b86cf9dbc7365e9d7c807e774f3ab34328db6a6087d4f181

data/app/controllers/po_box/emails_controller.rb

@@ -52,7 +52,7 @@ module PoBox
     def set_inbox
       @inbox = Inbox.find(params[:inbox_id])
     rescue ActiveRecord::RecordNotFound
-      redirect_to inboxes_path, notice: "Inbox not found"
+      redirect_to po_box_inboxes_path, notice: "Inbox not found"
     end
 
     # Use callbacks to share common setup or constraints between actions.

data/app/controllers/po_box/inboxes_controller.rb

@@ -42,7 +42,7 @@ module PoBox
     private
 
     def inbox_params
-      params.require(:inbox).permit(:name, :address)
+      params.require(:inbox).permit(:emailable_type, :emailable_id, :address)
     end
 
     def set_inbox

data/app/models/concerns/po_box/emailable.rb

@@ -5,13 +5,13 @@ module PoBox
     included do
       has_many :inboxes, as: :emailable, class_name: "PoBox::Inbox", dependent: :destroy
 
-      after_create_commit :set_inbox
+      after_create_commit :generate_inbox
 
       accepts_nested_attributes_for :inboxes, allow_destroy: true
 
       private
 
-      def set_inbox
+      def generate_inbox
         return if inboxes.any?
 
         inbox_address = if email.present?
@@ -23,7 +23,7 @@ module PoBox
         inbox = inboxes.new
         loop do
           inbox.address = inbox_address
-          break unless PoBox.emailable_class.joins(:inboxes).where(po_box_inboxes: {address: inbox.address}).exists?
+          break unless PoBox::Inbox.find_by(address: inbox.address).present?
         end
 
         save

data/app/models/po_box/application_record.rb

@@ -1,5 +1,18 @@
 module PoBox
-  class ApplicationRecord < ActiveRecord::Base
+  class ApplicationRecord < ::ActiveRecord::Base
     self.abstract_class = true
+
+    def self.sort_by_params(column, direction)
+      sortable_column = column.presence_in(sortable_columns) || "created_at"
+      order(sortable_column => direction)
+    end
+
+    # Returns an array of sortable columns on the model
+    # Used with the Sortable controller concern
+    #
+    # Override this method to add/remove sortable columns
+    def self.sortable_columns
+      @sortable_columns ||= columns.map(&:name)
+    end
   end
 end

data/app/models/po_box/email.rb

@@ -7,5 +7,7 @@ module PoBox
     validates :from, presence: true
 
     delegate :raw_source, to: :body
+
+    scope :for_emailable, ->(emailable) { joins(:inbox).where(po_box_inboxes: {emailable: emailable}) }
   end
 end

data/app/models/po_box/inbox.rb

@@ -2,6 +2,8 @@ module PoBox
   class Inbox < ApplicationRecord
     belongs_to :emailable, polymorphic: true, class_name: PoBox.emailable_class.to_s
 
+    validates :address, presence: true, uniqueness: true
+
     has_many :emails, class_name: "PoBox::Email", dependent: :destroy
 
     define_method PoBox.emailable_class.to_s.underscore do

data/app/views/po_box/inboxes/_form.html.erb

@@ -9,6 +9,11 @@
       </ul>
     </div>
   <% end %>
+  <div>
+    <%= form.label "Emailable ID", style: "display: block" %>
+    <%= form.number_field :emailable_id %>
+    <%= form.hidden_field :emailable_type, value: PoBox.emailable_class %>
+  </div>
   <div>
     <%= form.label :address, style: "display: block" %>
     <%= form.text_field :address %>

data/lib/po_box/version.rb

@@ -1,3 +1,3 @@
 module PoBox
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: po_box
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Leo Policastro