tori 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5563a0b24b7c620e8e0e020e2b4b8c3820dcf11
-  data.tar.gz: 16681e5518f0836d94459819c097ba7e774e8e38
+  metadata.gz: 0767923af262a5dce13b472e5634d2a9d0bfffde
+  data.tar.gz: dc11c7a9aa7c1c6404f87423971b273aaf22df8b
 SHA512:
-  metadata.gz: 9f145b9389b2623ccf0b7f60999b819f123e69fd1b1d784c830449ab1df6a148ad36c5eb01fad6020abbe34df0303186a9a9289ab562bc46dbd0c68466350f67
-  data.tar.gz: 89a1c87b3b89c221d07695389c531083f0ebb61e2715b6444355a9f7c9e6af1885ecf7f528f7495554bda1bd2df23847d6b6f08f971a5a85e04fcc7f1218ee06
+  metadata.gz: bc9a89e774b0e2749a2f285895f40800dbbd89f7a193a6ff96838e2ec791d639ba3a8cee45b0cf1ee8fa3903cb28bcef8d16acbf344da1559a4fea4001e55c5e
+  data.tar.gz: 1b206a55b212aa7a415f9feb696eb1c5d79cf8cbd72777e25cbb309f81cdb6eef240512e92864593b8b307e040a638efebc95f89ebd7c377038ad2b1aeb062bd

data/.gitignore

@@ -1,2 +1,3 @@
 Gemfile.lock
 pkg
+tmp

data/lib/tori/backend/filesystem.rb

@@ -1,17 +1,26 @@
 module Tori
   module Backend
     class FileSystem
+      attr_accessor :root
       def initialize(root)
         @root = root
         FileUtils.mkdir_p(@root.to_s)
       end
 
-      def copy(uploader, filename)
-        IO.copy_stream(uploader, @root.join(filename))
+      def copy(form_path, to_filename)
+        IO.copy_stream(form_path.to_s, @root.join(to_filename.to_s))
       end
 
       def delete(filename)
-        File.unlink @root.join(filename)
+        ::File.unlink @root.join(filename.to_s)
+      end
+
+      def exist?(filename)
+        ::File.exist? @root.join(filename.to_s)
+      end
+
+      def read(filename)
+        ::File.read @root.join(filename.to_s)
       end
     end
   end

data/lib/tori/define.rb

@@ -1,20 +1,16 @@
 module Tori
   module Define
     def tori(name)
-      name_hash_get = "#{name}_hash".to_sym
-      name_ivar = "@#{name}".to_sym
-      name_hash_ivar = "@#{name}_hash".to_sym
+      name_file_ivar = "@#{name}_file".to_sym
 
       define_method(name) do
-        instance_variable_get name_ivar
+        ivar = instance_variable_get name_file_ivar
+        instance_variable_set name_file_ivar, ivar || File.new(self)
       end
 
       define_method("#{name}=") do |uploader|
-        instance_variable_set name_ivar, uploader
-      end
-
-      define_method(name_hash_get) do
-        Tori.config.filename_callback.call(self)
+        file = File.new(self, uploader)
+        instance_variable_set name_file_ivar, file
       end
     end
   end

data/lib/tori/file.rb

@@ -0,0 +1,28 @@
+module Tori
+  class File
+    attr_accessor :from
+
+    def initialize(model, from = nil)
+      @model = model
+      @from = from
+    end
+
+    def to_s
+      Tori.config.filename_callback.call(@model)
+    end
+
+    def exist?
+      Tori.config.backend.exist?(to_s)
+    end
+
+    def copy?
+      !@model.nil? && !@from.nil? && @from.respond_to?(:path) && 0 < to_s.length
+    rescue NameError => e
+      false
+    end
+
+    def read
+      Tori.config.backend.read(to_s)
+    end
+  end
+end

data/lib/tori/rails.rb

@@ -9,22 +9,19 @@ module Tori
     #
     # @example:
     # class Photo < ActiveRecord::Base
-    #   tori :image, id: :id
+    #   tori :image
     # end
     def tori(name)
       super
 
-      name_hash_get = "#{name}_hash".to_sym
-
       after_save do
-        uploader = __send__ name
-        filename = __send__ name_hash_get
-        Tori.config.backend.copy(uploader.path, filename) if uploader && filename
+        file = __send__ name
+        Tori.config.backend.copy(file.from.path, file.to_s) if file.from && file.copy?
       end
 
       after_destroy do
-        filename = __send__ name_hash_get
-        Tori.config.backend.delete(filename) if filename
+        file = __send__ name
+        Tori.config.backend.delete(file.to_s) if file.exist?
       end
     end
   end

