active_scaffold_camera 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56d1640c691ca62f6ab79aafee4744747a13df0a0e38fe7b438a38307a231d9b
-  data.tar.gz: 1541dfdac0a71ac903ddb1bffa802c4d18ee32bb457c72ba8318c02cd6f7390e
+  metadata.gz: 6d2dd4e1f852c81a0a90e6b77b0db2fdf259a974843c907e059283bcc0b251be
+  data.tar.gz: 01eeb04a95ba9e38326e0038e203019b521342f8b5a1b3803d12f00995e511d6
 SHA512:
-  metadata.gz: 543e5399bea1be0b8f5da896077ecc5d2571fbeff60179ab949b7070bbc3fb2dca943255305b1d9528d8047a5dc00094f9a44119be48df8e22ddd0e527bd94f1
-  data.tar.gz: b60afb1a520108e836fcb17dba4dc9fb47f7f4a1d8509cff886444a148701e9ac58427ca8467b927acbde58de315cbd6a2ab69e76e5a44030b01b03fd4143e9a
+  metadata.gz: 320c8a9a6e429e0155a31823db685ef430e4eabe806641ba2f856ed942a06e253cfdd1614a09c2cd0d58b1ba6c413902eb0989123bd8799edf988b31514a6761
+  data.tar.gz: 9ad5a523b0f1b902f5d33f35a15e5c5a9cfbb2e18ca9313f5a2ae3d04d655f325f65e471acbd41d585ea1b179a61a7ea8c6da2eb6ecb3fd3541a37e2abe17e29

data/{README.textile → README.md}

@@ -1,39 +1,48 @@
-h1. Camera for ActiveScaffold
+# Camera for ActiveScaffold
 
 Currently, this plugin is compatible with ActiveScaffold >= 3.4 gem.
 
-h2. Overview
+## Overview
 
-This plugin adds a camera viewer to take a snapshot from camera on ActiveScaffold forms. It uses "SayCheese.js":https://github.com/leemachin/say-cheese
+This plugin adds a camera viewer to take a snapshot from camera on ActiveScaffold forms. It uses [SayCheese.js](https://github.com/leemachin/say-cheese)
 
-h2. Installation
+### Browser compatibility
+
+The plugin uses the modern `navigator.mediaDevices` API when available, including
+[`enumerateDevices()`](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/enumerateDevices)
+and `deviceId` constraints. The legacy callback-based API, `MediaStreamTrack.getSources`,
+and `sourceId` constraints remain available as a fallback for older browsers.
+
+Camera access requires a secure context (HTTPS or localhost) and the user's permission.
+
+## Installation
 
 You'll need at least ActiveScaffold 3.4 to use this
 
-<pre>
+```
 gem install active_scaffold_camera
-</pre>
+```
 
-h2. Usage
+## Usage
 
-h4. Step 1
+#### Step 1
 
 Set column to use :snapshot form_ui
 
-h4. Step 2
+#### Step 2
 
 Setup snapshot using options method on column
 
-<pre>
+```ruby
 # app/controllers/visitors_controller.rb
 
 class VisitorsController < ApplicationController
   active_scaffold :visitor do |config|
-    config.columns[:signature].form_ui = :signaturepad
-    config.columns[:signature].options = {:source => -1}
+    config.columns[:id_card].form_ui = :snapshot
+    config.columns[:id_card].options = {:source => -1}
   end
 end
-</pre>
+```
 
 Available options: video_not_supported, audio_not_supported, media_forbidden, source
 
@@ -41,20 +50,20 @@ Source can be set to use a specific source instead of displaying source selector
 
 If video_not_supported, audio_not_supported or media_forbidden are symbols they will be translated (using as_ method, so it must be on active_scaffold namespace). They have a default translation.
 
-h4. Save image
+#### Save image
 
 Snapshot form_ui sends a data url, encoded on base64, of the image, so it should be saved on column of blob type.
 
-h2. Support
+## Support
 
-If you have issues installing the plugin, search / post to the "Active Scaffold":http://groups.google.com/group/activescaffold forum or "Create an issue":http://github.com/activescaffold/active_scaffold_camera/issues
+If you have issues installing the plugin, search / post to the [Active Scaffold](http://groups.google.com/group/activescaffold) forum or [Create an issue](http://github.com/activescaffold/active_scaffold_camera/issues)
 
-h2. Contributing
+## Contributing
 
 Fork, hack, push, and request a pull:
 
 http://github.com/activescaffold/active_scaffold_camera/
 
-h2. License
+## License
 
 Released under the MIT license (included).

data/app/assets/javascripts/active_scaffold_camera.js

@@ -2,12 +2,40 @@
 //= require_self
 
 ActiveScaffold.snapshot = function(selector_or_elements, parent) {
+  function modernMediaApi() {
+    return navigator.mediaDevices && navigator.mediaDevices.getUserMedia;
+  }
+
   function videoConstraint(video) {
-    return typeof(video) == 'string' ? {optional: [{sourceId: video}]} : video;
+    if (typeof(video) != 'string') return video;
+    return modernMediaApi() ? {deviceId: {exact: video}} : {optional: [{sourceId: video}]};
   }
 
   function audioConstraint(audio) {
-    return typeof(audio) == 'string' ? {optional: [{sourceId: audio}]} : audio;
+    if (typeof(audio) != 'string') return audio;
+    return modernMediaApi() ? {deviceId: {exact: audio}} : {optional: [{sourceId: audio}]};
+  }
+
+  function enumerateVideoSources(callback) {
+    if (navigator.mediaDevices && navigator.mediaDevices.enumerateDevices) {
+      navigator.mediaDevices.enumerateDevices().then(function(devices) {
+        callback(devices.filter(function(device) {
+          return device.kind == 'videoinput';
+        }).map(function(device) {
+          return {id: device.deviceId, label: device.label};
+        }));
+      }).catch(function() {
+        callback([]);
+      });
+    } else if (window.MediaStreamTrack && MediaStreamTrack.getSources) {
+      MediaStreamTrack.getSources(function(sourceInfos) {
+        callback(sourceInfos.filter(function(source) {
+          return source.kind == 'video';
+        }));
+      });
+    } else {
+      callback([]);
+    }
   }
 
   function startVideo(element, video, audio, video_select) {
@@ -59,22 +87,15 @@ ActiveScaffold.snapshot = function(selector_or_elements, parent) {
 
   elements.each(function() {
     var $element = $(this), selector = '#' + $element.attr('id');
-    MediaStreamTrack.getSources(function(sourceInfos) {
-      var sources = [];
-      for(i in sourceInfos) {
-        var source = sourceInfos[i];
-        if (source.kind == 'video') {
-          sources.push(source);
-        }
-      }
+    enumerateVideoSources(function(sources) {
       var video, source, select, index = $element.data('source');
       if (index != null) {
         if (index < 0) source = sources[sources.length + index];
         else source = sources[index];
         if (source) video = source.id;
       } else if (sources.length > 1) {
-        var select = $('<select>');
-        for (i in sources) {
+        select = $('<select>');
+        for (var i in sources) {
           source = sources[i];
           select.append($('<option>').val(source.id).html(source.label || 'camera ' + (i + 1)));
         }

data/app/assets/javascripts/say-cheese.js

@@ -16,7 +16,7 @@ var SayCheese = (function() {
 
   var SayCheese;
 
-  navigator.getUserMedia = (navigator.getUserMedia ||
+  var legacyGetUserMedia = (navigator.getUserMedia ||
                             navigator.webkitGetUserMedia ||
                             navigator.mozGetUserMedia ||
                             navigator.msGetUserMedia ||
@@ -89,6 +89,8 @@ var SayCheese = (function() {
         streaming = false;
 
     this.video = document.createElement('video');
+    this.video.autoplay = true;
+    this.video.playsInline = true;
 
     this.video.addEventListener('canplay', function() {
       if (!streaming) {
@@ -137,7 +139,7 @@ var SayCheese = (function() {
   SayCheese.prototype.start = function start() {
 
     // fail fast and softly if browser not supported
-    if (navigator.getUserMedia === false) {
+    if ((!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) && legacyGetUserMedia === false) {
       this.trigger('error', 'NOT_SUPPORTED');
       return false;
     }
@@ -146,7 +148,9 @@ var SayCheese = (function() {
       this.stream = stream;
       this.createVideo();
 
-      if (navigator.mozGetUserMedia) {
+      if ('srcObject' in this.video) {
+        this.video.srcObject = stream;
+      } else if (navigator.mozGetUserMedia) {
         this.video.mozSrcObject = stream;
       } else {
         this.video.src = this.getStreamUrl();
@@ -169,16 +173,36 @@ var SayCheese = (function() {
       this.trigger('error', error);
     }.bind(this);
 
-    return navigator.getUserMedia({ video: this.options.video, audio: this.options.audio }, success, error);
+    var constraints = { video: this.options.video, audio: this.options.audio };
+
+    if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
+      return navigator.mediaDevices.getUserMedia(constraints).then(success).catch(error);
+    }
+
+    return legacyGetUserMedia.call(navigator, constraints, success, error);
   };
 
   SayCheese.prototype.stop = function stop() {
-    this.stream.stop();
+    if (!this.stream) {
+      return false;
+    }
+
+    if (this.stream.getTracks) {
+      this.stream.getTracks().forEach(function(track) {
+        track.stop();
+      });
+    } else if (this.stream.stop) {
+      this.stream.stop();
+    }
 
-    if (window.URL && window.URL.revokeObjectURL) {
+    if (this.video && 'srcObject' in this.video) {
+      this.video.srcObject = null;
+    } else if (this.video && window.URL && window.URL.revokeObjectURL && this.video.src) {
       window.URL.revokeObjectURL(this.video.src);
     }
 
+    this.stream = null;
+
     return this.trigger('stop');
   };
 

data/lib/active_scaffold_camera/version.rb

@@ -1,7 +1,7 @@
 module ActiveScaffoldCamera
   module Version
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_camera
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergio Cambra
 - Volker Hochstein
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,10 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.textile
+- README.md
 files:
 - LICENSE
-- README.textile
+- README.md
 - app/assets/javascripts/active_scaffold_camera.js
 - app/assets/javascripts/say-cheese.js
 - app/assets/stylesheets/active_scaffold_camera.scss
@@ -63,7 +62,6 @@ homepage: http://github.com/activescaffold/active_scaffold_camera
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Snapshot form_ui using saycheese.js
 test_files: []