morse_assetable 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30bc73733a56797cee4aa0d0191d4a9c02996c94
-  data.tar.gz: 2c9399be95617829dd16c2bf6a67497af44ed5c5
+  metadata.gz: cf85029cd3597c4c7c633860ca9e489081ea2a7f
+  data.tar.gz: a08b4e73e0a6a50e7e1bb04c709c575c2fec2976
 SHA512:
-  metadata.gz: f31b54cffe180e50ea6fbf1ad3ea7e6969bd8717f3c1dc8203a39344c51c0bb2884d1acbaf301e2806637354dd5e86d7ecddbc6fc06a534055437999c22a87c5
-  data.tar.gz: 5ba13a76528ca25efbee61f80ac10ed5956a3e45f00af92c15345dc80366073ac30aa250c88669f96f5ec02fd9a3bd7258cfac12d11b88cb8684c170c93af429
+  metadata.gz: 2e5ba0fd0dece34252779e57f0cb7d6aeec49228d35945ccd35f1048f3840b9602b91f89e22fb2b4de792e0e71884eaa9e266322d2501c7eb403c0ed5be11351
+  data.tar.gz: b378d37a3be204c2fd30fc7e174a84bbab3c945653fa4328ec2b7b798b4a8e8447796c51dfbef778e7127e939aa606d35bc1b70dd74bc9f49001563bce25d627

data/lib/morse_assetable.rb

@@ -1,180 +1,182 @@
+# MorseAssetable
 require "morse_assetable/version"
-module MorseAssetableViewHelpers
-  def asset_input(f, i, bn = nil)
-    return multiple_assets(i, f) unless bn
-    asset = i.send(bn)
-    render partial: 'cms/assets/partials/asset',
-           locals: { asset: asset,
-                     base_name: bn,
-                     f: f }
-  end
+module MorseAssetable # rubocop:disable Metrics/ModuleLength
+  module ViewHelpers
+    def asset_input(f, i, bn = nil)
+      return multiple_assets(i, f) unless bn
+      asset = i.send(bn)
+      render partial: 'cms/assets/partials/asset',
+             locals: { asset: asset,
+                       base_name: bn,
+                       f: f }
+    end
 
-  def multiple_assets(i, f)
-    render partial: 'cms/assets/partials/assets',
-           locals: { assets: i.assets3,
-                     f: f }
-  end
+    def multiple_assets(i, f)
+      render partial: 'cms/assets/partials/assets',
+             locals: { assets: i.assets,
+                       f: f }
+    end
 
-  def nice_asset(a, version = nil)
-    return unless a && a.attachment
-    image_url = a.attachment.url
-    image_url = a.attachment.versions[version].url if version
-    image_tag image_url, alt: a.alt
+    def nice_asset(a, version = nil)
+      return unless a && a.attachment
+      image_url = a.attachment.url
+      image_url = a.attachment.versions[version].url if version
+      image_tag image_url, alt: a.alt
+    end
   end
-end
-# MorseAssetable
-module MorseAssetable # rubocop:disable Metrics/ModuleLength
-  extend ActiveSupport::Concern
+  module ModelHelpers
+    extend ActiveSupport::Concern
 
-  included do
-    attachment_names.each do |name|
-      attr_accessor "#{name}_attachment".to_sym,
-                    "#{name}_attachment_remove".to_sym
-      next unless active_asset_column_names.any?
-      active_asset_column_names.each do |col|
-        attr_accessor "#{name}_attachment_#{col}".to_sym
+    included do
+      attachment_names.each do |name|
+        attr_accessor "#{name}_attachment".to_sym,
+                      "#{name}_attachment_remove".to_sym
+        next unless active_asset_column_names.any?
+        active_asset_column_names.each do |col|
+          attr_accessor "#{name}_attachment_#{col}".to_sym
+        end
       end
+
+      validate :process_attachments, unless: :new_record?
+      validate :process_multiple_attachments, unless: :new_record?
+
+      after_save :process_attachments
+      after_save :process_multiple_attachments
     end
 
