miasma-local 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceebf096e1b2813c60f3601a5b54a2ed0e230644
-  data.tar.gz: 1962f4cdef1ec1017613928760beb706333e24d4
+  metadata.gz: 99dd1813acdf0fa0e82689323f18f8a184fa696f
+  data.tar.gz: 9406584a5eda5c980d8c1deb6240d099bc8f83b1
 SHA512:
-  metadata.gz: 8d0ed1893acc392ab162b25a9e6976e68f50c7b5d9cf767c8bc18385b5b3ba208e5bf7ce97e3cd652dd660e770c5e614d74fbdb62992c68c2f0365023ddba5de
-  data.tar.gz: abc9904bc3562e61db8400aaeb6336066ff69253887ea45032c1b8c240d7638646ee592e14df8dad61ba7822d562f044ba6d7fdd6a86516cfb52a2d32f9fbded
+  metadata.gz: f0a73549aa47d48a4630c82c263a00f2faf6bfea000cfd8e592dbb2adec158fde83495f9b16152a51092a08ec87c6390f4363eb9b23a39bc342200b95949a9cd
+  data.tar.gz: e636854511a4a7c00dc72df34c35b76c5ce7ac256fdfc0f80f2787252ebc53f9d5c4b0b2d220f099b5a08591b5e9a3f25c057d56e569bc22db567a0c22bd18cd

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+## v0.1.2
+* Update implementation to pass specs
+
 ## v0.1.0
 * Initial release

data/lib/miasma-local/version.rb

@@ -1,4 +1,4 @@
 module MiasmaLocal
   # Current library version
-  VERSION = Gem::Version.new('0.1.0')
+  VERSION = Gem::Version.new('0.1.2')
 end

data/lib/miasma/contrib/local/storage.rb

@@ -1,6 +1,7 @@
 require 'miasma'
 require 'fileutils'
 require 'tempfile'
+require 'mime-types'
 
 module Miasma
   module Models
@@ -67,7 +68,7 @@ module Miasma
         # @return [Array<Models::Storage::Bucket>]
         def bucket_all
           Dir.new(object_store_root).map do |item|
-            if(::File.directory?(item) && !item.start_with?('.'))
+            if(::File.directory?(::File.join(object_store_root, item)) && !item.start_with?('.'))
               Bucket.new(
                 self,
                 :id => ::File.basename(uri_unescape(item)),
@@ -111,8 +112,8 @@ module Miasma
                 bucket,
                 :id => ::File.join(bucket.name, item_name),
                 :name => item_name,
-                :updated => File.mtime(item),
-                :size => File.size(item)
+                :updated => ::File.mtime(item),
+                :size => ::File.size(item)
               ).valid_state
             end
           end.compact
@@ -125,12 +126,16 @@ module Miasma
         def file_save(file)
           if(file.dirty?)
             file.load_data(file.attributes)
-            if(file.attributes[:body].is_a?(IO))
+            if(file.attributes[:body].respond_to?(:readpartial))
               file.body.rewind
               tmp_file = Tempfile.new('miasma')
-              while(content = file.body.read(Storage::READ_BODY_CHUNK_SIZE))
-                tmp_file.write content
+              begin
+                while(content = file.body.read(Storage::READ_BODY_CHUNK_SIZE))
+                  tmp_file.write content
+                end
+              rescue EOFError
               end
+              tmp_file.flush
               tmp_file.close
               FileUtils.mv(tmp_file.path, full_path(file))
             end
@@ -160,10 +165,13 @@ module Miasma
         def file_reload(file)
           if(file.persisted?)
             new_info = Smash.new.tap do |data|
-              data[:updated] = File.mtime(full_path(file))
-              data[:size] = File.size(file_path(file))
-              data[:etag] = Digest::MD5.hexdigest(content)
-              data[:content_type] = MIME::Types.of(full_path(file))
+              data[:updated] = ::File.mtime(full_path(file))
+              data[:size] = ::File.size(full_path(file))
+              data[:etag] = Digest::MD5.hexdigest(::File.read(full_path(file))) # @todo Update for block building
+              mime = MIME::Types.of(full_path(file)).first
+              if(mime)
+                data[:content_type] = mime.content_type
+              end
             end
             file.load_data(file.attributes.deep_merge(new_info))
             file.valid_state
@@ -178,7 +186,8 @@ module Miasma
         # @todo where is this in swift?
         def file_url(file, timeout_secs)
           if(file.persisted?)
-            raise NotImplementedError
+            "file://#{full_path(file)}"
+            full_path(file)
           else
             raise Error::ModelPersistError.new "#{file} has not been saved!"
           end
@@ -191,10 +200,10 @@ module Miasma
         def file_body(file)
           if(file.persisted?)
             tmp_file = Tempfile.new('miasma')
+            tmp_path = tmp_file.path
             tmp_file.delete
-            FileUtils.cp(full_path(file), tmp_file.path)
-            tmp_file.open
-            tmp_file
+            FileUtils.cp(full_path(file), tmp_path)
+            ::File.open(tmp_path, 'rb')
           else
             StringIO.new('')
           end
@@ -217,12 +226,14 @@ module Miasma
         # @param file_or_bucket [File, Bucket]
         # @return [String]
         def full_path(file_or_bucket)
-          path = ''
-          if(file_or_bucket.respond_to?(:bucket))
-            path << '/' << bucket_path(file_or_bucket.bucket)
+          if(file_or_bucket.is_a?(Bucket))
+            bucket_path(file_or_bucket)
+          else
+            ::File.join(
+              bucket_path(file_or_bucket.bucket),
+              file_path(file_or_bucket)
+            )
           end
-          path << '/' << file_path(file_or_bucket)
-          path
         end
 
         # URL string escape

data/miasma-local.gemspec

@@ -10,7 +10,12 @@ Gem::Specification.new do |s|
   s.description = 'Smoggy local API'
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
-  s.add_dependency 'miasma'
-  s.add_dependency 'mime-types'
+  s.add_development_dependency 'miasma', '>= 0.2.12'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'vcr'
+  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'psych', '>= 2.0.8'
+  s.add_runtime_dependency 'mime-types'
   s.files = Dir['lib/**/*'] + %w(miasma-local.gemspec README.md CHANGELOG.md LICENSE)
 end

metadata

@@ -1,29 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: miasma-local
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.12
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement