effective_assets 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86a59f4d74f4beca65e775b0635ee72eaa830aa
-  data.tar.gz: 5575f2a0e62e9f0dff6f5167393b1d111253cec7
+  metadata.gz: 160c04b9bda2f5142520959215381c7b8d8b2f2b
+  data.tar.gz: 5bbf8413fae92e984a7a7477afbce819cfd7ea86
 SHA512:
-  metadata.gz: 987b187eaf4975516d26945239e00cbf860d090fd00fae9e514dc42287d7df0ef97f3d65f94c2f88901396e8f072b4b09462db849a50b136a74c0b2d60fc80d6
-  data.tar.gz: 3ed41d5c9ef2267665c3b22bb4df85deb97c461f26dcd36ec0861d03c7799f4d70a5a087d0a9d11158a020b46bf0d8d5743b0bbc866604f2b1fe998d5bb712bd
+  metadata.gz: e7bed61b177038a1b442b8d1e3495d27b29b51f696dc49109c58dd596ba42da5fbbadfcce20cf1f45c91bac46f9dbaa4b656e3438894bdb286ff03cb0b7e4f17
+  data.tar.gz: 41995bd175a697e1cb2ba902519982575b9a425128e59d5739eed7fa4414a953ca915dbc05503c7d4503c061b0495c6cc09e706420867f49a6566db8d15ac77c

data/lib/effective_assets/engine.rb

@@ -25,6 +25,11 @@ module EffectiveAssets
       end
     end
 
+    # Set up our default configuration options.
+    initializer "effective_assets.defaults", :before => :load_config_initializers do |app|
+      eval File.read("#{config.root}/lib/generators/templates/effective_assets.rb")
+    end
+
     initializer "effective_assets.append_precompiled_assets" do |app|
       Rails.application.config.assets.precompile += ['effective_assets.js', 'effective_assets_iframe.js', 'effective_assets_iframe.css', 'spinner.gif']
     end

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.2.5'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/lib/generators/templates/effective_assets.rb

@@ -4,7 +4,7 @@ EffectiveAssets.setup do |config|
   config.assets_table_name = :assets
   config.attachments_table_name = :attachments
 
-  config.uploader = AssetUploader   # Must extend from EffectiveAssetsUploader
+  config.uploader = AssetUploader if defined?(AssetUploader)   # Must extend from EffectiveAssetsUploader
 
   # Authorization Method
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails