named_variant 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e107bb63fce06c5a6b8a7586d1611a5c895d0e9024d8673d91f81b0dd0317457
-  data.tar.gz: 577d1773371f445ad842febe0461d154452eb80072e5c42c95449d3ef0849d0f
+  metadata.gz: 368f88420ff308175a8b21b0e8f50134ff428b610b980bc622b2bc376d6224ef
+  data.tar.gz: c3e86db5681154bb1b94bed65acf8c26ac92bf93d28019d7dc933bc16dbe52ef
 SHA512:
-  metadata.gz: b866434ab12f26823a89081dfa19b2d508d97fbddd8920ec7630fc525dd653b7c8b3e9fafd15c4239fd71023a34a2e73c07bf6d49940a2d3832d5638e168701a
-  data.tar.gz: f7481afb25a4b285975ff5a009c9fa358de68a57ef724aa6a377ecc92d31ac5ffd1a09f0083becaf8da2ad624e5dcaab29f7c1d153b7dc98f0acb0343dd8542b
+  metadata.gz: 50422446c29f354b76c9cbb452771954d4172b1478d878c4c9d1f94664af7eb5a12c588801b0f7908d223aa25419b6deb190f9148866804ece9571188ca6fae2
+  data.tar.gz: 5014ba51e8e8864a0ece7b7dbb2d8e165f73e1b9a7311f9e68ce55b9d386f0d6ea9092c4bb3f9e9323a736d90f6c05eed0da58ebc8471668c8267ebfaeff8c63

data/lib/named_variant.rb

@@ -1,15 +1,25 @@
-require "named_variant/railtie"
-
 module NamedVariant
   mattr_reader :named_variants, default: {}
 
+  def self.find_named_variant_for!(klass: nil, sym:)
+    # NOTE: name params
+    named_variants["#{klass}/#{sym}"] || named_variants[sym.to_s] || raise(VariantNotFound, "class: #{klass}, sym: #{sym}")
+  end
+
+  def self.add_variant(name, opts)
+    named_variants[name.to_s] = Variant.new(opts)
+  end
+
+  class VariantNotFound < StandardError
+  end
+
   module VariantExtension
     # prepend ActiveStorage::Blob::Representable#variant
     # https://github.com/rails/rails/blob/3c823271af52a61e825123def170fe2187057577/activestorage/app/models/active_storage/blob/representable.rb#L28
     def variant(args)
       if args.is_a?(Symbol)
         # self is ActiveStorage::Attached::One
-        named_variant = ::NamedVariant.find_named_variant_for(klass: self.record.class, sym: args) || raise(VariantNotFound)
+        named_variant = ::NamedVariant.find_named_variant_for!(klass: self.record.class, sym: args)
         return super(named_variant.to_h)
       end
 
@@ -22,18 +32,7 @@ module NamedVariant
       ::NamedVariant.add_variant("#{self}/#{name}", opts) ## key looks like: User/xsmall
     end
   end
-
-  def self.find_named_variant_for(klass: nil, sym:)
-    # NOTE: name params
-    named_variants["#{klass}/#{sym}"] || named_variants[sym.to_s]
-  end
-
-  def self.add_variant(name, opts)
-    named_variants[name.to_s] = Variant.new(opts)
-  end
-
-  class VariantNotFound < StandardError
-  end
 end
 
 require "named_variant/variant"
+require "named_variant/railtie"

data/lib/named_variant/railtie.rb

@@ -2,6 +2,7 @@ module NamedVariant
   class Railtie < ::Rails::Railtie
     ActiveSupport.on_load(:active_record) do
       ActiveRecord::Base.extend ::NamedVariant::ActiveRecordExtension
+      ActiveStorage::Attachment.prepend ::NamedVariant::VariantExtension
     end
 
     config.after_initialize do

data/lib/named_variant/version.rb

@@ -1,3 +1,3 @@
 module NamedVariant
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: named_variant
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Yukito Ito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: image_processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="