data/lib/tori/version.rb

@@ -1,3 +1,3 @@
 module Tori
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/tori.rb

@@ -1,9 +1,10 @@
 require 'tori/backend/filesystem'
 require 'tori/config'
 require 'tori/define'
+require 'tori/file'
 require 'tori/version'
 require 'pathname'
-require 'digest/md5'
+require 'digest/sha1'
 require "fileutils"
 
 module Tori
@@ -21,7 +22,7 @@ module Tori
         #   It's call when decide filename hash.
         #   `filename_callback` must be have `call` method.
         config.filename_callback = ->(model) do
-          Digest::MD5.hexdigest "#{model.class.name}/#{model.id}"
+          Digest::SHA1.hexdigest "#{model.class.name}/#{model.id}"
         end
       end
     end

data/test/test_tori_backend_filesystem.rb

@@ -3,15 +3,33 @@ require 'test_helper'
 class TestToriBackendFileSystem < Test::Unit::TestCase
   class Uploader
     def path
-      "/tmp/tori/test"
+      "test/tmp/uploader"
     end
   end
 
-  test "#initialize" do
-    path = Pathname("tmp/tori/test")
-    i = Tori::Backend::FileSystem.new(path)
+  setup do
+    path = Pathname("test/tmp/tori/store")
+    @filesystem = Tori::Backend::FileSystem.new(path)
+  end
 
-    assert_instance_of Tori::Backend::FileSystem, i
+  teardown do
+    FileUtils.rm_rf("test/tmp")
+  end
+
+  test "#initialize" do
+    assert_instance_of Tori::Backend::FileSystem, @filesystem
     assert_raise(ArgumentError){ Tori::Backend::FileSystem.new }
   end
+
+  test "#exist?" do
+    assert { true == @filesystem.exist?(".") }
+    assert { false == @filesystem.exist?("nothing_file") }
+  end
+
+  test "#read" do
+    FileUtils.touch @filesystem.root.join("readfile")
+    assert { "" == @filesystem.read("readfile") }
+    File.unlink @filesystem.root.join("readfile")
+    assert_raise(Errno::ENOENT){ @filesystem.read("nothing_file") }
+  end
 end

data/test/test_tori_file.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class TestToriDefine < Test::Unit::TestCase
+  setup do
+    @orig = Tori.config.filename_callback
+    Tori.config.filename_callback = ->(model){
+      model
+    }
+    Tori.config.backend = Tori::Backend::FileSystem.new Pathname("test").join("tmp")
+  end
+
+  teardown do
+    Tori.config.filename_callback = @orig
+    FileUtils.rm_rf("test/tmp")
+  end
+
+  class Dammy
+    def path
+      "path"
+    end
+  end
+
+  test "#initialize" do
+    assert_instance_of Tori::File, Tori::File.new(nil, nil)
+  end
+
+  test "#to_s" do
+    assert { "test" == Tori::File.new("test", nil).to_s }
+  end
+
+  test "#exist?" do
+    assert { true == Tori::File.new(__FILE__, nil).exist? }
+    assert { false == Tori::File.new("nothing_file", nil).exist? }
+  end
+
+  test "#copy?" do
+    assert { false == Tori::File.new(__FILE__, nil).copy? }
+    assert { true == Tori::File.new(__FILE__, Dammy.new).copy? }
+  end
+end

data/test/test_tori_method_definition.rb

@@ -4,14 +4,10 @@ class TestToriDefine < Test::Unit::TestCase
   class Dammy
     extend Tori::Define
     tori :test_image
-    def id
-      "dammy"
-    end
   end
 
   test "#tori" do
     assert_respond_to Dammy.new, :test_image
     assert_respond_to Dammy.new, :test_image=
-    assert_respond_to Dammy.new, :test_image_hash
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tori
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ksss
@@ -68,12 +68,14 @@ files:
 - lib/tori/backend/filesystem.rb
 - lib/tori/config.rb
 - lib/tori/define.rb
+- lib/tori/file.rb
 - lib/tori/rails.rb
 - lib/tori/version.rb
 - test/test_helper.rb
 - test/test_tori.rb
 - test/test_tori_backend_filesystem.rb
 - test/test_tori_config.rb
+- test/test_tori_file.rb
 - test/test_tori_method_definition.rb
 - tori.gemspec
 homepage: https://github.com/ksss/tori
@@ -105,4 +107,5 @@ test_files:
 - test/test_tori.rb
 - test/test_tori_backend_filesystem.rb
 - test/test_tori_config.rb
+- test/test_tori_file.rb
 - test/test_tori_method_definition.rb