-    validate :process_attachments, unless: :new_record?
-    validate :process_multiple_attachments, unless: :new_record?
+    # ClassMethods
+    module ClassMethods
+      def active_asset_column_names
+        asset_column_names - excluded_asset_column_names
+      end
+
+      def asset_column_names
+        Asset.column_names
+      end
 
-    after_save :process_attachments
-    after_save :process_multiple_attachments
-  end
+      def attachment_names
+        [:asset]
+      end
 
-  # ClassMethods
-  module ClassMethods
-    def active_asset_column_names
-      asset_column_names - excluded_asset_column_names
-    end
+      def excluded_asset_column_names
+        %w(id attachment assetable_id assetable_type created_at updated_at)
+      end
 
-    def asset_column_names
-      Asset.column_names
+      def multiple_attachment_names
+        [:downloadables]
+      end
     end
 
-    def attachment_names
-      [:asset]
+    private
+
+    def active_asset_column_names
+      self.class.active_asset_column_names
     end
 
-    def excluded_asset_column_names
-      %w(id attachment assetable_id assetable_type created_at updated_at)
+    def add_asset_data(a)
+      return unless active_asset_column_names.any?
+      active_asset_column_names.each do |col|
+        add_asset_field a, col
+      end
     end
 
-    def multiple_attachment_names
-      [:downloadables]
+    def add_asset_field(a, col)
+      n = "#{name}_attachment_#{col}".to_sym
+      return unless send(n).present?
+      a.send("#{col}=", send(n))
     end
-  end
 
-  private
+    def attachment_name(name)
+      "#{name}_attachment".to_sym
+    end
 
-  def active_asset_column_names
-    self.class.active_asset_column_names
-  end
+    def attachment_name_remove(name)
+      "#{name}_attachment_remove".to_sym
+    end
 
-  def add_asset_data(a)
-    return unless active_asset_column_names.any?
-    active_asset_column_names.each do |col|
-      add_asset_field a, col
+    def attachment_names
+      self.class.attachment_names
     end
-  end
 
-  def add_asset_field(a, col)
-    n = "#{name}_attachment_#{col}".to_sym
-    return unless send(n).present?
-    a.send("#{col}=", send(n))
-  end
+    def multiple_attachment_names
+      self.class.multiple_attachment_names
+    end
 
-  def attachment_name(name)
-    "#{name}_attachment".to_sym
-  end
+    def process_attachment(name)
+      n = attachment_name(name)
+      a = Asset.new(attachment: send(n), assetable: self)
+      add_asset_data(a)
+      if a.save
+        send("#{name}=", a)
+        send("#{n}=", nil)
+      else
+        errors.add(name, a.errors.full_messages.join(','))
+        false
+      end
+    end
 
-  def attachment_name_remove(name)
-    "#{name}_attachment_remove".to_sym
-  end
+    def process_attachment?(name)
+      n = attachment_name(name)
+      respond_to?(n) && send(n).present?
+    end
 
-  def attachment_names
-    self.class.attachment_names
-  end
+    def process_attachment_name(name)
+      process_attachment(name) if process_attachment?(name)
+      remove_attachment(name) if remove_attachment?(name)
+    end
 
-  def multiple_attachment_names
-    self.class.multiple_attachment_names
-  end
+    def process_attachments
+      return if attachment_names.empty?
+      attachment_names.map { |n| process_attachment_name n }
+    end
 
-  def process_attachment(name)
-    n = attachment_name(name)
-    a = Asset.new(attachment: send(n), assetable: self)
-    add_asset_data(a)
-    if a.save
-      send("#{name}=", a)
+    def remove_attachment(name)
+      return unless send(name).destroy
+      n = attachment_name_remove(name)
+      send("#{name}=", nil)
       send("#{n}=", nil)
-    else
-      errors.add(name, a.errors.full_messages.join(','))
-      false
     end
-  end
-
-  def process_attachment?(name)
-    n = attachment_name(name)
-    respond_to?(n) && send(n).present?
-  end
-
-  def process_attachment_name(name)
-    process_attachment(name) if process_attachment?(name)
-    remove_attachment(name) if remove_attachment?(name)
-  end
 
