has-attached 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/has-attached.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "has-attached"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-08-30"
+  s.date = "2012-09-24"
   s.description = "ActiveRecordSchema attachments with Paperclip"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [

data/lib/has-attached.rb

@@ -34,9 +34,11 @@ module HasAttached
       
       options[:url]  ||= "/attachments/:class/:id/:attachment/:style/:basename.:extension"
       options[:path] ||= ":rails_root/public/attachments/:class/:id/:attachment/:style/:basename.:extension"
-
-      @all_styles ||= (YAML.load_file(Rails.root.join("config", "styles.yml")) rescue {"styles" => {}})["styles"]      
-      options[:styles] = @all_styles.fetch(self.name.underscore, {}).fetch(name.to_s, {}).symbolize_keys
+      
+      unless options[:styles]
+        @all_styles ||= (YAML.load_file(Rails.root.join("config", "styles.yml")) rescue {"styles" => {}})["styles"]      
+        options[:styles] = @all_styles.fetch(self.name.underscore, {}).fetch(name.to_s, {}).symbolize_keys
+      end
       
       if Rails.env.production? && Rails.application.config.respond_to?(:upload_attachments_to_s3) && Rails.application.config.upload_attachments_to_s3
         options[:storage] = 's3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has-attached
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2369264994416249657
+      hash: -1252071158746481188
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: