couch_photo 0.0.3 → 0.0.4

data/README.markdown

@@ -36,14 +36,14 @@ First, define an Image document and set the versions on it:
 Next, create an instance of the image document and set the "original" image on it.
 
     i = Image.new
-    i.original "avatar.jpg"
+    i.original = "avatar.jpg"
     i.save
 
 By calling the original method with a string, CouchPhoto will attempt to open a file with the same name and use that as the original image. If you don't have
 an actual file (e.g., maybe this was a form upload), then simply pass a blob as the second parameter. For example, 
 
     blob = File.read "avatar.jpg"
-    i.original "avatar.jpg", blob
+    i.original = ["avatar.jpg", blob]
 
 Now, if you look in your image document in CouchDB, you'd see the following attachments:
 
@@ -79,6 +79,19 @@ The previous variations were all simple image resizings. What if we wanted to do
 
 The `original_image` variable in the blocks is simply the MiniMagick::Image instance of your original image.
 
+### Accessing the Original Image
+
+How do you access the the original image? Let me count the ways: 
+
+    @image.original.original_filename # ==> "avatar.jpg"
+    @image.original.filename # ==> "original.jpg"
+    @image.original.path # ==> "/your_image_database/avatar.jpg/original.jpg"
+    @image.original.url # ==> "http://your_couch_server/your_image_database/avatar.jpg/original.jpg"
+    @image.original.basename # ==> "original.jpg"
+    @image.original.filetype # ==> "jpg"
+    @image.original.mimetype # ==> "image/jpg"
+    @image.original.data # ==> BINARY BLOB
+
 ### Accessing Variations
 
 So, now that you've got some variations, how do you access them? Simple!
@@ -99,7 +112,7 @@ Let's go back to our original image example:
     end
 
     i = Image.new
-    i.original "avatar.jpg"
+    i.original = "avatar.jpg"
     i.save
 
 We can access our variations in one of three ways: 

data/lib/couch_photo/couch_photo.rb

@@ -1,6 +1,7 @@
 module CouchPhoto
   def self.included(base)
     base.extend ClassMethods
+    base.property :original_filename
   end
 
   def update_or_create_attachment(attachment)
@@ -16,12 +17,23 @@ module CouchPhoto
     @variations.variations.values
   end
 
+  def original
+    raise "You do not have an original attachment" unless original_attachment_name
+    @original ||= Variation.new self, original_attachment_name
+  end
+
+  def original_attachment_name
+    @original_attachment_name ||= self["_attachments"].keys.select {|a| a.match /original\.[^\.]+/}.first
+  end
+
   def variation(variation_name=nil)
     variation_name ? @variations.send(variation_name) : @variations
   end
 
-  def original(filepath, blob=nil)
+  def original=(*args)#filepath, blob=nil
+    filepath, blob = args[0], args[1]
     self["_id"] = File.basename filepath if self.class.override_id?
+    self.original_filename = File.basename filepath
     blob ||= File.read filepath
     image_format = filepath.match(/^.*\.([^\.]*)$/)[1]
     attachment_name = "original.#{image_format}"

data/lib/couch_photo/variations.rb

@@ -56,21 +56,26 @@ module CouchPhoto
   end
 
   class Variation
-    attr_reader :name, :path, :filename, :basename, :filetype, :mimetype
+    attr_reader :name, :url, :path, :filename, :basename, :filetype, :mimetype
 
     def initialize(document, attachment_name)
-      @path = [document.database.to_s, document.id, attachment_name].join "/"
+      @path = "/" + [document.database.name, document.id, attachment_name].join("/")
+      @url = [document.database.to_s, document.id, attachment_name].join "/"
       @attachment_name = attachment_name
-      @name = attachment_name.gsub(/variations\/(.+)\.[^\.]+/) {$1}
+      @name = attachment_name.gsub(/(?:variations\/)?(.+)\.[^\.]+/) {$1}
       @filename = attachment_name
       @basename = File.basename attachment_name 
       @document = document
-      @filetype = attachment_name.gsub(/variations\/.+\.([^\.]+)/) {$1}
+      @filetype = attachment_name.gsub(/(?:variations\/)?.+\.([^\.]+)/) {$1}
       @mimetype = document["_attachments"][attachment_name]["content_type"]
     end
 
     def data
       @document.read_attachment @attachment_name
     end
+
+    def original_filename
+      @document.original_filename
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couch_photo
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matt Parker