spontaneous 0.2.0.beta9 → 0.2.0.beta10

data/test/unit/fields/test_date_fields.rb

@@ -0,0 +1,47 @@
+# encoding: UTF-8
+
+require File.expand_path('../../../test_helper', __FILE__)
+
+describe "Date fields" do
+  before do
+    @site = setup_site
+    @now = Time.now
+    stub_time(@now)
+    Spontaneous::State.delete
+    @site.background_mode = :immediate
+    @content_class = Class.new(::Piece)
+    @prototype = @content_class.field :date
+    @content_class.stubs(:name).returns("ContentClass")
+    @instance = @content_class.create
+    @field = @instance.date
+  end
+
+  it "have a distinct editor class" do
+    @prototype.instance_class.editor_class.must_equal "Spontaneous.Field.Date"
+  end
+
+  it "adopt any field called 'date'" do
+    assert @field.is_a?(Spontaneous::Field::Date), "Field should be an instance of DateField but instead has the following ancestors #{ @prototype.instance_class.ancestors }"
+  end
+
+  it "default to an empty string" do
+    @field.value(:html).must_equal ""
+    @field.value(:plain).must_equal ""
+  end
+
+  it "correctly parse strings" do
+    @field.value = "Friday, 8 June, 2012"
+    @field.value(:html).must_equal %(<time datetime="2012-06-08">Friday, 8 June, 2012</time>)
+    @field.value(:plain).must_equal %(Friday, 8 June, 2012)
+    @field.date.must_equal Date.parse("Friday, 8 June, 2012")
+  end
+
+  it "allow for setting a custom default format" do
+    prototype = @content_class.field :datef, :date, :format => "%d %b %Y, %a"
+    instance = @content_class.new
+    field = instance.datef
+    field.value = "Friday, 8 June, 2012"
+    field.value(:html).must_equal %(<time datetime="2012-06-08">08 Jun 2012, Fri</time>)
+    field.value(:plain).must_equal %(08 Jun 2012, Fri)
+  end
+end

data/test/unit/fields/test_file_field.rb

@@ -0,0 +1,210 @@
+# encoding: UTF-8
+
+require File.expand_path('../../../test_helper', __FILE__)
+require 'fog'
+
+describe "File Fields" do
+  let(:path) { File.expand_path("../../../fixtures/images/vimlogo.pdf", __FILE__) }
+
+  def site
+    @site = setup_site
+    @now = Time.now
+    stub_time(@now)
+    Spontaneous::State.delete
+    @site.background_mode = :immediate
+  end
+  before do
+    site
+    assert File.exists?(path), "Test file #{path} does not exist"
+    @content_class = Class.new(::Piece)
+    @prototype = @content_class.field :file
+    @content_class.stubs(:name).returns("ContentClass")
+    @instance = @content_class.create
+    @field = @instance.file
+  end
+
+  after do
+    teardown_site
+  end
+  it "have a distinct editor class" do
+    @prototype.instance_class.editor_class.must_equal "Spontaneous.Field.File"
+  end
+
+  it "adopt any field called 'file'" do
+    assert @field.is_a?(Spontaneous::Field::File), "Field should be an instance of FileField but instead has the following ancestors #{ @prototype.instance_class.ancestors }"
+  end
+
+  it "gives the right value for #blank?" do
+    @field.blank?.must_equal true
+    @field.value = 'http://example.com/image.jpg'
+    @field.blank?.must_equal false
+  end
+
+  it "copy files to the media folder" do
+    File.open(path, 'rb') do |file|
+      @field.value = {
+        :tempfile => file,
+        :type => "application/pdf",
+        :filename => "vimlogo.pdf"
+      }
+    end
+    url = @field.value
+    path = File.join File.dirname(Spontaneous.media_dir), url
+    assert File.exist?(path), "Media file should have been copied into place"
+  end
+
+  it "generate the requisite file metadata" do
+    File.open(path, 'rb') do |file|
+      @field.value = {
+        :tempfile => file,
+        :type => "application/pdf",
+        :filename => "vimlogo.pdf"
+      }
+    end
+    @field.value(:html).must_match %r{/media/.+/vimlogo.pdf$}
+    @field.value.must_match %r{/media/.+/vimlogo.pdf$}
+    @field.path.must_equal @field.value
+    @field.value(:filesize).must_equal 2254
+    @field.filesize.must_equal 2254
+    @field.value(:filename).must_equal "vimlogo.pdf"
+    @field.filename.must_equal "vimlogo.pdf"
+  end
+
+  it "just accept the given value if passed a path to a non-existant file" do
+    @field.value = "/images/nosuchfile.rtf"
+    @field.value.must_equal  "/images/nosuchfile.rtf"
+    @field.filename.must_equal "nosuchfile.rtf"
+    @field.filesize.must_equal 0
+  end
+
+  it "copy the given file if passed a path to an existing file" do
+    @field.value = path
+    @field.value.must_match %r{/media/.+/vimlogo.pdf$}
+    @field.filename.must_equal "vimlogo.pdf"
+    @field.filesize.must_equal 2254
+  end
+
+  it "sets the unprocessed value to a JSON encoded array of MD5 hash & filename" do
+    @field.value = path
+    @instance.save
+    @field.unprocessed_value.must_equal ["vimlogo.pdf", "1de7e866d69c2f56b4a3f59ed1c98b74"].to_json
+  end
+
+  it "sets the field hash to the MD5 hash of the file" do
+    @field.value = path
+    @field.file_hash.must_equal "1de7e866d69c2f56b4a3f59ed1c98b74"
+  end
+
+  it "sets the original filename of the file" do
+    @field.value = path
+    @field.original_filename.must_equal "vimlogo.pdf"
+  end
+
+  it "doesn't set the hash of a file that can't be found" do
+    @field.value = "/images/nosuchfile.rtf"
+    @field.file_hash.must_equal ""
+  end
+
+  it "sets the original filename of a file that can't be found" do
+    @field.value = "/images/nosuchfile.rtf"
+    @field.original_filename.must_equal "/images/nosuchfile.rtf"
+  end
+
+  it "sets the storage name if given an uploaded file" do
+    @field.value = path
+    @field.storage_name.must_equal "default"
+  end
+
+  it "sets the storage name if given an uploaded file" do
+    @field.value = path
+    @field.storage.must_equal @site.storage
+  end
+
+  it "sets the storage name to nil for file paths" do
+    @field.value = "/images/nosuchfile.rtf"
+    @field.storage_name.must_equal nil
+  end
+
+  it "allows for re-configuring the generated media URLs" do
+    @field.value = path
+    @field.path.must_match %r{^/media/.+/vimlogo.pdf$}
+    storage = @site.storage("default")
+    storage.url_mapper = ->(path) { "http://media.example.com#{path}"}
+    @field.value(:html).must_match %r{^http://media.example.com/media/.+/vimlogo.pdf$}
+    @field.path.must_match %r{^http://media.example.com/media/.+/vimlogo.pdf$}
+    @field.url.must_match %r{^http://media.example.com/media/.+/vimlogo.pdf$}
+  end
+
+  describe "clearing" do
+    def assert_file_field_empty
+      @field.value.must_equal ''
+      @field.filename.must_equal ''
+      @field.filesize.must_equal 0
+    end
+
+    before do
+      path = File.expand_path("../../fixtures/images/vimlogo.pdf", __FILE__)
+      @field.value = path
+    end
+
+    it "clears the value if set to the empty string" do
+      @field.value = ''
+      assert_file_field_empty
+    end
+  end
+
+  describe "with cloud storage" do
+    before do
+      ::Fog.mock!
+      @storage_config = {
+        provider: "AWS",
+        aws_secret_access_key: "SECRET_ACCESS_KEY",
+        aws_access_key_id: "ACCESS_KEY_ID",
+        public_host: 'https://media.example.com'
+      }
+      @storage = S::Media::Store::Cloud.new("S3", @storage_config, "media.example.com")
+      @storage.name.must_equal "S3"
+      @site.storage_backends.unshift(@storage)
+    end
+
+    it "sets the content-disposition header if defined as an 'attachment'" do
+      prototype = @content_class.field :attachment, :file, attachment: true
+      field = @instance.attachment
+      path = File.expand_path("../../../fixtures/images/vimlogo.pdf", __FILE__)
+      @storage.expects(:copy).with(path, is_a(Array), { content_type: "application/pdf", content_disposition: 'attachment; filename=vimlogo.pdf'})
+      field.value = path
+    end
+
+    describe 'storage' do
+      before do
+        @prototype = @content_class.field :attachment, :file
+        @field = @instance.attachment
+        @storage.stubs(:copy).with(path, is_a(Array), { content_type: "application/pdf"})
+      end
+
+      it "sets the storage name if given an uploaded file" do
+        @field.value = path
+        @field.storage_name.must_equal "S3"
+      end
+
+      it "allows for the file url to be configured by the storage" do
+        @field.value = path
+        @field.url.must_match %r[^https://media.example.com/0000#{@instance.id}/0001/vimlogo.pdf$]
+        @storage.url_mapper = ->(path) { "https://cdn.example.com#{path}" }
+        @field.url.must_match %r[^https://cdn.example.com/0000#{@instance.id}/0001/vimlogo.pdf$]
+      end
+
+      it 'falls back to the site’s default if initialized before storage_name output was defined' do
+        @field.value = path
+        @field.stubs(:storage_name).returns('[]')
+        @field.url.must_match %r[^/0000#{@instance.id}/0001/vimlogo.pdf$]
+      end
+
+      it "gives the right value for #blank?" do
+        @field.blank?.must_equal true
+        @field.value = path
+        @field.blank?.must_equal false
+      end
+    end
+  end
+end

data/test/unit/{test_images.rb → fields/test_image_fields.rb}

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 
 
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../../../test_helper', __FILE__)
 require 'fog'
 
-describe "Images" do
+describe "Image Fields" do
 
   before do
     @site = setup_site
@@ -16,9 +16,14 @@ describe "Images" do
 
   describe "Image fields set using absolute values" do
     before do
+      class ::Piece < ::Content::Piece
+      end
+      @owner = Piece.create
       @image = S::Field::Image.new(:name => "image")
+      @image.owner = @owner
       @image.prototype = Spontaneous::Prototypes::FieldPrototype.new(@site.model, :image, :image)
     end
+
     it "accept and not alter URL values" do
       url =  "http://example.com/image.png"
       @image.value = url
@@ -52,7 +57,7 @@ describe "Images" do
       @revision = 10
       @site.stubs(:working_revision).returns(@revision)
 
-      @src_image =  Pathname.new(File.join(File.dirname(__FILE__), "../fixtures/images/rose.jpg")).realpath
+      @src_image =  Pathname.new(File.join(File.dirname(__FILE__), "../../fixtures/images/rose.jpg")).realpath
       @origin_image = @upload_dir + "rose.jpg"
       FileUtils.cp(@src_image.to_s, @origin_image.to_s)
       @origin_image = @origin_image.realpath.to_s
@@ -125,8 +130,33 @@ describe "Images" do
 
       describe "in templates" do
 
+        after do
+          Spontaneous::Field::Image.default_attributes = {}
+        end
+
         it "render an <img/> tag in HTML format" do
-          assert_has_elements @image.to_html.split(' '), %(<img src="#{@image.src}" width="400" height="533" alt="" />).split(" ")
+          assert_has_elements @image.to_html.split(' '), %(<img src="#{@image.src}" alt="" />).split(" ")
+        end
+
+        it 'will fill in the image’s size if told to do so' do
+          expected = %(<img src="#{@image.src}" width="400" height="533" alt="" />).split(" ")
+          assert_has_elements @image.to_html(size: true).split(' '), expected
+          assert_has_elements @image.to_html(size: :auto).split(' '), expected
+          assert_has_elements @image.to_html(size: 'auto').split(' '), expected
+        end
+
+        it 'will fill in the image’s width with natural value if given a size of auto' do
+          expected = %(<img src="#{@image.src}" width="400" alt="" />).split(" ")
+          assert_has_elements @image.to_html(width: :auto).split(' '), expected
+          assert_has_elements @image.to_html(width: true).split(' '), expected
+          assert_has_elements @image.to_html(width: 'auto').split(' '), expected
+        end
+
+        it 'will fill in the image’s height with natural value if given a size of auto' do
+          expected = %(<img src="#{@image.src}" height="533" alt="" />).split(" ")
+          assert_has_elements @image.to_html(height: true).split(' '), expected
+          assert_has_elements @image.to_html(height: :auto).split(' '), expected
+          assert_has_elements @image.to_html(height: 'auto').split(' '), expected
         end
 
         it "use passed hash to overwrite tag attributes" do
@@ -136,21 +166,21 @@ describe "Images" do
             :rel => "lightbox",
             :random => "present"
           }
-          assert_has_elements @image.to_html(attr).split(" "), %(<img src="#{@image.src}" width="400" height="533" alt="Magic" class="magic" rel="lightbox" random="present" />).split(" ")
+          assert_has_elements @image.to_html(attr).split(" "), %(<img src="#{@image.src}" alt="Magic" class="magic" rel="lightbox" random="present" />).split(" ")
         end
 
         it "be intelligent about setting width & height" do
-          @image.to_html({ :width => 100 }).split(" ").must_have_elements %(<img src="#{@image.src}" width="100" alt="" />).split(" ")
-          assert_has_elements @image.to_html({ :height => 100 }).split(" "), %(<img src="#{@image.src}" height="100" alt="" />).split(" ")
-          assert_has_elements @image.to_html({ :width => 100, :height => 100 }).split(" "), %(<img src="#{@image.src}" width="100" height="100" alt="" />).split(" ")
+          @image.to_html({ width: 100 }).split(" ").must_have_elements %(<img src="#{@image.src}" width="100" alt="" />).split(" ")
+          assert_has_elements @image.to_html({ height: 100 }).split(" "), %(<img src="#{@image.src}" height="100" alt="" />).split(" ")
+          assert_has_elements @image.to_html({ width: 100, height: 100 }).split(" "), %(<img src="#{@image.src}" width="100" height="100" alt="" />).split(" ")
         end
 
-        it "turn off setting with & height if either is passed as false" do
+        it "turn off setting width & height if either is passed as false" do
           assert_has_elements @image.to_html({ :width => false }).split(" "), %(<img src="#{@image.src}" alt="" />).split(" ")
         end
 
         it "escape values in params" do
-          assert_has_elements @image.to_html({ :alt => "<danger\">" }).split(" "), %(<img src="#{@image.src}" width="400" height="533" alt="&lt;danger&quot;&gt;" />).split(" ")
+          assert_has_elements @image.to_html({ :alt => "<danger\">" }).split(" "), %(<img src="#{@image.src}" alt="&lt;danger&quot;&gt;" />).split(" ")
         end
 
         it "not include size parameters unless known" do
@@ -160,7 +190,22 @@ describe "Images" do
         end
 
         it "output image tags for its sizes too" do
-          assert_has_elements @image.thumbnail.to_html(:alt => "Thumb").split(' '), %(<img src="#{@image.thumbnail.src}" width="38" height="50" alt="Thumb" />).split(" ")
+          assert_has_elements @image.thumbnail.to_html(alt: "Thumb", size: true).split(' '), %(<img src="#{@image.thumbnail.src}" width="38" height="50" alt="Thumb" />).split(" ")
+        end
+
+        it 'allows for setting site-wide options' do
+          Spontaneous::Field::Image.default_attributes = { width: :auto, alt: 'Banana'}
+          assert_has_elements @image.to_html().split(' '), %(<img src="#{@image.src}" width="400" alt="Banana" />).split(" ")
+          assert_has_elements @image.to_html(width: false, alt: 'Other').split(' '), %(<img src="#{@image.src}" alt="Other" />).split(" ")
+        end
+
+        it 'allows for setting values with a proc' do
+          Spontaneous::Field::Image.default_attributes = { something: proc { |field| field.name }}
+          assert_has_elements @image.to_html().split(' '), %(<img src="#{@image.src}" alt="" something="photo" />).split(" ")
+        end
+
+        it 'allows for setting data-* values with a hash' do
+          assert_has_elements @image.to_html(data: {name: proc { |field| field.name }, id: proc { |field| field.owner.id }}).split(' '), %(<img src="#{@image.src}" alt="" data-name="photo" data-id="#{@content_id}" />).split(" ")
         end
       end
       describe "defined by classes" do
@@ -257,7 +302,7 @@ describe "Images" do
 
     end
 
-    describe "cloud storage yyy" do
+    describe "cloud storage" do
       before do
         @bucket_name = "media.example.com"
         @aws_credentials = {
@@ -267,9 +312,9 @@ describe "Images" do
           :public_host => "http://media.example.com"
         }
         ::Fog.mock!
-        @storage = Spontaneous::Media::Store::Cloud.new(@aws_credentials, 'media.example.com')
+        @storage = Spontaneous::Media::Store::Cloud.new("S3", @aws_credentials, 'media.example.com')
         @storage.backend.directories.create(:key => @bucket_name)
-        @site.stubs(:storage).with(anything).returns(@storage)
+        @site.storage_backends.unshift(@storage)
         @image.value = @origin_image.to_s
       end
 
@@ -281,6 +326,79 @@ describe "Images" do
         @image.original.src.must_equal "http://media.example.com/00234/0010/rose.jpg"
         @image.thumbnail.src.must_equal "http://media.example.com/00234/0010/rose.thumbnail.jpg"
       end
+
+      it "allows for reconfiguring the media urls" do
+        @storage.url_mapper = proc { |path| "http://cdn.example.com#{path}" }
+        @image.original.src.must_equal "http://cdn.example.com/00234/0010/rose.jpg"
+        @image.thumbnail.src.must_equal "http://cdn.example.com/00234/0010/rose.thumbnail.jpg"
+      end
+    end
+  end
+
+  describe '#blank?' do
+    before do
+      class ::ContentWithImage < ::Content::Piece
+        field :photo, :image do
+          size :smaller do
+            fit width: 100, height: 100
+          end
+        end
+      end
+
+      @instance = ContentWithImage.new
+
+      # @content_id = 234
+      # @instance.stubs(:id).returns(@content_id)
+      @field = @instance.photo
+    end
+
+    after do
+      Object.send(:remove_const, :ContentWithImage) rescue nil
+    end
+
+    it 'returns true for empty images' do
+      @field.blank?.must_equal true
+      @field.original.blank?.must_equal true
+      @field.smaller.blank?.must_equal true
+    end
+
+    it 'returns false for images with values' do
+      path = File.expand_path("../../../../fixtures/images/rose.jpg", __FILE__)
+      @field.value = path
+      @instance.save
+      @field.blank?.must_equal false
+      @field.original.blank?.must_equal false
+      @field.smaller.blank?.must_equal false
+    end
+
+    describe 'with cloud storage' do
+      before do
+        @bucket_name = "media.example.com"
+        @aws_credentials = {
+          :provider=>"AWS",
+          :aws_secret_access_key=>"SECRET_ACCESS_KEY",
+          :aws_access_key_id=>"ACCESS_KEY_ID",
+          :public_host => "http://media.example.com"
+        }
+        ::Fog.mock!
+        @storage = Spontaneous::Media::Store::Cloud.new("S3", @aws_credentials, 'media.example.com')
+        @storage.backend.directories.create(:key => @bucket_name)
+        @site.storage_backends.unshift(@storage)
+      end
+
+      it 'returns true for empty images' do
+        @field.blank?.must_equal true
+        @field.original.blank?.must_equal true
+        @field.smaller.blank?.must_equal true
+      end
+      it 'returns false for images with values' do
+        path = File.expand_path("../../../../fixtures/images/rose.jpg", __FILE__)
+        @field.value = path
+        @instance.save
+        @field.blank?.must_equal false
+        @field.original.blank?.must_equal false
+        @field.smaller.blank?.must_equal false
+      end
     end
   end
 
@@ -306,7 +424,7 @@ describe "Images" do
       @content_id = 234
       @instance.stubs(:id).returns(@content_id)
       @field = @instance.photo
-      path = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+      path = File.expand_path("../../../../fixtures/images/rose.jpg", __FILE__)
       @field.value = path
     end