dragonfly-activerecord 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804ea5bfdd90237f08a7c477f0b0019e040648c8
-  data.tar.gz: 3ef8c72e9b1aea1e513400751f39369acf91647c
+  metadata.gz: c0b2e1ead6f33913d7bd6ea10f849327206ff368
+  data.tar.gz: 159786b1cc1b7b9992f0b1922d1b40c80dd0627e
 SHA512:
-  metadata.gz: 04dcc1651721230e8d937252fc08045f2b4e16afaf5359ff82408da7ac313a532f8ee9b18785ffe9b74d52414fe58594b5af2d0d88f4d7f425aea9c89a741b3b
-  data.tar.gz: 4cb3cd91cce1c350174cee6d4b91836d673ad33ece38f107884df2cc04651a4c77e073d119f02f74be912dad601ad4759ab5d3726a6400e2d4afd36bb56af519
+  metadata.gz: 15b52b9146902030d0d8c563fe2f760fd28fb69d795e0a7e4cb60407199c75fc8347ef064378325a593dcd8971f73aa41c326e16f0b0013bc09292b739e59541
+  data.tar.gz: 8bf1c426ba915ceb724df52e9818e33677180647b05c967a7dac9159a23cf4cfab44788a4b874979b1f6a36ae5e52074715bc8261468b3e066f99e2f563b10c3

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "rebund"]
+	path = rebund
+	url = https://github.com/mezis/rebund.git

data/.travis.yml

@@ -10,8 +10,15 @@ gemfile:
   - gemfiles/rails40.gemfile
 before_install:
   - gem update bundler
-  - bundle install
-bundler_args:
+install:
+  - ./rebund/run download
+  - bundle install --path ../vendor/bundle
+after_script:
+  - ./rebund/run upload
 before_script:
   - psql -c 'create database dar_test;' -U postgres
   - mysql -e 'create database dar_test;'
+env:
+  global:
+    - secure: "hAzED2sL+PgYtqNCd46gxW15+kiMOW5LRHj5oK2zhY6rtU/efQ9hg7zt4h9zjFtk142R3D6XOMqlXAmJ6zZ/mWcd+5qwD52v6Qp/r8jJTFhXmYSIKW2MAKUbK51bxERkN5OUeZx7lLBC4BIImAue+PsTORMHtA2NJSROAnz573Y="
+

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    dragonfly-activerecord (0.0.2)
+    dragonfly-activerecord (0.1.0)
       activerecord (>= 3.2.6)
+      dragonfly (>= 1.0.2)
 
 GEM
   remote: http://yarp.dev/
@@ -32,6 +33,9 @@ GEM
       timers (~> 1.1.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    dragonfly (1.0.2)
+      multi_json (~> 1.0)
+      rack
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.2.5)
@@ -58,6 +62,7 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rack (1.5.2)
     rake (10.1.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/dragonfly-activerecord.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec'
 
   spec.add_dependency 'activerecord', '>= 3.2.6'
+  spec.add_dependency 'dragonfly',    '>= 1.0.2'
 end

data/gemfiles/rails32.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/dragonfly-activerecord
   specs:
-    dragonfly-activerecord (0.0.1)
+    dragonfly-activerecord (0.1.0)
       activerecord (>= 3.2.6)
+      dragonfly (>= 1.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -27,6 +28,9 @@ GEM
       timers (~> 1.1.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    dragonfly (1.0.2)
+      multi_json (~> 1.0)
+      rack
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.2.4)
@@ -52,6 +56,7 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rack (1.5.2)
     rake (10.1.1)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)

data/gemfiles/rails40.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/dragonfly-activerecord
   specs:
-    dragonfly-activerecord (0.0.1)
+    dragonfly-activerecord (0.1.0)
       activerecord (>= 3.2.6)
+      dragonfly (>= 1.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -32,6 +33,9 @@ GEM
       timers (~> 1.1.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    dragonfly (1.0.2)
+      multi_json (~> 1.0)
+      rack
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.2.4)
@@ -58,6 +62,7 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rack (1.5.2)
     rake (10.1.1)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)

data/gemfiles/rails40_mysql.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/dragonfly-activerecord
   specs:
-    dragonfly-activerecord (0.0.1)
+    dragonfly-activerecord (0.1.0)
       activerecord (>= 3.2.6)
+      dragonfly (>= 1.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -32,6 +33,9 @@ GEM
       timers (~> 1.1.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    dragonfly (1.0.2)
+      multi_json (~> 1.0)
+      rack
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.2.4)
@@ -58,6 +62,7 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rack (1.5.2)
     rake (10.1.1)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)

data/gemfiles/rails40_pg.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/dragonfly-activerecord
   specs:
-    dragonfly-activerecord (0.0.1)
+    dragonfly-activerecord (0.1.0)
       activerecord (>= 3.2.6)
+      dragonfly (>= 1.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -32,6 +33,9 @@ GEM
       timers (~> 1.1.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    dragonfly (1.0.2)
+      multi_json (~> 1.0)
+      rack
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.2.4)
@@ -58,6 +62,7 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rack (1.5.2)
     rake (10.1.1)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)

data/gemfiles/rails40_sqlite.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/dragonfly-activerecord
   specs:
-    dragonfly-activerecord (0.0.1)
+    dragonfly-activerecord (0.1.0)
       activerecord (>= 3.2.6)
+      dragonfly (>= 1.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -32,6 +33,9 @@ GEM
       timers (~> 1.1.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    dragonfly (1.0.2)
+      multi_json (~> 1.0)
+      rack
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.2.4)
@@ -58,6 +62,7 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rack (1.5.2)
     rake (10.1.1)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)

data/lib/dragonfly-activerecord/file.rb

@@ -13,29 +13,46 @@ module Dragonfly::ActiveRecord
     validates_presence_of :accessed_at
 
     before_validation :set_defaults
-
-    # default_value_for(:metadata) { Hash.new }
-    # default_value_for(:accessed_at) { Time.current }
+    after_save        :build_chunks
 
     # BLOB is typically 65k maximum, but in our case
     # there's a 4/3 overhead for Base64 encoding, and up to 1% overhead
     # for worst case GZip compression.
     MAX_CHUNK_SIZE = 32_768
 
-    def data=(data)
-      self.chunks.each(&:mark_for_destruction)
-      (data.length / MAX_CHUNK_SIZE + 1).times do |index|
-        chunk = data[index * MAX_CHUNK_SIZE, MAX_CHUNK_SIZE]
-        self.chunks.new(data:chunk, idx:index)
-      end
+    # max number of chunks read at a time
+    MAX_CHUNK_READ = 10
+
+    def data=(file)
+      @_data = file
     end
 
     def data
-      self.chunks.order(:idx).map(&:data).join
+      @_output ||= Tempfile.new('dar', encoding: 'binary').tap do |fd|
+        index = 0
+        while true
+          range = index...(index + MAX_CHUNK_READ)
+          chunklist = chunks.where(idx:range).to_a.sort_by(&:idx)
+          break if chunklist.empty?
+          chunklist.each { |chunk| fd.write(chunk.data) }
+          index += MAX_CHUNK_READ
+        end
+        fd.rewind
+      end
     end
 
     private
 
+    def build_chunks
+      # require 'pry' ; binding.pry
+      chunks.delete_all
+      index = 0
+      while chunk = @_data.read(MAX_CHUNK_SIZE)
+        chunks.create!(data:chunk, idx:index)
+        index += 1
+      end
+    end
+
     def set_defaults
       self.metadata    ||= Hash.new
       self.accessed_at ||= Time.current

data/lib/dragonfly-activerecord/store.rb

@@ -7,11 +7,13 @@ module Dragonfly::ActiveRecord
 
     # +temp_object+ should respond to +data+ and +meta+
     def write(temp_object, opts={})
-      File.new.tap do |file|
-        file.metadata = temp_object.meta
-        file.data     = temp_object.data
-        file.save!
-        return file.id.to_s
+      temp_object.file do |fd|
+        File.new.tap do |file|
+          file.metadata = temp_object.meta
+          file.data     = fd
+          file.save!
+          return file.id.to_s
+        end
       end
     end
 

data/lib/dragonfly-activerecord/version.rb

@@ -1,5 +1,5 @@
 module Dragonfly
   module ActiveRecord
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/spec/dragonfly-activerecord/store_spec.rb

@@ -1,10 +1,16 @@
 require 'spec_helper'
 require 'dragonfly-activerecord/store.rb'
+require 'dragonfly'
 
 describe Dragonfly::ActiveRecord::Store do
-  FakeFile = Struct.new(:data, :meta)
 
-  let(:fake_file) { FakeFile.new data, metadata }
+  let(:fake_file) do
+    Dragonfly::Content.new(
+      nil, # no app
+      Dragonfly::TempObject.new(data),
+      metadata)
+  end
+
   let(:metadata) { {a:1} }
 
   before { prepare_database }
@@ -15,7 +21,7 @@ describe Dragonfly::ActiveRecord::Store do
       returned_data, returned_meta = subject.read(id)
 
       returned_data.length.should == data.length
-      returned_data.should == data
+      returned_data.read.should == data
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.6
+- !ruby/object:Gem::Dependency
+  name: dragonfly
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 description: ActiveRecord-backed data store for Dragonfly
 email:
 - julien.letessier@gmail.com
@@ -158,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .gitmodules
 - .rspec
 - .ruby-version
 - .travis.yml