file_model 0.0.1 → 0.0.2

data/lib/file_model/file_model.rb

@@ -1,5 +1,6 @@
 module FileModel
   attr_reader :name
+  attr_accessor :model
 
   def read name
     self.name = name
@@ -12,12 +13,11 @@ module FileModel
     original
   end
 
-  def save
+  def save options = {}
     return false unless original
 
     # validating
-    validate
-    raise "can't save invalid file!" unless errors.empty?
+    return false unless options[:validate] == false or valid?
 
     # deleting old files
     destroy validate: false
@@ -40,13 +40,14 @@ module FileModel
     true
   end
 
+  def save! options = {}
+    save(options) || raise("can't save #{self}!")
+  end
+
   def destroy options = {}
     return false unless name
 
-    unless options[:validate] == false
-      self.validate
-      raise "can't save invalid file!" unless errors.empty?
-    end
+    return false unless options[:validate] == false or valid?
 
     path = build_path name
     self.class.box[path].destroy
@@ -59,6 +60,10 @@ module FileModel
     true
   end
 
+  def destroy! options = {}
+    destroy(options) || raise("can't destroy #{self}!")
+  end
+
   def url
     name && build_url(name)
   end
@@ -68,7 +73,7 @@ module FileModel
   end
 
   def process &block
-    block.call original
+    block.call original if original
   end
 
   def build_path name, version = nil
@@ -89,9 +94,17 @@ module FileModel
     @errors ||= []
   end
 
-  def validate
+  def valid?
     errors.clear
-    # errors << "file #{original.name} not exist!" if original and !original.file?
+    run_validations
+    errors.empty?
+  end
+
+  def run_validations; end
+
+  class << self
+    attr_accessor :box
+    attr_required :box
   end
 
   protected
@@ -114,7 +127,20 @@ module FileModel
       end
     end
 
-    attr_accessor :box
-    attr_required :box
+    inheritable_accessor :_box, nil
+    def box= v
+      self._box = v.is_a?(::Proc) ? v : -> {v}
+    end
+
+    def box *args, &block
+      if block
+        self.box = block
+      elsif !args.empty?
+        args.size.must == 1
+        self.box = args.first
+      else
+        (_box && _box.call) || ::FileModel.box
+      end
+    end
   end
 end

data/lib/file_model/helper.rb

@@ -9,6 +9,7 @@ module FileModel::Helper
           file_name = attribute_get attr_name
 
           file_model = file_model_class.new
+          file_model.model = self
           file_model.read file_name
 
           instance_variable_set iv_name, file_model

data/lib/file_model/mini_magic.rb

@@ -0,0 +1,14 @@
+module FileModel::MiniMagic
+  def mini_magic callback, &block
+    return unless original
+
+    require 'mini_magick'
+    image = MiniMagick::Image.open(original.file.path)
+    block.call image
+    '/'.to_entry.tmp do |dir|
+      output = dir / :tmp_image
+      image.write output.path
+      callback.call output
+    end
+  end
+end

data/lib/file_model/spec/shared_crud.rb

@@ -1,21 +1,23 @@
 require 'vos'
+require 'file_model/spec'
 
 shared_examples_for 'file model crud' do
   describe "file model crud" do
+    with_file_model
+
     before :all do
       class ImageFile
         inherit FileModel
 
         def build_path name, version = nil
-          '/storage/images' + super
+          "/storage/images/#{model.name}" + super
         end
 
         def build_url name, version = nil
-          '/images' + super
+          "/images/#{model.name}" + super
         end
 
-        def validate
-          super
+        def run_validations
           errors << 'invalid name' if original and (original.name =~ /invalid/)
         end
       end
@@ -23,19 +25,13 @@ shared_examples_for 'file model crud' do
     after(:all){remove_constants :ImageFile}
 
     before do
-      require 'tempfile'
-      @tmp_dir = Dir.tmpdir.to_dir.dir('/shard_crud').create.path
       @shared_dir = __FILE__.to_entry.parent.dir(:shared_crud).path
-
-      ImageFile.box = Vos::Box.new(Vos::Drivers::Local.new(@tmp_dir))
-    end
-    after do
-      @tmp_dir.to_dir.destroy
     end
 
     it 'CRUD' do
       # read
       model = @model_class.new
+      model.name = 'sea'
       model.image.class.should == ImageFile
       model.image.url.should be_nil
       model.image.file.should be_nil
@@ -51,34 +47,35 @@ shared_examples_for 'file model crud' do
       # saving
       model.save.should be_true
       model.instance_variable_get(:@image).should == 'ship.jpg'
-      model.image.url.should == '/images/ship.jpg'
-      model.image.file.path.should == "/storage/images/ship.jpg"
-      "#{@tmp_dir}/storage/images/ship.jpg".to_file.exist?.should be_true
+      model.image.url.should == '/images/sea/ship.jpg'
+      model.image.file.path.should == "/storage/images/sea/ship.jpg"
+      file_model_storage['storage/images/sea/ship.jpg'].exist?.should be_true
 
       # reading
       model = @model_class.new
+      model.name = 'sea'
       model.instance_variable_set(:@image, 'ship.jpg')
-      model.image.url.should == '/images/ship.jpg'
-      model.image.file.path.should == "/storage/images/ship.jpg"
+      model.image.url.should == '/images/sea/ship.jpg'
+      model.image.file.path.should == "/storage/images/sea/ship.jpg"
 
       # updating
       file2 = "#{@shared_dir}/ship2.jpg".to_file
       model.image = file2
       model.instance_variable_get(:@image).should == 'ship2.jpg'
       model.image.original.path.should == "#{@shared_dir}/ship2.jpg"
-      model.image.url.should == '/images/ship.jpg'
-      model.image.file.path.should == "/storage/images/ship.jpg"
+      model.image.url.should == '/images/sea/ship.jpg'
+      model.image.file.path.should == "/storage/images/sea/ship.jpg"
 
       model.save.should be_true
       model.instance_variable_get(:@image).should == 'ship2.jpg'
-      model.image.url.should == '/images/ship2.jpg'
-      model.image.file.path.should == "/storage/images/ship2.jpg"
-      "#{@tmp_dir}/storage/images/ship.jpg".to_file.exist?.should be_false
-      "#{@tmp_dir}/storage/images/ship2.jpg".to_file.exist?.should be_true
+      model.image.url.should == '/images/sea/ship2.jpg'
+      model.image.file.path.should == "/storage/images/sea/ship2.jpg"
+      file_model_storage['storage/images/sea/ship.jpg'].exist?.should be_false
+      file_model_storage['storage/images/sea/ship2.jpg'].exist?.should be_true
 
       # destroying
       model.destroy.should be_true
-      "#{@tmp_dir}/storage/images/ship2.jpg".to_file.exist?.should be_false
+      file_model_storage['storage/images/sea/ship2.jpg'].exist?.should be_false
     end
 
     it "should be able to submit errors and interrupt model saving" do

data/lib/file_model/spec.rb

@@ -0,0 +1,27 @@
+require 'file_model'
+require 'vos'
+
+rspec do
+  def file_model_storage
+    '/tmp/file_model'.to_dir
+  end
+
+  class << self
+    def with_file_model
+      ::FileModel::ClassMethods.class_eval do
+        def box
+          ::FileModel.box
+        end
+      end
+
+      tmp = '/tmp/file_model'.to_dir
+
+      before do
+        tmp.destroy.create
+        FileModel.box = Vos::Box.new(Vos::Drivers::Local.new(tmp.path))
+      end
+
+      after{tmp.destroy}
+    end
+  end
+end

data/lib/file_model/version.rb

@@ -1,6 +1,6 @@
 class FileModel::Version
-  def initialize model, version_name
-    @model, @version_name = model, version_name
+  def initialize main, version_name
+    @main, @version_name = main, version_name
   end
 
   def url
@@ -8,15 +8,15 @@ class FileModel::Version
   end
 
   def file
-    name && model.class.box[build_path(name, version_name)]
+    name && main.class.box[build_path(name, version_name)]
   end
 
   def process &block
-    block.call original
+    block.call original if original
   end
 
   protected
-    attr_reader :model, :version_name
+    attr_reader :main, :version_name
 
-    delegate :original, :name, :build_path, :build_url, to: :model
+    delegate :original, :name, :build_path, :build_url, to: :main
 end

data/lib/file_model.rb

@@ -8,4 +8,8 @@ require 'ruby_ext'
   version
   helper
   file_model
-).each{|f| require "file_model/#{f}"}
+  mini_magic
+).each{|f| require "file_model/#{f}"}
+
+FileModel.include FileModel::MiniMagic
+FileModel::Version.include FileModel::MiniMagic

data/spec/abstract_model_spec.rb

@@ -10,6 +10,8 @@ describe 'Model Integration' do
     class TheModel < ModelStub
       inherit FileModel::Helper
 
+      attr_accessor :name
+
       mount_file :image, ImageFile
 
       def attribute_get name
@@ -20,7 +22,7 @@ describe 'Model Integration' do
       end
 
       before_validate.push -> _self {
-        self.image.validate
+        self.image.run_validations
         self.errors[:image] = image.errors unless image.errors.empty?
       }
 

data/spec/file_model_spec.rb

@@ -3,19 +3,19 @@
 require 'spec_helper'
 
 describe "File Model" do
-  with_tmp_spec_dir
+  with_file_model
 
   before :all do
     class ImageFile
       inherit FileModel
 
       def process &block
-        block.call original
+        block.call original if original
       end
 
       version :icon do
         def process &block
-          block.call original
+          block.call original if original
         end
       end
 
@@ -31,8 +31,7 @@ describe "File Model" do
         name.gsub '+', ' '
       end
 
-      def validate
-        super
+      def run_validations
         errors << 'invalid name' if original and original.name =~ /invalid/
       end
     end
@@ -40,7 +39,6 @@ describe "File Model" do
   after(:all){remove_constants :ImageFile, :AvatarFile}
 
   before do
-    ImageFile.box = Vos::Box.new(Vos::Drivers::Local.new(spec_dir))
     @file = "#{spec_dir}/ship.jpg".to_file
   end
 
@@ -104,8 +102,8 @@ describe "File Model" do
 
     image.save.should be_true
 
-    "#{spec_dir}/storage/images/ship.jpg".to_file.exist?.should be_false
-    "#{spec_dir}/storage/images/ship.icon.jpg".to_file.exist?.should be_false
+    file_model_storage['storage/images/ship.jpg'].exist?.should be_false
+    file_model_storage['storage/images/ship.icon.jpg'].exist?.should be_false
 
     image.name.should == 'ship2.jpg'
     image.file.name.should == 'ship2.jpg'
@@ -123,8 +121,8 @@ describe "File Model" do
     image = ImageFile.new
     image.read 'ship2.jpg'
     image.destroy
-    "#{spec_dir}/storage/images/ship2.jpg".to_file.exist?.should be_false
-    "#{spec_dir}/storage/images/ship2.icon.jpg".to_file.exist?.should be_false
+    file_model_storage['storage/images/ship2.jpg'].exist?.should be_false
+    file_model_storage['storage/images/ship2.icon.jpg'].exist?.should be_false
   end
 
   it "should preserve spaces and unicode characters in filename" do
@@ -151,14 +149,14 @@ describe "File Model" do
   it 'should validate and not save invalid files' do
     image = ImageFile.new
     image.original = "#{spec_dir}/ship.jpg".to_file
-    image.validate
-    image.errors.should == []
+    image.valid?.should be_true
 
     image.original = "#{spec_dir}/invalid.txt".to_file
-    image.validate
+    image.valid?.should be_false
     image.errors.should == ['invalid name']
 
-    -> {image.save}.should raise_error(/invalid/)
+    image.save.should be_false
+    image.errors.should == ['invalid name']
   end
 
   it 'should accept anything responding to :to_file' do

data/spec/mini_magic_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe "MiniMagic" do
+  with_file_model
+
+  before :all do
+    class ImageFile
+      inherit FileModel
+
+      def process &block
+        mini_magic block do |image|
+          image.resize '150x150'
+        end
+      end
+
+      version :icon do
+        def process &block
+          mini_magic block do |image|
+            image.resize '50x50'
+          end
+        end
+      end
+    end
+  end
+  after(:all){remove_constants :ImageFile}
+
+  before do
+    @file = "#{spec_dir}/bos.jpg".to_file
+  end
+
+  it "resizing" do
+    image = ImageFile.new
+    image.original = @file
+    image.save!
+
+    image.file.size.should > image.icon.file.size
+  end
+end

data/spec/spec_helper.rb

@@ -2,4 +2,5 @@ require 'file_model'
 require 'vos'
 
 require 'rspec_ext'
+require 'file_model/spec'
 require 'spec_helper/model_stub'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_model
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-09-06 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -22,10 +22,12 @@ files:
 - lib/file_model/file_model.rb
 - lib/file_model/gems.rb
 - lib/file_model/helper.rb
+- lib/file_model/mini_magic.rb
 - lib/file_model/spec/shared_crud/invalid.txt
 - lib/file_model/spec/shared_crud/ship.jpg
 - lib/file_model/spec/shared_crud/ship2.jpg
 - lib/file_model/spec/shared_crud.rb
+- lib/file_model/spec.rb
 - lib/file_model/version.rb
 - lib/file_model.rb
 - spec/abstract_model_spec.rb
@@ -35,6 +37,8 @@ files:
 - spec/file_model_spec/ship2.jpg
 - spec/file_model_spec/файл с пробелами.txt
 - spec/file_model_spec.rb
+- spec/mini_magic_spec/bos.jpg
+- spec/mini_magic_spec.rb
 - spec/spec_helper/model_stub.rb
 - spec/spec_helper.rb
 homepage: http://github.com/alexeypetrushin/file_model