uploadcare-rails 0.4.2 → 0.5

data/app/assets/javascripts/uploadcare.js

@@ -1 +1 @@
-// = require ./uploadcare-0.6.9.2
+// = require ./uploadcare-0.8

data/lib/uploadcare/rails/active_record.rb

@@ -1,3 +1,5 @@
+require 'uploadcare/rails/file'
+
 module Uploadcare
   module Rails
     module ActiveRecord
@@ -8,24 +10,15 @@ module Uploadcare
           force_autostore: false
         }.update options
 
-        get_uuid = lambda do |attributes|
-          re = /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/i
-          m = re.match(attributes[attribute.to_s])
-          if m.nil?
-            nil
-          else
-            m[0]
-          end
-        end
-
         define_method "#{attribute}" do
-          uuid = get_uuid.call(attributes)
-          return nil unless uuid
+          cdn_url = attributes[attribute.to_s]
+          return nil unless cdn_url
 
           if instance_variable_defined?("@#{attribute}_cached")
             instance_variable_get("@#{attribute}_cached")
           else
-            file_data = ::Rails.application.config.uploadcare.api.file(uuid)
+            api = ::Rails.application.config.uploadcare.api
+            file_data = File.new(api, cdn_url)
             instance_variable_set("@#{attribute}_cached", file_data)
             file_data
           end
@@ -35,13 +28,17 @@ module Uploadcare
           after_save "store_#{attribute}"
 
           define_method "store_#{attribute}" do
-            uuid = get_uuid.call(attributes)
+            re = /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/i
+            m = re.match(attributes[attribute.to_s])
+            return unless m && m[0]
+
+            uuid = m[0]
             stored = ::Rails.cache.exist?(
               "uploadcare.file.#{uuid}.store",
               force: opts[:force_autostore]
             )
              unless stored
-              send(attribute).store
+              send(attribute).api.store
               ::Rails.cache.write("uploadcare.file.#{uuid}.store", true)
             end
           end

data/lib/uploadcare/rails/file.rb

@@ -0,0 +1,24 @@
+module Uploadcare
+  module Rails
+    class File
+
+      def initialize(api, cdn_url)
+        @api = api
+        @cdn_url = cdn_url
+      end
+
+      def cdn_url(*operations)
+        @api.cdn_url(@cdn_url, *operations)
+      end
+
+      alias_method :public_url, :cdn_url
+
+      def api
+        @file ||= @api.file(@cdn_url)
+      end
+
+      alias_method :info, :api
+
+    end
+  end
+end

data/lib/uploadcare/rails/settings.rb

@@ -6,7 +6,7 @@ module Uploadcare
         settings = {
           :public_key => 'demopublickey',
           :private_key => 'demoprivatekey',
-          :widget_version => '0.6.9.2'
+          :widget_version => '0.8'
         }.update(settings)
         settings.each do |k, v|
           send "#{k}=", v

data/lib/uploadcare/rails/version.rb

@@ -1,5 +1,5 @@
 module Uploadcare
   module Rails
-    VERSION = "0.4.2"
+    VERSION = "0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadcare-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -98,11 +98,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/uploadcare-0.6.9.2.js
+- app/assets/javascripts/uploadcare-0.8.js
 - app/assets/javascripts/uploadcare.js
 - lib/uploadcare/rails/action_view.rb
 - lib/uploadcare/rails/active_record.rb
 - lib/uploadcare/rails/engine.rb
+- lib/uploadcare/rails/file.rb
 - lib/uploadcare/rails/settings.rb
 - lib/uploadcare/rails/simple_form.rb
 - lib/uploadcare/rails/version.rb
@@ -124,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -518698960582409353
+      hash: 4094460784775535100
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -518698960582409353
+      hash: 4094460784775535100
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24