locomotive_carrierwave 0.5.0.1.beta3 → 0.5.0.1

data/lib/carrierwave/storage/s3.rb

@@ -38,11 +38,11 @@ module CarrierWave
     # [:authenticated_read]   Any principal authenticated as a registered Amazon S3 user
     #                         is granted READ access.
     #
-    # You can change the generated url to a cnamed domain by setting the cname config:
+    # You can change the generated url to a cnamed domain by setting the cnamed config:
     #
     #     CarrierWave.configure do |config|
-    #       config.s3_cname = 'bucketname.domain.tld'
-    #       config.s3_bucket = 'bucketname' # only used when storing / deleting files
+    #       config.s3_cnamed = true
+    #       config.s3_bucket = 'bucketname.domain.tld'
     #     end
     #
     # Now the resulting url will be
@@ -122,7 +122,7 @@ module CarrierWave
 
         def public_url
           if cnamed?
-            ["http://#{cname}", path].compact.join('/')
+            ["http://#{bucket}", path].compact.join('/')
           else
             ["http://#{bucket}.s3.amazonaws.com", path].compact.join('/')
           end
@@ -137,7 +137,7 @@ module CarrierWave
           connection.put_object(bucket, path, file.read,
             {
               'x-amz-acl' => access_policy.to_s.gsub('_', '-'),
-              'Content-Type' => content_type,
+              'Content-Type' => content_type
             }.merge(@uploader.s3_headers)
           )
         end
@@ -165,12 +165,8 @@ module CarrierWave
 
       private
 
-        def cname
-          @uploader.s3_cname
-        end
-
         def cnamed?
-          !@uploader.s3_cname.nil?
+          @uploader.s3_cnamed
         end
 
         def access_policy
@@ -245,5 +241,3 @@ module CarrierWave
     end # S3
   end # Storage
 end # CarrierWave
-
-# module CarrierWave; module Storage; class S3 < Abstract; def connection; @connection ||= Fog::AWS::Storage.new(:aws_access_key_id => uploader.s3_access_key_id, :aws_secret_access_key => uploader.s3_secret_access_key, :host => uploader.s3_cnamed ? uploader.s3_bucket : nil); end; end; end; end

data/lib/carrierwave/uploader/configuration.rb

@@ -12,7 +12,7 @@ module CarrierWave
         add_config :s3_bucket
         add_config :s3_access_key_id
         add_config :s3_secret_access_key
-        add_config :s3_cname
+        add_config :s3_cnamed
         add_config :s3_headers
         add_config :cloud_files_username
         add_config :cloud_files_api_key

data/lib/carrierwave/uploader/rename.rb

@@ -14,13 +14,18 @@ module CarrierWave
       ##
       # Override this method in your uploader to check if the model has been updated.
       #
-      # Some comments about not working for sequel and datamapper, maybe...
       # === Returns
       #
       # [NilClass, Boolean] true if the model has been changed, false otherwise
       #
+      # === Examples
+      #
+      #     def stale_model?
+      #       model.folder_changed? # because store_dir is based on the folder property of the model
+      #     end
+      #
       def stale_model?
-        self.model.persisted? && self.model.send("#{self.mounted_as}_changed?") rescue false
+         false
       end
 
       def rename?

data/lib/carrierwave/uploader/versions.rb

@@ -29,7 +29,7 @@ module CarrierWave
         # [name (#to_sym)] name of the version
         # [&block (Proc)] a block to eval on this version of the uploader
         #
-        def version(name, options = {}, &block)
+        def version(name, &block)
           name = name.to_sym
           unless versions[name]
             versions[name] = Class.new(self)
@@ -39,10 +39,6 @@ module CarrierWave
               def #{name}
                 versions[:#{name}]
               end
-
-              def do_#{name}_version?
-                #{options[:if] || true}
-              end
             RUBY
           end
           versions[name].class_eval(&block) if block
@@ -68,14 +64,12 @@ module CarrierWave
       # [Hash{Symbol => CarrierWave::Uploader}] a list of uploader instances
       #
       def versions
-        unless @versions
-          @versions = {}
-          self.class.versions.each do |name, klass|
-            @versions[name] = klass.new(model, mounted_as)
-          end
+        return @versions if @versions
+        @versions = {}
+        self.class.versions.each do |name, klass|
+          @versions[name] = klass.new(model, mounted_as)
         end
-
-        @versions.clone.delete_if { |name, klass| !self.send("do_#{name}_version?".to_sym) }
+        @versions
       end
 
       ##
@@ -107,10 +101,9 @@ module CarrierWave
       #
       def url(*args)
         if(args.first)
-          name = args.first.to_sym
-          raise ArgumentError, "Version #{name.to_s} doesn't exist!" if versions[name].nil?
+          raise ArgumentError, "Version #{args.first} doesn't exist!" if versions[args.first.to_sym].nil?
           # recursively proxy to version
-          versions[name].url(*args[1..-1])
+          versions[args.first.to_sym].url(*args[1..-1])
         else
           super()
         end

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.5.0.1.beta3"
+  VERSION = "0.5.0.1"
 end

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: locomotive_carrierwave
 version: !ruby/object:Gem::Version 
-  hash: 62196493
-  prerelease: 8
+  hash: 101
+  prerelease: false
   segments: 
   - 0
   - 5
   - 0
   - 1
-  - beta
-  - 3
-  version: 0.5.0.1.beta3
+  version: 0.5.0.1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -19,11 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 +01:00
+date: 2010-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  name: activesupport
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,11 +34,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  type: :runtime
   requirement: *id001
-  name: activesupport
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: rails
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,11 +50,11 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  type: :development
   requirement: *id002
-  name: rails
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: rspec
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,11 +66,11 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :development
   requirement: *id003
-  name: rspec
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: fog
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,11 +82,11 @@ dependencies:
         - 3
         - 7
         version: 0.3.7
-  type: :development
   requirement: *id004
-  name: fog
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: cucumber
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,11 +96,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id005
-  name: cucumber
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: sqlite3-ruby
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,11 +110,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id006
-  name: sqlite3-ruby
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: dm-core
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -124,11 +124,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id007
-  name: dm-core
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: dm-validations
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -138,11 +138,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id008
-  name: dm-validations
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: dm-migrations
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -152,11 +152,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id009
-  name: dm-migrations
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: dm-sqlite-adapter
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -166,11 +166,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id010
-  name: dm-sqlite-adapter
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: sequel
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -180,11 +180,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id011
-  name: sequel
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: rmagick
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -194,11 +194,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id012
-  name: rmagick
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: RubyInline
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -208,11 +208,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id013
-  name: RubyInline
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: image_science
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -222,11 +222,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id014
-  name: image_science
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: mini_magick
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -237,29 +237,29 @@ dependencies:
         - 2
         - 1
         version: "2.1"
-  type: :development
   requirement: *id015
-  name: mini_magick
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: mongoid
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424091
+        hash: 62196417
         segments: 
         - 2
         - 0
         - 0
-        - rc
-        - 7
-        version: 2.0.0.rc.7
-  type: :development
+        - beta
+        - 17
+        version: 2.0.0.beta.17
   requirement: *id016
-  name: mongoid
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: bson_ext
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -269,11 +269,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id017
-  name: bson_ext
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: timecop
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -283,11 +283,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id018
-  name: timecop
 - !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  name: json
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -297,9 +297,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id019
-  name: json
 description: Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends.
 email: 
 - jonas.nicklas@gmail.com
@@ -372,18 +370,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: carrierwave
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby file upload library