couch_photo 1.0.0.beta.8 → 1.0.0.beta.9

data/VERSION

@@ -1 +1 @@
-1.0.0.beta.8
+1.0.0.beta.9

data/lib/couch_photo/couch_photo.rb

@@ -64,7 +64,7 @@ module CouchPhoto
   private
   def load_variations
     all_variations = {}
-
+    
     # setup defined variations
     defined_variation_names.each do |defined_variation_name|
       all_variations[defined_variation_name.to_sym] = CouchPhoto::Variation.new self, defined_variation_name
@@ -75,6 +75,9 @@ module CouchPhoto
       all_variations[custom_variation_name] = CouchPhoto::CustomVariation.new self, custom_variation_name
     end
 
+    # setup original variation
+    all_variations[original.variation_filename] = original if original.exists?
+
     all_variations
   end
   

data/lib/couch_photo/original.rb

@@ -21,12 +21,23 @@ module CouchPhoto
       end
     end
 
-    private
+    def variation_name
+      "original.#{extension}"
+    end
+
+    def variation_filename
+      "original.#{extension}"
+    end
+
     def attachment_name
-      @attachment_name ||= 
-        @document["_attachments"].keys.select do |attachment_name| 
-          attachment_name.match /variations\/original\.[^.]*/
-        end.first
+      if @attachment_name
+        @attachment_name
+      elsif @document["_attachments"]
+        @attachment_name ||= 
+          @document["_attachments"].keys.select do |attachment_name| 
+            attachment_name.match /variations\/original\.[^.]*/
+          end.first
+      end
     end
   end
 end

data/lib/couch_photo/variation_metadata.rb

@@ -82,17 +82,16 @@ module CouchPhoto
       "variations/#{variation_filename}"
     end
 
-    private
     def exists?
-      !@document["_attachments"][attachment_name].nil?
+      @document["_attachments"] && @document["_attachments"][attachment_name]
     end
 
+    private
     def mini_magick
       if exists?
         @mini_magick ||= MiniMagick::Image.read(self.data)
       end
     end
-
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: couch_photo
 version: !ruby/object:Gem::Version 
-  hash: 62196371
+  hash: 62196369
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - beta
-  - 8
-  version: 1.0.0.beta.8
+  - 9
+  version: 1.0.0.beta.9
 platform: ruby
 authors: 
 - Matt Parker