file_model 0.0.2 → 0.0.3

data/lib/file_model/adapter.rb

@@ -0,0 +1,50 @@
+class FileModel::Adapter
+  def initialize something
+    @something = something
+  end
+
+  def to_file
+    self.class.clear_expired_cache
+
+    if something.respond_to? :to_file
+      something.to_file
+    elsif something.is_a? Hash
+      data = something["tempfile"] || something[:tempfile] || raise("no file!")
+      name = something["filename"] || something[:filename] || raise("no filename!")
+      file = "#{self.class.cache_dir}/#{name}".to_file
+      file.write data.read
+      file
+    elsif something.is_a? File
+      path = something.path
+      name = File.basename path
+      file = "#{self.class.cache_dir}/#{name}".to_file
+      file.write something.read
+      file
+    else
+      raise "unknown file format!"
+    end
+  end
+
+  EXPIRATION_TIME = 5
+  BASE_DIR = "/tmp/file_model_cache"
+
+  class << self
+    def cache_dir
+      "#{BASE_DIR}/#{Time.now.min}/#{rand(1_000_000)}"
+    end
+
+    def clear_expired_cache
+      time = Time.now.min
+      dir = BASE_DIR.to_dir
+      if dir.exist?
+        dir.to_dir.entries do |entry|
+          entry_time = entry.name.to_i
+          entry.destroy if (entry_time > time) or (time > (entry_time + EXPIRATION_TIME))
+        end
+      end
+    end
+  end
+
+  protected
+    attr_reader :something
+end

data/lib/file_model/file_model.rb

@@ -8,13 +8,13 @@ module FileModel
 
   attr_reader :original
   def original= something
-    @original = something.to_file
-    raise "file #{original.name} not exist!" if original and !original.exist?
+    @original = Adapter.new(something).to_file
+    raise "file #{original.name} not exist!" unless original.exist?
     original
   end
 
   def save options = {}
-    return false unless original
+    return true unless original
 
     # validating
     return false unless options[:validate] == false or valid?
@@ -24,6 +24,7 @@ module FileModel
 
     # saving
     self.name = build_name original.name
+
     process do |file|
       path = build_path name
       file.copy_to self.class.box[path]
@@ -41,11 +42,11 @@ module FileModel
   end
 
   def save! options = {}
-    save(options) || raise("can't save #{self}!")
+    save(options) || raise("can't save #{self} (#{errors.inspect})!")
   end
 
   def destroy options = {}
-    return false unless name
+    return true unless name
 
     return false unless options[:validate] == false or valid?
 
@@ -61,7 +62,7 @@ module FileModel
   end
 
   def destroy! options = {}
-    destroy(options) || raise("can't destroy #{self}!")
+    destroy(options) || raise("can't destroy #{self} (#{errors.inspect})!")
   end
 
   def url
@@ -76,15 +77,17 @@ module FileModel
     block.call original if original
   end
 
-  def build_path name, version = nil
+  def build_standard_path name, version = nil
     base, extension = name.rsplit('.', 2)
     %(/#{base}#{".#{version}" if version}#{".#{extension}" if extension})
   end
+  alias_method :build_path, :build_standard_path
 
-  def build_url name, version = nil
+  def build_standard_url name, version = nil
     base, extension = name.rsplit('.', 2)
     %(/#{base}#{".#{version}" if version}#{".#{extension}" if extension})
   end
+  alias_method :build_url, :build_standard_url
 
   def build_name name
     name
@@ -103,6 +106,10 @@ module FileModel
   def run_validations; end
 
   class << self
+    def box name
+      raise "Override this method to provide Your own custom box initialization."
+    end
+
     attr_accessor :box
     attr_required :box
   end
@@ -127,19 +134,12 @@ module FileModel
       end
     end
 
-    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
+    inheritable_accessor :box_name, :default
+    def box name = nil
+      if name
+        self.box_name = name
       else
-        (_box && _box.call) || ::FileModel.box
+        FileModel.box box_name
       end
     end
   end

data/lib/file_model/mini_magic.rb

@@ -3,7 +3,7 @@ module FileModel::MiniMagic
     return unless original
 
     require 'mini_magick'
-    image = MiniMagick::Image.open(original.file.path)
+    image = MiniMagick::Image.open(original.path)
     block.call image
     '/'.to_entry.tmp do |dir|
       output = dir / :tmp_image

data/lib/file_model/spec.rb

@@ -1,24 +1,26 @@
 require 'file_model'
 require 'vos'
 
+FileModel::ClassMethods.class_eval do
+  def box; FileModel.box end
+end
+
+FileModel.metaclass_eval do
+  attr_accessor :box
+end
+
 rspec do
   def file_model_storage
-    '/tmp/file_model'.to_dir
+    '/tmp/file_model_test'.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
+      tmp = '/tmp/file_model_test'.to_dir
 
       before do
         tmp.destroy.create
-        FileModel.box = Vos::Box.new(Vos::Drivers::Local.new(tmp.path))
+        FileModel.box = Vos::Box.new(Vos::Drivers::Local.new(root: tmp.path))
       end
 
       after{tmp.destroy}

data/lib/file_model.rb

@@ -7,6 +7,7 @@ require 'ruby_ext'
   gems
   version
   helper
+  adapter
   file_model
   mini_magic
 ).each{|f| require "file_model/#{f}"}

data/spec/adapter_spec/file.txt

@@ -0,0 +1 @@
+text

data/spec/adapter_spec.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe "File Model" do
+  with_file_model
+  
+  it 'should accept different formats' do
+    original = FileModel::Adapter.new("#{spec_dir}/file.txt").to_file
+    original.name.should == 'file.txt'
+    original.read.should == "text"
+
+    original = FileModel::Adapter.new("#{spec_dir}/file.txt".to_file).to_file
+    original.name.should == 'file.txt'
+    original.read.should == "text"
+
+    File.open "#{spec_dir}/file.txt" do |f|
+      original = FileModel::Adapter.new(f).to_file
+      original.name.should == 'file.txt'
+      original.read.should == "text"
+    end
+
+    File.open "#{spec_dir}/file.txt" do |f|
+      original = FileModel::Adapter.new(filename: 'file.txt', tempfile: f).to_file
+      original.name.should == 'file.txt'
+      original.read.should == "text"
+    end
+  end
+
+  it 'work with binary format' do
+    File.open "#{spec_dir}/bos.jpeg" do |f|
+      original = FileModel::Adapter.new(filename: 'bos.jpeg', tempfile: f).to_file
+      original.name.should == 'bos.jpeg'
+      original.size.should > 0
+    end
+  end
+end

data/spec/file_model_spec.rb

@@ -20,11 +20,11 @@ describe "File Model" do
       end
 
       def build_path name, version = nil
-        '/storage/images' + super
+        '/storage/images' + build_standard_path(name, version)
       end
 
       def build_url name, version = nil
-        '/images' + super
+        '/images' + build_standard_url(name, version)
       end
 
       def build_name name
@@ -158,15 +158,4 @@ describe "File Model" do
     image.save.should be_false
     image.errors.should == ['invalid name']
   end
-
-  it 'should accept anything responding to :to_file' do
-    file = "#{spec_dir}/ship.jpg".to_file
-
-    obj = mock
-    obj.should_receive(:to_file).and_return(file)
-
-    image = ImageFile.new
-    image.original = obj
-    image.original.should == file
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_model
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-15 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - readme.md
+- lib/file_model/adapter.rb
 - lib/file_model/file_model.rb
 - lib/file_model/gems.rb
 - lib/file_model/helper.rb
@@ -31,6 +32,9 @@ files:
 - lib/file_model/version.rb
 - lib/file_model.rb
 - spec/abstract_model_spec.rb
+- spec/adapter_spec/bos.jpeg
+- spec/adapter_spec/file.txt
+- spec/adapter_spec.rb
 - spec/file_model_spec/file+name.txt
 - spec/file_model_spec/invalid.txt
 - spec/file_model_spec/ship.jpg