file_model 0.0.6 → 0.0.7

data/Rakefile

@@ -1,10 +1,9 @@
 require 'rake_ext'
 
-project(
+project \
   name: "file_model",
   gem: true,
   summary: "File storage for Models",
 
   author: "Alexey Petrushin",
-  homepage: "http://github.com/alexeypetrushin/file_model"
-)
+  homepage: "http://github.com/alexeypetrushin/file_model"

data/lib/file_model/adapter.rb

@@ -39,7 +39,7 @@ class FileModel::Adapter
       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))
+          entry.delete if (entry_time > time) or (time > (entry_time + EXPIRATION_TIME))
         end
       end
     end

data/lib/file_model/file_model.rb

@@ -20,7 +20,7 @@ module FileModel
     return false unless options[:validate] == false or valid?
 
     # deleting old files
-    destroy validate: false
+    delete validate: false
 
     # saving
     self.name = build_name original.name
@@ -45,24 +45,24 @@ module FileModel
     save(options) || raise("can't save #{self} (#{errors.inspect})!")
   end
 
-  def destroy options = {}
+  def delete options = {}
     return true unless name
 
     return false unless options[:validate] == false or valid?
 
     path = build_path name
-    self.class.box[path].destroy
+    self.class.box[path].delete
 
     self.class.versions.each do |version_name, klass|
       path = build_path name, version_name
-      self.class.box[path].destroy
+      self.class.box[path].delete
     end
 
     true
   end
 
-  def destroy! options = {}
-    destroy(options) || raise("can't destroy #{self} (#{errors.inspect})!")
+  def delete! options = {}
+    delete(options) || raise("can't delete #{self} (#{errors.inspect})!")
   end
 
   def url

data/lib/file_model/helper.rb

@@ -1,7 +1,7 @@
 module FileModel::Helper
   module ClassMethods
     def mount_file attr_name, file_model_class
-      attr_name.must_be.a Symbol
+      attr_name.must.be_a Symbol
       iv_name = :"@_#{attr_name}"
 
       define_method attr_name do

data/lib/file_model/spec.rb

@@ -19,11 +19,11 @@ rspec do
       tmp = '/tmp/file_model_test'.to_dir
 
       before do
-        tmp.destroy.create
+        tmp.delete.create
         FileModel.box = Vos::Box.new(Vos::Drivers::Local.new(root: tmp.path))
       end
 
-      after{tmp.destroy}
+      after{tmp.delete}
     end
   end
 end

data/lib/file_model/spec/shared_crud.rb

@@ -73,8 +73,8 @@ shared_examples_for 'file model crud' do
       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
+      # deleteing
+      model.delete.should be_true
       file_model_storage['storage/images/sea/ship2.jpg'].exist?.should be_false
     end
 

data/spec/abstract_model_spec.rb

@@ -28,7 +28,7 @@ describe 'Model Integration' do
 
       after_save.push -> _self {self.image.save}
 
-      after_destroy.push -> _self {self.image.destroy}
+      after_delete.push -> _self {self.image.delete}
     end
   end
   after(:all){remove_constants :TheModel}

data/spec/adapter_spec.rb

@@ -4,7 +4,7 @@ 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'

data/spec/file_model_spec.rb

@@ -117,10 +117,10 @@ describe "File Model" do
     image.icon.file.exist?.should be_true
     image.icon.url.should == '/images/ship2.icon.jpg'
 
-    # destroying
+    # deleteing
     image = ImageFile.new
     image.read 'ship2.jpg'
-    image.destroy
+    image.delete
     file_model_storage['storage/images/ship2.jpg'].exist?.should be_false
     file_model_storage['storage/images/ship2.icon.jpg'].exist?.should be_false
   end

data/spec/spec_helper/model_stub.rb

@@ -15,12 +15,12 @@ class ModelStub
     end
   end
 
-  def destroy
+  def delete
     self.class.before_validate.each{|block| instance_eval &block}
 
     if errors.empty?
       # save
-      self.class.after_destroy.each{|block| instance_eval &block}
+      self.class.after_delete.each{|block| instance_eval &block}
       true
     else
       false
@@ -36,8 +36,8 @@ class ModelStub
       @after_save ||= []
     end
 
-    def after_destroy
-      @after_destroy ||= []
+    def after_delete
+      @after_delete ||= []
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_model
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-11-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2833030 !ruby/object:Gem::Requirement
+  requirement: &2849270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2833030
+  version_requirements: *2849270
 - !ruby/object:Gem::Dependency
   name: vfs
-  requirement: &2832790 !ruby/object:Gem::Requirement
+  requirement: &2849030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2832790
+  version_requirements: *2849030
 - !ruby/object:Gem::Dependency
   name: vos
-  requirement: &2832550 !ruby/object:Gem::Requirement
+  requirement: &2848790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2832550
+  version_requirements: *2848790
 description: 
 email: 
 executables: []