-  def process_attachments
-    return if attachment_names.empty?
-    attachment_names.map { |n| process_attachment_name n }
-  end
-
-  def remove_attachment(name)
-    return unless send(name).destroy
-    n = attachment_name_remove(name)
-    send("#{name}=", nil)
-    send("#{n}=", nil)
-  end
-
-  def remove_attachment?(name)
-    n = attachment_name_remove(name)
-    respond_to?(n) &&
-      send(n).present? &&
-      send(n).to_i > 0 &&
-      send(name).present?
-  end
+    def remove_attachment?(name)
+      n = attachment_name_remove(name)
+      respond_to?(n) &&
+        send(n).present? &&
+        send(n).to_i > 0 &&
+        send(name).present?
+    end
 
-  # rubocop:disable all
-  def process_multiple_attachments
-    return if multiple_attachment_names.empty?
-    multiple_attachment_names.each do |thing|
-      at = "#{thing.to_s.singularize}_attachment".to_sym
-      alt = "#{thing.to_s.singularize}_attachment_alt".to_sym
-      att = "#{thing.to_s.singularize}_attachment_title".to_sym
-      atr = "#{thing.to_s.singularize}_attachment_remove".to_sym
-      atu = "#{thing.to_s.singularize}_attachment_url".to_sym
-      if respond_to?(thing) && respond_to?(at) && send(at).present?
-        a = Asset.new(attachment: send(at), title: send(att), alt: send(alt), assetable_type: self.class.name, assetable_id: id, url: send(atu))
-        if a.alt.present? && a.title.blank?
-          a.title = a.alt
-        elsif a.alt.blank? && a.title.present?
-          a.alt = a.title
-        end
-        if a.save
-          send("#{at}=", nil)
-          send("#{alt}=", nil)
-          send("#{att}=", nil)
-          send("#{atr}=", nil)
-          send("#{atu}=", nil)
-          send("#{thing.to_s.pluralize.to_sym}=", send("#{thing.to_s.pluralize.to_sym}") + [a])
-        else
-          errors.add(thing, a.errors.full_messages.join(','))
-          return false
+    # rubocop:disable all
+    def process_multiple_attachments
+      return if multiple_attachment_names.empty?
+      multiple_attachment_names.each do |thing|
+        at = "#{thing.to_s.singularize}_attachment".to_sym
+        alt = "#{thing.to_s.singularize}_attachment_alt".to_sym
+        att = "#{thing.to_s.singularize}_attachment_title".to_sym
+        atr = "#{thing.to_s.singularize}_attachment_remove".to_sym
+        atu = "#{thing.to_s.singularize}_attachment_url".to_sym
+        if respond_to?(thing) && respond_to?(at) && send(at).present?
+          a = Asset.new(attachment: send(at), title: send(att), alt: send(alt), assetable_type: self.class.name, assetable_id: id, url: send(atu))
+          if a.alt.present? && a.title.blank?
+            a.title = a.alt
+          elsif a.alt.blank? && a.title.present?
+            a.alt = a.title
+          end
+          if a.save
+            send("#{at}=", nil)
+            send("#{alt}=", nil)
+            send("#{att}=", nil)
+            send("#{atr}=", nil)
+            send("#{atu}=", nil)
+            send("#{thing.to_s.pluralize.to_sym}=", send("#{thing.to_s.pluralize.to_sym}") + [a])
+          else
+            errors.add(thing, a.errors.full_messages.join(','))
+            return false
+          end
+        elsif respond_to?(atr) && send(atr).present? && send(atr).to_i > 0 && send(thing).present?
+          send(thing).destroy_all
         end
-      elsif respond_to?(atr) && send(atr).present? && send(atr).to_i > 0 && send(thing).present?
-        send(thing).destroy_all
       end
     end
+    # rubocop:enable all
   end
-  # rubocop:enable all
 end

data/lib/morse_assetable/version.rb

@@ -1,3 +1,3 @@
 module MorseAssetable
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morse_assetable
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Terry S
@@ -72,6 +72,7 @@ files:
 - bin/setup
 - lib/morse_assetable.rb
 - lib/morse_assetable/version.rb
+- morse_assetable-0.2.2.gem
 - morse_assetable.gemspec
 homepage: https://github.com/morsedigital/morse_assetable.git
 licenses: