boxlet 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e992bafcddffa31e97f52f3b4bc68987b820951a
-  data.tar.gz: 9f0ab5017c04358b38e4e4942dde625eb97c8221
+SHA256:
+  metadata.gz: 22addba52278e369b28f8982c4677e755836f4d2c04fbe707b44801fb9f07ad1
+  data.tar.gz: 60efb6a881c856d933f01cca1dc4990994d9f51de84a284cc165dcb38d2b5fb4
 SHA512:
-  metadata.gz: ea4c9a1b3c1cc531de755f341f7511c163395ce0748604b77d1ae4927d1720165a68d6513f8a46cb02f008bd074a8e52d401dfa2fb63dd750a4589a55f856107
-  data.tar.gz: 6e0323011705d423caaae87cef98106851f8f4897302ce7034eed070b08cfd1823ad28d68f0984dd5b0f5533b31aa2de39492079d394cc4fa59b045ea64f1816
+  metadata.gz: b3f361c702384a91af6cc15ba8996d6971f39ed6ae40605c429537dd62c3e922ec765db8e447af822e00cb132eb8bc0fc902a9f10c64383f6ba525a27d08caa9
+  data.tar.gz: 248a1db5306eeac1def8e27c1cd3fd3b7df9d9e5895ea4f00f675cdf0ec5aa66de4fe2de7b3eece3e86f12a4fb04f7c43320c43b56ab586c2ee0ef8ebe332bd3

data/lib/boxlet/app.rb

@@ -33,6 +33,7 @@ module Boxlet
         ["/flashback", :post]       => :flashback,
         ["/gallery", :get]          => :gallery,
         ["/gallery/images", :get]   => :gallery_images,
+        ["/hello", :get]            => :hello,
       }
     end
 

data/lib/boxlet/app/controller.rb

@@ -18,6 +18,7 @@ require 'boxlet/app/templates'
   # ["/flashback", :post]       => :flashback,
   # ["/gallery", :get]          => :gallery,
   # ["/gallery/images", :get]   => :gallery_images,
+  # ["/hello", :get]            => :hello,
 # }
 
 
@@ -213,6 +214,10 @@ module Boxlet
       end
     end
 
+    def hello
+      'hi'
+    end
+
 
     private
 

data/lib/boxlet/app/views/gallery.html

@@ -61,10 +61,13 @@
       $scope.page = 1;
       $scope.limit = 50;
       $scope.images = [];
+      $scope.count = 0;
       $scope.heroImage = null;
-      $scope.counter = function() {
+
+      buildCounter = function(count) {
         var a = [],
-            pages = Math.ceil($scope.count / $scope.limit);
+            pages = getPageCount();
+
         for (var i = 1; i <= pages; i++) {
           a.push(i);
         }
@@ -79,16 +82,39 @@
         $scope.heroImage = image;
       };
 
+      function getPageCount() {
+        var lastPage = Math.ceil($scope.count / $scope.limit);
+
+        if (lastPage < 1) {
+          lastPage = 1;
+        }
+
+        return lastPage;
+      }
+
       $scope.fetchImages = function() {
-        var imagesUrl = "/gallery/images?page=" + $scope.page + "&limit=" + $scope.limit + "&uuid=" + uuid;
-
-        $http.get(imagesUrl).then(function(results) {
-          basePath = results.data.base_path;
-          $scope.basePath = basePath;
-          $scope.count = results.data.count;
-          $scope.images = results.data.images;
-          $scope.heroImage = $scope.images[0];
-        });
+        var imagesUrl;
+
+        $scope.limit = parseInt($scope.limit);
+
+        if ($scope.limit >= 1) {
+          var newLastPossiblePage = getPageCount();
+
+          if ($scope.page > newLastPossiblePage) {
+            $scope.page = newLastPossiblePage;
+          }
+
+          imagesUrl = "/gallery/images?page=" + $scope.page + "&limit=" + $scope.limit + "&uuid=" + uuid;
+
+          $http.get(imagesUrl).then(function(results) {
+            $scope.count = results.data.count;
+            $scope.basePath = results.data.base_path;
+            $scope.images = results.data.images;
+            $scope.heroImage = $scope.images[0];
+
+            $scope.imagePages = buildCounter($scope.count);
+          });
+        }
       }
 
       $scope.fetchImages();
@@ -101,9 +127,11 @@
       <img ng-src="{{basePath}}/{{heroImage.filename}}" />
     </div>
 
-    <select ng-change="fetchImages()" ng-model="page" ng-options="page for page in counter() track by page">
-      <option ng-repeat="page in counter()" value="page">{{page}}</option>
+    <select ng-change="fetchImages()" ng-model="page" ng-options="page for page in imagePages track by page">
     </select>
+
+    <input ng-model="limit" type="number" min="1" max="50" ng-change="fetchImages()" />
+
     <ul class="image-row">
       <li ng-repeat="image in images" style="background-image: url({{imageSource(image, 'thumbnail')}})" ng-click="setHeroImage(image)"></li>
     </ul>

data/lib/boxlet/version.rb

@@ -1,3 +1,3 @@
 module Boxlet
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxlet
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - arktisklada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -241,9 +241,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Upload pics from your phone
 test_files: []
-has_rdoc: