dis 0.9.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9ec3b8500386221e40c1ea04e0b38e0d416f6d
-  data.tar.gz: 1b7ae3618b80c6d95b27a5ba832292c3cd035a45
+  metadata.gz: 8e3efb0078d31c5dad69adb12179ac307e07e44b
+  data.tar.gz: 568d166000b658f28b4456d1210117164b7d66d2
 SHA512:
-  metadata.gz: 186c74e43812f0e71ddfc36856106decb829607854bd819d5a51467cfeb3e19811fabd9bd755975bfdc50ee11971e96f19a847612da6e0aaf456078a453916fe
-  data.tar.gz: 54bc48092d38eca8edb24d727b5295c56ea9a7d31aed80432ac8ea4a9316eb14162d2333797c76ae8b280a5d55e5fcb4ab27c7652e221d2de1b486e6385b21cf
+  metadata.gz: 184a32e5b464fcc2a4f8598bf4773a2dd7bfc4ec950ce8624764a72ba64d67cdc0bec3f0c4cb430dc3b224cac141db56cc1f40951d8462782c53f83fc88a5024
+  data.tar.gz: 4f12596ecd11fbb0fa52af015021b90607d9fda21c2f6aada34057c6ea8b3e6f6222f29afde2d2e3825c88366b45a88bf2c45a75dbb5391d6713fc060285c962

data/README.md

@@ -19,11 +19,11 @@ It does not do any processing. The idea is to provide a simple foundation
 other gems can build on. If you are looking to handle uploaded images,
 check out [DynamicImage](https://github.com/elektronaut/dynamic_image).
 
-Requires Rails 4.1+ and Ruby 1.9.3+.
+Requires Rails 4.2+ and Ruby 1.9.3+.
 
 ## Documentation
 
-[Documentation on RubyDoc.info](http://rdoc.info/github/elektronaut/dis)
+[Documentation on RubyDoc.info](http://rdoc.info/gems/dis)
 
 ## Installation
 
@@ -86,7 +86,13 @@ The install generator will set you up with a local storage layer on disk,
 but this is configurable in `config/initializers/dis.rb`.
 
 You can have as many layers as you want, any storage provider
-[supported by Fog](http://fog.io/storage/) should work in theory.
+[supported by Fog](http://fog.io/storage/) should work in theory. Only the
+local storage is loaded by default, you'll have to manually require your provider.
+
+```ruby
+require 'fog/aws/storage'
+```
+
 Having a local layer first is a good idea, this will provide you
 with a cache on disk. Any misses will be filled from the next layer.
 
@@ -162,4 +168,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/dis.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
 require "digest/sha1"
-require "fog"
+require "fog/core"
+require "fog/local/storage"
 require "active_job"
 require "dis/errors"
 require "dis/jobs"

data/lib/dis/jobs/delete.rb

@@ -6,7 +6,7 @@ module Dis
     #
     # Handles delayed deletion of objects.
     #
-    #   Dis::Jobs::Delete.enqueue("documents", hash)
+    #   Dis::Jobs::Delete.perform_later("documents", hash)
     class Delete < ActiveJob::Base
       queue_as :dis
 
@@ -15,4 +15,4 @@ module Dis
       end
     end
   end
-end
+end

data/lib/dis/jobs/store.rb

@@ -6,7 +6,7 @@ module Dis
     #
     # Handles delayed storage of objects.
     #
-    #   Dis::Jobs::Store.enqueue("documents", hash)
+    #   Dis::Jobs::Store.perform_later("documents", hash)
     class Store < ActiveJob::Base
       queue_as :dis
 
@@ -15,4 +15,4 @@ module Dis
       end
     end
   end
-end
+end

data/lib/dis/model.rb

@@ -155,5 +155,10 @@ module Dis
     def dis_attribute(attribute_name)
       self.class.dis_attributes[attribute_name]
     end
+
+    # We don't want the data column when doing a partial write.
+    def keys_for_partial_write
+      super.reject { |a| a == "data" }
+    end
   end
-end
+end

data/lib/dis/model/class_methods.rb

@@ -5,7 +5,7 @@ module Dis
     module ClassMethods
       # Returns the mapping of attribute names.
       def dis_attributes
-        default_dis_attributes.merge(@dis_attributes || {})
+        default_dis_attributes.merge(@dis_attributes ||= {})
       end
 
       # Sets the current mapping of attribute names. Use this if you want to
@@ -25,7 +25,7 @@ module Dis
       #   class Document < ActiveRecord::Base; end
       #   Document.dis_type # => "documents"
       def dis_type
-        @dis_type || self.table_name
+        @dis_type ||= self.table_name
       end
 
       # Sets the storage type name.
@@ -60,4 +60,4 @@ module Dis
       end
     end
   end
-end
+end

data/lib/dis/storage.rb

@@ -32,7 +32,7 @@ module Dis
         require_writeable_layers!
         hash = store_immediately!(type, file)
         if layers.delayed.writeable.any?
-          Dis::Jobs::Store.enqueue(type, hash)
+          Dis::Jobs::Store.perform_later(type, hash)
         end
         hash
       end
@@ -96,7 +96,7 @@ module Dis
           deleted = true if layer.delete(type, hash)
         end
         if layers.delayed.writeable.any?
-          Dis::Jobs::Delete.enqueue(type, hash)
+          Dis::Jobs::Delete.perform_later(type, hash)
         end
         deleted
       end
@@ -150,4 +150,4 @@ module Dis
       end
     end
   end
-end
+end

data/lib/dis/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dis
-  VERSION = "0.9.0"
+  VERSION = "1.0.2"
 end

data/lib/rails/generators/dis/install/templates/initializer.rb

@@ -1,12 +1,15 @@
 # Be sure to restart your server when you modify this file.
 
 # Creates a local storage layer in db/dis:
+
 Dis::Storage.layers << Dis::Layer.new(
   Fog::Storage.new({ provider: 'Local', local_root: Rails.root.join('db', 'dis') }),
   path: Rails.env
 )
 
-# You can also add cloud storage.
+# You can also add cloud storage:
+
+# require 'fog/aws/storage'
 # Dis::Storage.layers << Dis::Layer.new(
 #   Fog::Storage.new({
 #     provider:              'AWS',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.1
+        version: 1.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.1
-- !ruby/object:Gem::Dependency
-  name: activejob
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement