asset_cloud 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c59ff21099481c73d18d20f5d12267538bfe5537
-  data.tar.gz: b0b9d91f667a39da9848609af1e44d2f087b71bc
+SHA256:
+  metadata.gz: 893b7f80adf628a9de0991dce7f9febe75c5a72766dc30c2493d9d38c6f229c0
+  data.tar.gz: 668804b41b67252ef633ad568d2faeb79499fd97817b12686e4c0b8344a8aec1
 SHA512:
-  metadata.gz: e468ea841dcfc001541a7b117335e435c9500c464cde5a7239d73bd0340c8400401906f442d8e3ac22aeaa50d3afd3120b3a30e8a09ceb4f4289445a1419a5d9
-  data.tar.gz: 41818a6fa8cbddfb504baf4c8e9a7866e320901487744c1d926f1bbedbedb4ec96b8ef8384293d048aa443da33b21c5c42f6b74079dc7c39ad5e199520436ea8
+  metadata.gz: c25c855f466f47cfbc425f603e43c1e29d12398c24d65fd75be116c3bbf7f71127637c30092e077133c514404f9bfe3ed9af56baacf2044407076f99dcb83195
+  data.tar.gz: 1e22a454de1001f1c696d5880134a4a91bf5abd33fe3490d6202fc0e2d698d6a2c1314c3bfb2019924a0e6a90c39bf622f9bfca9818a6f1f4cca692759443d02

data/.github/probots.yml

@@ -0,0 +1,2 @@
+enabled:
+  - cla

data/.travis.yml

@@ -2,7 +2,5 @@ language: ruby
 before_install:
   - gem install bundler
 rvm:
-  - '1.9.3'
-  - '2.0'
-  - '2.1'
-  - 2.1.2
+  - '2.2'
+  - '2.3'

data/README.rdoc

@@ -12,7 +12,7 @@ An abstraction layer around arbitrary and diverse asset stores.
 
 == Testing
 
-   bundle exec rake spec
+   dev test
 
 With S3 Remote test:
 

data/asset_cloud.gemspec

@@ -2,12 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asset_cloud}
-  s.version = "2.2.4"
+  s.version = "2.2.5"
 
   s.authors = %w(Shopify)
   s.summary = %q{An abstraction layer around arbitrary and diverse asset stores.}
   s.description = %q{An abstraction layer around arbitrary and diverse asset stores.}
 
