dynamic_image 0.9.8 → 0.9.9

data/VERSION

@@ -1 +1 @@
-0.9.8
+0.9.9

data/app/controllers/images_controller.rb

@@ -19,7 +19,7 @@ class ImagesController < ActionController::Base
         return
       end
 
-      unless image.data
+      unless image.data?
         logger.warn "Image #{image.id} exists, but has no data"
         render_missing_image and return
       end

data/dynamic_image.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamic_image"
-  s.version = "0.9.8"
+  s.version = "0.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Inge J\303\270rgensen"]

data/lib/binary_storage.rb

@@ -12,11 +12,11 @@ module BinaryStorage
     def storage_dir
       @@storage_dir ||= Rails.root.join('db/binary_storage', Rails.env)
     end
-    
+
     def storage_dir=(new_storage_dir)
       @@storage_dir = new_storage_dir
     end
-    
+
     def hexdigest_file(path)
       Digest::SHA1.file(path).hexdigest
     end

data/lib/binary_storage/blob.rb

@@ -1,6 +1,6 @@
 module BinaryStorage
   class Blob
-    
+
     class << self
       def find(hash_string)
         blob = self.new(:hash_string => hash_string)
@@ -18,52 +18,51 @@ module BinaryStorage
         blob.save
         blob
       end
-      
+
       def storage_dir(hash_string=nil)
         root = BinaryStorage.storage_dir
         (hash_string) ? File.join(root, hash_string.match(/^(..)/)[1]) : root
       end
-      
+
       def storage_path(hash_string)
         File.join(storage_dir(hash_string), hash_string.gsub(/^(..)/, ''))
       end
     end
-    
+
     def initialize(*args)
-      args = *args
       options = {
         :hash_string => nil,
         :data        => nil
       }
-      if args.kind_of?(Hash)
-        options.merge!(args)
+      if args.first.kind_of?(Hash)
+        options.merge!(args.first)
       else
-        options[:data] = args
+        options[:data] = args.first
       end
       @hash_string = options[:hash_string]
       @data        = options[:data]
     end
-    
+
     def data
       @data
     end
-    
+
     def data=(new_data)
       @hash_string = nil
       @data        = new_data
     end
-    
+
     def hash_string
       unless @hash_string
         if @data
           @hash_string = BinaryStorage.hexdigest(data)
         else
-          raise "Binary has no data!" 
+          raise "Binary has no data!"
         end
       end
       @hash_string
     end
-    
+
     def storage_dir
       BinaryStorage::Blob.storage_dir(hash_string)
     end
@@ -71,20 +70,20 @@ module BinaryStorage
     def storage_path
       BinaryStorage::Blob.storage_path(hash_string)
     end
-    
+
     def exists?
       File.exists?(storage_path)
     end
-    
+
     def empty?
       (hash_string && !exists?) || !data || data.empty?
     end
-    
+
     def load
       raise "File not found" unless exists?
       @data = File.open(storage_path, "rb") {|io| io.read }
     end
-    
+
     def delete
       if exists?
         FileUtils.rm(storage_path)
@@ -100,6 +99,6 @@ module BinaryStorage
       end
       return true
     end
-    
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynamic_image
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - "Inge J\xC3\xB8rgensen"