attachinary 1.2.4 → 1.2.5

data/lib/assets/javascripts/attachinary.js.coffee

@@ -23,7 +23,7 @@
 
 
   $.fn.attachinary = (options) ->
-    settings = $.extend $.attachinary.config, options
+    settings = $.extend {}, $.attachinary.config, options
 
     this.each ->
       $this = $(this)

data/lib/attachinary/version.rb

@@ -1,3 +1,3 @@
 module Attachinary
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attachinary
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70249438618820 !ruby/object:Gem::Requirement
+  requirement: &70094229434320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70249438618820
+  version_requirements: *70094229434320
 - !ruby/object:Gem::Dependency
   name: cloudinary
-  requirement: &70249438618000 !ruby/object:Gem::Requirement
+  requirement: &70094229433720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.41
   type: :runtime
   prerelease: false
-  version_requirements: *70249438618000
+  version_requirements: *70094229433720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70249438637960 !ruby/object:Gem::Requirement
+  requirement: &70094229433180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249438637960
+  version_requirements: *70094229433180
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70249438637360 !ruby/object:Gem::Requirement
+  requirement: &70094229452260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70249438637360
+  version_requirements: *70094229452260
 - !ruby/object:Gem::Dependency
   name: valid_attribute
-  requirement: &70249438636880 !ruby/object:Gem::Requirement
+  requirement: &70094229451260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249438636880
+  version_requirements: *70094229451260
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70249438636340 !ruby/object:Gem::Requirement
+  requirement: &70094229450100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249438636340
+  version_requirements: *70094229450100
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70249438635760 !ruby/object:Gem::Requirement
+  requirement: &70094229449600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249438635760
+  version_requirements: *70094229449600
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70249438635060 !ruby/object:Gem::Requirement
+  requirement: &70094229448760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70249438635060
+  version_requirements: *70094229448760
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70249438634120 !ruby/object:Gem::Requirement
+  requirement: &70094229448120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249438634120
+  version_requirements: *70094229448120
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70249438633380 !ruby/object:Gem::Requirement
+  requirement: &70094229447420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249438633380
+  version_requirements: *70094229447420
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70249438632400 !ruby/object:Gem::Requirement
+  requirement: &70094229446900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70249438632400
+  version_requirements: *70094229446900
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70249438631720 !ruby/object:Gem::Requirement
+  requirement: &70094229446460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249438631720
+  version_requirements: *70094229446460
 description: Attachments handler for Rails that uses Cloudinary for storage.
 email:
 - milovan.zogovic@gmail.com
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2396448173727924973
+      hash: -1238116149642080061
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,11 +197,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2396448173727924973
+      hash: -1238116149642080061
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: attachinary-1.2.4
+summary: attachinary-1.2.5
 test_files: []