digital_opera 0.0.10 → 0.0.12

data/spec/javascripts/spec/events_spec.js

@@ -18,22 +18,15 @@ describe("events", function() {
       it("should return true", function() {
         var loggedEvent;
 
-        runs(function(){
-          first.on('click', function(e){
-            loggedEvent = e;
-          });
-          setTimeout(function(){
-            first.click();
-          });
+        first.on('click', function(e){
+          loggedEvent = e;
         });
 
-        waitsFor(function(){
-          return typeof loggedEvent !== 'undefined';
-        }, 'waiting for click', 1000)
+        first.click();
 
-        runs(function(){
-          expect(window.digitalOpera.isClickOutsideElement(loggedEvent, second)).toBe(true);
-        });
+        jasmine.clock().tick(1000);
+
+        expect(window.digitalOpera.isClickOutsideElement(loggedEvent, second)).toBe(true);
       });
     });
 
@@ -41,43 +34,25 @@ describe("events", function() {
       it("should return false if click is on element inside", function() {
         var loggedEvent;
 
-        runs(function(){
-          second.on('click', function(e){
-            loggedEvent = e;
-          });
-          setTimeout(function(){
-            second.click();
-          });
+        second.on('click', function(e){
+          loggedEvent = e;
         });
+        second.click();
 
-        waitsFor(function(){
-          return typeof loggedEvent !== 'undefined';
-        }, 'waiting for click', 1000)
+        jasmine.clock().tick(1000);
 
-        runs(function(){
-          expect(window.digitalOpera.isClickOutsideElement(loggedEvent, first)).toBe(false);
-        });
+        expect(window.digitalOpera.isClickOutsideElement(loggedEvent, first)).toBe(false);
       });
 
       it("should return false if click was on element", function() {
         var loggedEvent;
 
-        runs(function(){
-          second.on('click', function(e){
-            loggedEvent = e;
-          });
-          setTimeout(function(){
-            second.click();
-          });
+        second.on('click', function(e){
+          loggedEvent = e;
         });
+        second.click();
 
-        waitsFor(function(){
-          return typeof loggedEvent !== 'undefined';
-        }, 'waiting for click', 1000)
-
-        runs(function(){
-          expect(window.digitalOpera.isClickOutsideElement(loggedEvent, second)).toBe(false);
-        });
+        expect(window.digitalOpera.isClickOutsideElement(loggedEvent, second)).toBe(false);
       });
     });
   });

data/spec/javascripts/spec/preload_images_spec.js

@@ -12,65 +12,53 @@ describe("preload_images", function() {
       expect(function(){window.digitalOpera.preloadImages([google])}).not.toThrow();
     });
 
-    it('should callback once a single image loaded', function(){
-      var images,
-          callbackCalled = false;
+    describe('single image', function(){
+      var images, callbackCalled = false;
 
-      runs(function(){
+      beforeEach(function(done) {
         images = window.digitalOpera.preloadImages(google, function(){
-          callbackCalled = true;
+          done();
         });
       });
 
-      waitsFor(function(){
-        return callbackCalled == true;
-      }, 'callback should have been called', 5000);
-
-      runs(function(){
+      it('should callback once a single image loaded', function(done){
         expect(images[0].complete).toBe(true);
+        done();
       });
 
     });
 
-    it('should callback once all images are loaded', function(){
-      var images,
-          callbackCalled = false;
+    describe('multiple image', function(){
+      var images, callbackCalled = false;
 
-      runs(function(){
+      beforeEach(function(done) {
         images = window.digitalOpera.preloadImages([google, yahoo], function(){
-          callbackCalled = true;
+          done();
         });
       });
 
-      waitsFor(function(){
-        return callbackCalled == true;
-      }, 'callback should have been called', 5000);
-
-      runs(function(){
+      it('should callback once all images are loaded', function(done){
         expect(images[0].complete).toBe(true);
         expect(images[1].complete).toBe(true);
+        done();
       });
 
     });
 
-    it('should callback if there was an error', function(){
-      var images,
-          callbackCalled = false;
+    describe('bad image', function(){
+      var images, callbackCalled = false;
 
-      runs(function(){
-        images = window.digitalOpera.preloadImages(bad, function(){
-          callbackCalled = true;
+      beforeEach(function(done) {
+        images = window.digitalOpera.preloadImages([google, yahoo], function(){
+          done();
         });
       });
 
-      waitsFor(function(){
-        return callbackCalled == true;
-      }, 'callback should have been called', 5000);
-
-      runs(function(){
+      it('should callback if there was an error', function(done){
         expect(images[0].complete).toBe(true);
+        done();
       });
-    });
 
+    });
   });
 });

data/spec/javascripts/spec/tables_spec.js

@@ -19,7 +19,7 @@ describe("tables", function() {
     });
 
     it('should open new window if has data-does="open-window"', function(){
-      spyOn(window, 'open').andReturn(focusObject);
+      spyOn(window, 'open').and.returnValue(focusObject);
       table.find('tr:first').attr('data-does', 'open-window');
       table.find('tr:first').click();
       expect(window.open).toHaveBeenCalled();
@@ -28,7 +28,7 @@ describe("tables", function() {
     it('should not follow link if click is within the anchor', function(){
       var anchor = $('<a href="http://bing.com">my link</a>')
       table.find('tr:first td:first').append(anchor);
-      spyOn(window, 'open').andReturn(focusObject);
+      spyOn(window, 'open').and.returnValue(focusObject);
       spyOn(window.digitalOpera.forTestingPurposes, 'getWindowLocation');
       anchor.click();
       expect(window.open).not.toHaveBeenCalled();
@@ -38,7 +38,7 @@ describe("tables", function() {
     it('should not follow link if click is within a span within the anchor', function(){
       var anchor = $('<a href="http://bing.com"><span>my link</span></a>')
       table.find('tr:first td:first').append(anchor);
-      spyOn(window, 'open').andReturn(focusObject);
+      spyOn(window, 'open').and.returnValue(focusObject);
       spyOn(window.digitalOpera.forTestingPurposes, 'getWindowLocation');
       anchor.find('span').click();
       expect(window.open).not.toHaveBeenCalled();

data/spec/{banker_spec.rb → lib/digital_opera/banker_spec.rb}

@@ -11,13 +11,13 @@ describe DigitalOpera::Banker do
 
   context 'from string' do
     it 'should convert to cents' do
-      subject.money_in_account = '15.31'
-      subject.money_in_account_in_cents.should eq 1531
+      subject.money_in_account = '16.31'
+      subject.money_in_account_in_cents.should eq 1631
     end
 
     it 'should convert to cents' do
-      subject.money_in_account_in_cents = '1531'
-      subject.money_in_account.should eq '15.31'
+      subject.money_in_account_in_cents = '1631'
+      subject.money_in_account.should eq '16.31'
     end
   end
 

data/spec/{presenter → lib/digital_opera/presenter}/base_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
-require 'support/user'
-require 'support/base_presenter'
-require 'action_controller'
 
 describe DigitalOpera::Presenter::Base do
   let(:user) { User.new }

data/spec/lib/digital_opera/services/s3_spec.rb

@@ -0,0 +1,203 @@
+require 'spec_helper'
+require_relative "../../../../lib/digital_opera/services/s3"
+
+describe DigitalOpera::Services::S3 do
+  let(:document){ Document.new s3_key: "documents/#{doc_name}" }
+  let(:doc_name){ 'test.png' }
+  let(:service){ DigitalOpera::Services::S3.new document }
+
+  before(:each) do
+    ENV["S3_BUCKET_NAME"] = 'testbuketname'
+    ENV["S3_ACCESS_KEY"] = 'testaccesskey'
+    ENV["S3_SECRET_ACCESS_KEY"] = 'testsecredaccesskey'
+  end
+
+  context 'when AWS is defined' do
+    before(:each) do
+      AWS.stub!
+    end
+
+    it 'should have a document' do
+      service.document.should eq document
+    end
+
+    it 'should have default options' do
+      service.instance_variable_get(:@options)[:acl].should eq 'authenticated-read'
+    end
+
+    it 'should be able to override options' do
+      service = DigitalOpera::Services::S3.new document, {acl: 'public-read'}
+      service.instance_variable_get(:@options)[:acl].should eq 'public-read'
+    end
+
+    it 'should have a base_url' do
+      service.base_url.should eq "https://#{ENV["S3_BUCKET_NAME"]}.s3.amazonaws.com/"
+    end
+
+    it 'should have a bucket' do
+      service.bucket.class.should eq AWS::S3::Bucket
+    end
+
+    it 'bucket_name should return a string' do
+      service.bucket_name.should eq ENV["S3_BUCKET_NAME"]
+    end
+
+    it 'access_key should return a string' do
+      service.access_key.should eq ENV["S3_ACCESS_KEY"]
+    end
+
+    it 'secret_access_key should return a key' do
+      service.secret_access_key.should eq ENV["S3_SECRET_ACCESS_KEY"]
+    end
+
+    it 'should have upload_key' do
+      service.upload_key.should eq 'documents/${filename}'
+    end
+
+    describe '#document_name' do
+      it 'should return name' do
+        service.document_name.should eq doc_name
+      end
+
+      it 'should return nil if key is nil' do
+        service = DigitalOpera::Services::S3.new Document.new({})
+        service.document_name.should be_nil
+      end
+    end
+
+
+    describe '#key' do
+      it 'should return a s3 key string if only key is supplied' do
+        service = DigitalOpera::Services::S3.new 'accounts/10/example.jpg'
+        service.key.should eq 'accounts/10/example.jpg'
+      end
+
+      it 'should return a s3 key string if only key is supplied with forward slash' do
+        service = DigitalOpera::Services::S3.new '/accounts/10/example.jpg'
+        service.key.should eq 'accounts/10/example.jpg'
+      end
+
+      it 'should return a s3 key string if full url is supplied' do
+        service = DigitalOpera::Services::S3.new "https://#{ENV["S3_BUCKET_NAME"]}.s3.amazonaws.com/accounts/10/example.jpg"
+        service.key.should eq 'accounts/10/example.jpg'
+      end
+
+      it 'should return nil if no s3_key is present' do
+        service = DigitalOpera::Services::S3.new Document.new({})
+        service.key.should be_nil
+      end
+    end
+
+    describe '#public_url' do
+      it 'calls S3s public_url' do
+        service.public_url.should eq service.base_url + service.key
+      end
+
+      it 'should return nil if s3_object is blank' do
+        service = DigitalOpera::Services::S3.new Document.new({})
+        service.public_url.should be_nil
+      end
+    end
+
+    describe '#private_url' do
+      it 'calls S3s url_for' do
+        disposition = "attachment; filename=#{doc_name.parameterize}"
+        service.s3_object.expects(:url_for).with(:read, :expires => service.expiration(10.minutes), :response_content_disposition => disposition)
+
+        service.private_url
+      end
+
+      it 'should return nil if s3_object is blank' do
+        service.stubs(:s3_object).returns(nil)
+        service.private_url.should be_nil
+      end
+
+      it 'should create disposition from document' do
+        service = DigitalOpera::Services::S3.new Document.new({s3_key: 'testname.exx'})
+
+        disposition = "attachment; filename=#{'testname.exx'.parameterize}"
+        service.s3_object.expects(:url_for).with(:read, :expires => service.expiration(10.minutes), :response_content_disposition => disposition)
+
+        service.private_url
+      end
+
+      it 'should create disposition from key if @document is string' do
+        disposition = "attachment; filename=#{doc_name.parameterize}"
+        service.s3_object.expects(:url_for).with(:read, :expires => service.expiration(10.minutes), :response_content_disposition => disposition)
+
+        service.private_url
+      end
+    end
+
+    describe '#expiration' do
+      it 'should return an iso time' do
+        Time.any_instance.expects(:iso8601).returns('2013-09-19T09:38:45Z')
+
+        service.expiration.should eq '2013-09-19T09:38:45Z'
+      end
+
+      it 'should return a time in the future' do
+        DateTime.parse(service.expiration).should > DateTime.now
+      end
+
+      it 'should return an adjusted time supplied based on param supplied' do
+        service.expiration(5.minutes).should eq 5.minutes.from_now.to_time.iso8601
+        service.expiration(2.hours).should eq 2.hours.from_now.to_time.iso8601
+      end
+    end
+
+    describe '#delete' do
+      it 'should call S3s delete' do
+        service.s3_object.expects(:delete)
+
+        service.delete
+      end
+    end
+
+    describe '#s3_object' do
+      it 'should call s3 object' do
+        hash = { objects: {} }
+        hash[:objects][service.key] = 'test_object'
+        hash = Confstruct::Configuration.new hash
+        service.stubs(:bucket).returns(hash)
+
+        service.s3_object.should eq 'test_object'
+      end
+
+      it 'should return nil if key is blank' do
+        service.stubs(:key).returns(nil)
+        service.s3_object.should be_nil
+      end
+
+      it 'should be memoized' do
+        hash = { objects: {} }
+        hash[:objects][service.key] = 'test_object'
+        h = Confstruct::Configuration.new hash
+        service.stubs(:bucket).returns(h)
+
+        service.s3_object.should eq 'test_object'
+
+        hash[:objects][service.key] = 'boo'
+        h = Confstruct::Configuration.new hash
+        service.stubs(:bucket).returns(h)
+
+        service.s3_object.should eq 'test_object'
+      end
+    end
+  end
+
+  context 'when AWS is not defined' do
+    before(:each) do
+      @tmp = AWS
+    end
+
+    after(:each) do
+      AWS = @tmp
+    end
+
+    it 'should throw error on init' do
+      AWS = nil
+      expect{service}.to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,23 +1,29 @@
+ENV["RAILS_ENV"] ||= 'test'
+
 require 'rubygems'
 require 'spork'
-require 'active_support'
-require 'digital_opera'
 
 Spork.prefork do
-  ENV["RAILS_ENV"] ||= 'test'
-  require 'rspec'
+  require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+  require 'rspec/rails'
   require 'rspec/autorun'
   require 'mocha/api'
 
+  require 'confstruct'
+  require 'aws'
+
+  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
   # Configure RSpec ---------------------------------------
   RSpec.configure do |config|
-    config.mock_with :mocha
+    config.mock_framework = :mocha
 
     # Run specs in random order to surface order dependencies. If you find an
     # order dependency and want to debug it, you can fix the order by providing
     # the seed, which is printed after each run.
     #     --seed 1234
     config.order = "random"
+    # config.order = 63206
   end
 end
 

data/spec/support/aws.rb

@@ -0,0 +1,5 @@
+AWS.config({
+  :access_key_id => 'ACCESS_KEY_ID',
+  :secret_access_key => 'SECRET_ACCESS_KEY',
+  :region => 'us-east-1',
+})

data/spec/support/document.rb

@@ -0,0 +1,10 @@
+class Document
+  # simulate fields
+  attr_accessor :s3_key
+
+  def initialize(opts)
+    opts.each do |key, val|
+      self.send "#{key}=", val if self.respond_to? "#{key}="
+    end
+  end
+end

data/tasks/spec.rake

@@ -0,0 +1,5 @@
+namespace :spec do
+  task :js do
+    system("cd spec/dummy && bundle exec rake jasmine:ci") or exit!(1)
+  end
+end

data/tmp/rspec_guard_result

@@ -0,0 +1 @@
+