+  s.required_ruby_version = '>= 2.2.0'
+
   s.email = %q{developers@shopify.com}
   s.homepage = %q{http://github.com/Shopify/asset_cloud}
   s.require_paths = %w(lib)
@@ -16,13 +18,10 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   s.add_dependency 'activesupport'
-  s.add_dependency 'class_inheritable_attributes'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'mocha'
-  if RUBY_VERSION >= "2.0.0"
-    s.add_development_dependency 'pry'
-    s.add_development_dependency 'pry-byebug'
-  end
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-byebug'
 end

data/dev.yml

@@ -0,0 +1,11 @@
+name: asset-cloud
+
+up:
+  - ruby:
+      version: 2.3.3
+  - bundler
+
+commands:
+  test:
+    desc: "run test suite"
+    run: bundle exec rake spec

data/lib/asset_cloud.rb

@@ -13,7 +13,7 @@ require 'asset_cloud/buckets/memory_bucket'
 require 'asset_cloud/buckets/versioned_memory_bucket'
 require 'asset_cloud/base'
 
-#S3
+# S3
 require 'asset_cloud/buckets/s3_bucket'
 
 # Extensions

data/lib/asset_cloud/base.rb

@@ -1,5 +1,4 @@
 require 'uri'
-require 'class_inheritable_attributes'
 
 module AssetCloud
 
@@ -33,16 +32,16 @@ module AssetCloud
     attr_accessor :url, :root
 
     class_attribute :root_bucket_class
-    self.root_bucket_class = 'AssetCloud::FileSystemBucket'
+    self.root_bucket_class = 'AssetCloud::FileSystemBucket'.freeze
     class_attribute :root_asset_class
-    self.root_asset_class  = 'AssetCloud::Asset'
+    self.root_asset_class  = 'AssetCloud::Asset'.freeze
 
-    class_inheritable_hash :bucket_classes
-    self.bucket_classes = {}
-    class_inheritable_hash :asset_classes
-    self.asset_classes = {}
-    class_inheritable_hash :asset_extension_classes
-    self.asset_extension_classes = {}
+    class_attribute :bucket_classes
+    self.bucket_classes = {}.freeze
+    class_attribute :asset_classes
+    self.asset_classes = {}.freeze
+    class_attribute :asset_extension_classes
+    self.asset_extension_classes = {}.freeze
 
     def self.bucket(*args)
       asset_class = if args.last.is_a? Hash
@@ -56,8 +55,8 @@ module AssetCloud
       end
 
       if bucket_name = args.first
-        self.bucket_classes[bucket_name.to_sym] = bucket_class
-        self.asset_classes[bucket_name.to_sym]  = asset_class if asset_class
+        self.bucket_classes = bucket_classes.merge(bucket_name.to_sym => bucket_class).freeze
+        self.asset_classes = asset_classes.merge(bucket_name.to_sym => asset_class).freeze if asset_class
       else
         self.root_bucket_class = bucket_class
         if asset_class
@@ -75,7 +74,7 @@ module AssetCloud
 
       args.each do |klass|
         klass = convert_to_class_name_if_possible(klass)
-        self.asset_extension_classes[klass] = opts
+        self.asset_extension_classes = asset_extension_classes.merge(klass => opts).freeze
       end
     end
 

data/lib/asset_cloud/buckets/s3_bucket.rb

@@ -11,8 +11,8 @@ module AssetCloud
       objects.map { |o| cloud[relative_key(o.key)] }
     end
 
-    def read(key)
-      cloud.s3_bucket(key).objects[absolute_key(key)].read
+    def read(key, options = {})
+      cloud.s3_bucket(key).objects[absolute_key(key)].read(options)
     rescue ::AWS::Errors::Base
       raise AssetCloud::AssetNotFoundError, key
     end

data/lib/asset_cloud/callbacks.rb

@@ -1,5 +1,3 @@
-require 'class_inheritable_attributes'
-
 module AssetCloud
   module Callbacks
     extend ActiveSupport::Concern
@@ -7,29 +5,41 @@ module AssetCloud
     module ClassMethods
       def callback_methods(*symbols)
         symbols.each do |method|
-          code = <<-"end_eval"
-           def self.before_#{method}(*callbacks, &block)
-             callbacks << block if block_given?
-             write_inheritable_array(:before_#{method}, callbacks)
-           end
-
-           def self.after_#{method}(*callbacks, &block)
-             callbacks << block if block_given?
-             write_inheritable_array(:after_#{method}, callbacks)
-           end
-
-           def #{method}_with_callbacks(*args)
-             if execute_callbacks(:before_#{method}, args)
-               result = #{method}_without_callbacks(*args)
-               execute_callbacks(:after_#{method}, args)
-             end
-             result
-           end
-
-           alias_method_chain :#{method}, 'callbacks'
-          end_eval
-
-          self.class_eval code, __FILE__, __LINE__
+          define_callbacks(method)
+        end
+      end
+
+      def define_callbacks(method)
+        before = :"before_#{method}"
+        after = :"after_#{method}"
+        extension_module.send(:define_method, method) do |*args, &block|
+          result = nil
+          if execute_callbacks(before, args)
+            result = super(*args, &block)
+            execute_callbacks(after, args)
+          end
+          result
+        end
+
+        define_singleton_method(before) do |*callbacks, &block|
+          callbacks << block if block_given?
+          write_inheritable_array(before, callbacks)
+        end
+
+        define_singleton_method(after) do |*callbacks, &block|
+          callbacks << block if block_given?
+          write_inheritable_array(after, callbacks)
+        end
+      end
+
+      private
+
+      def extension_module
+        @extension_module ||= begin
+          mod = Module.new
+          self.const_set(:AssetCloudCallbacks, mod)
+          prepend(mod)
+          mod
         end
       end
     end

data/lib/asset_cloud/validations.rb

@@ -1,11 +1,15 @@
 module AssetCloud
   module Validations
     def self.included(base)
-      base.extend ClassMethods
-      base.class_eval do
-        include AssetCloud::Callbacks
+      base.send(:alias_method, :store_without_validation, :store)
+      base.extend(ClassMethods)
+      base.prepend(PrependedMethods)
+    end
 
-        alias_method_chain :store, :validation
+    module PrependedMethods
+      def store
+        validate
+        errors.empty? ? super : false
       end
     end
 
@@ -16,11 +20,6 @@ module AssetCloud
       end
     end
 
-    def store_with_validation
-      validate
-      errors.empty? ? store_without_validation : false
-    end
-
     def errors
       @errors ||= []
     end

data/spec/remote_s3_bucket_spec.rb

@@ -66,4 +66,13 @@ describe 'Remote test for AssetCloud::S3Bucket', if:  ENV['AWS_ACCESS_KEY_ID'] &
     data = @bucket.read(key)
     data.should == value
   end
+
+  it "#reads first bytes when passed options" do
+    value = 'hello world'
+    key = 'tmp/new_file.txt'
+    options = {range: 0...5}
+    @bucket.write(key, value)
+    data = @bucket.read(key, options)
+    data.should == 'hello'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset_cloud
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: class_inheritable_attributes
-  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +100,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/probots.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -122,6 +109,7 @@ files:
 - README.rdoc
 - Rakefile
 - asset_cloud.gemspec
+- dev.yml
 - lib/asset_cloud.rb
 - lib/asset_cloud/asset.rb
 - lib/asset_cloud/asset_extension.rb
@@ -170,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -178,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An abstraction layer around arbitrary and diverse asset stores.