device_tracker 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 018a85e0e147456124384689fa9d3e4b1660f984
-  data.tar.gz: e62080ad81c9eccbba8d9cc77009ccbeb29c39e9
+  metadata.gz: df251b07b969772c80c3c575cdc5a1d2c461560a
+  data.tar.gz: a5f533d66c0bdc34cd38154a331ac522515b4b81
 SHA512:
-  metadata.gz: 2e51302f55c8d043b3930546272fe6f5afbd68e6e6afbf123b863837adeb3e7d201398cb6355c05879d673b5856911ab299714aa6333d0b63eff757d7e0d09c6
-  data.tar.gz: 3ea080d528504d793f583d7a9afde1e8d5cc3eb6fad388fa8fc997d2396b7186a63aaf01c3f1402eff4a74ec6ed729eadce8012d4f4472414b0676f1fc80a346
+  metadata.gz: 30bfc407ef2be9b1e8e1e97636d0f5ab9b026027f2c836fe747c064be3ac39990a98aac66fad94e1d25452f6a26e06956b9df37a0a630e88ae0df591aefe2a1f
+  data.tar.gz: f2c455436eeb109353f433ce635b13ecfda0ef6d67d1ab6a14a6f36cdf28589bb3fbdadd8def86b71a39febcd8c41c11a0c58ba1e7fb9c81fdac0caa1bfae40d

data/device_tracker.gemspec

@@ -45,19 +45,19 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'factory_girl'
 
-  spec.add_dependency 'sinatra', '~> 1.4'
-  spec.add_dependency 'activerecord', '~> 4.0'
-  spec.add_dependency 'sinatra-activerecord', '~> 2.0'
-  spec.add_dependency 'bcrypt', '~> 3.1.7'
-  spec.add_dependency 'json', '~> 1.7'
-  spec.add_dependency 'sinatra-contrib', '~> 1.4'
-  spec.add_dependency 'sinatra-partial', '~> 0.4'
-  spec.add_dependency 'sinatra-flash', '~> 0.3'
-  spec.add_dependency 'thin', '~> 1.6'
-  spec.add_dependency 'rake', '~> 10.4'
-  spec.add_dependency 'sqlite3', '~> 1.3'
+  spec.add_dependency 'sinatra', '~> 1.4.7'
+  spec.add_dependency 'activerecord', '~> 5.0', '>= 5.0.0.1'
+  spec.add_dependency 'sinatra-activerecord', '~> 2.0', '>= 2.0.11'
+  spec.add_dependency 'bcrypt', '~> 3.1.11'
+  spec.add_dependency 'json', '~> 2.0', '>= 2.0.2'
+  spec.add_dependency 'sinatra-contrib', '~> 1.4.7'
+  spec.add_dependency 'sinatra-partial', '~> 1.0.0'
+  spec.add_dependency 'sinatra-flash', '~> 0.3.0'
+  spec.add_dependency 'thin', '~> 1.7.0'
+  spec.add_dependency 'rake', '~> 11.3.0'
+  spec.add_dependency 'sqlite3', '~> 1.3.12'
   spec.add_dependency 'pony', '~> 1.11'
-  spec.add_dependency 'mysql2', '~> 0.3.20'
-  spec.add_dependency 'json-schema', '~> 2.5'
+  spec.add_dependency 'mysql2', '~> 0.4.5'
+  spec.add_dependency 'json-schema', '~> 2.7.0'
   spec.add_dependency 'faker'
 end

data/lib/device_tracker/controllers/application_controller.rb

@@ -191,7 +191,7 @@ module DeviceTracker
 
     post '/login' do
       # Parse the form
-      email = params[:user][:email]
+      email = params[:user][:email].downcase
       password = params[:user][:password]
 
       if email.empty? || password.empty?

data/lib/device_tracker/controllers/transactions_controller.rb

@@ -4,7 +4,7 @@ module DeviceTracker
   # :nodoc:
   class TransactionsController < ApplicationController
     get '/' do
-      @transactions = Transaction.limit(100).order(created_at: :desc).all
+      @transactions = Transaction.limit(200).order(created_at: :desc).all
 
       erb :"transactions/index"
     end

data/lib/device_tracker/controllers/users_controller.rb

@@ -55,6 +55,9 @@ module DeviceTracker
                         params[:user][:is_admin] == 'on')
         user.is_verified = (!params[:user][:is_verified].nil? &&
                            params[:user][:is_verified] == 'on')
+
+        user.is_developer = (!params[:user][:is_developer].nil? &&
+                           params[:user][:is_developer] == 'on')
       end
 
       unless original_params[:password].empty?

data/lib/device_tracker/db/migrate/20161103135510_add_is_developer_to_users.rb

@@ -0,0 +1,8 @@
+# :nodoc:
+class AddIsDeveloperToUsers < ActiveRecord::Migration
+  def change
+    change_table :users do |t|
+      t.boolean :is_developer, default: false
+    end
+  end
+end

data/lib/device_tracker/version.rb

@@ -1,4 +1,4 @@
 # :nodoc:
 module DeviceTracker
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/device_tracker/views/_user_form.erb

@@ -27,4 +27,10 @@
     <input type="checkbox" id="is_verified" name="user[is_verified]" <%= @user.is_verified == true ? "checked='checked'" : "" %>>
     <label for="is_verified">Verified</label>
   </div>
+  <div class="form-group">
+    <p class="help-block">Users that are classed as <code>Developers</code> are able to checkout devices 
+    for an indefinate time period.</p>
+    <input type="checkbox" id="is_developer" name="user[is_developer]" <%= @user.is_developer == true ? "checked='checked'" : "" %>>
+    <label for="is_developer">Developer</label>
+  </div>
 <% end %>

data/lib/device_tracker/views/devices/show.erb

@@ -107,7 +107,9 @@
     <% unless @device.available %>
     <div class="panel panel-default">
       <!-- Default panel contents -->
-      <div class="panel-heading">Current User</div>
+      <div class="panel-heading">Current User 
+      <% if @device.user.is_developer %>
+      <span class="pull-right label label-info">Developer</span><% end %></div>
       <!-- List group -->
       <ul class="list-group">
         <li class="list-group-item">

data/lib/device_tracker/views/index.erb

@@ -18,9 +18,9 @@
 </thead>
 <tbody>
   <% @devices.each do |device| %>
-  <tr class="clickable-row <%= device.passed_use_by_date? ? "danger" : "" %>" data-url="/devices/<%= device.id %>">
+  <tr class="clickable-row <%= device.passed_use_by_date? && !device.user.is_developer ? "danger" : "" %>" data-url="/devices/<%= device.id %>">
     <td><%= device.full_name %></td>
-    <td><%= device.user.name %></td>
+    <td><%= device.user.name %> <% if device.user.is_developer %><span class="label label-info">Developer</span><% end %></td>
     <td><%= device.checked_out_since_formatted %></td>
   </tr>
   <% end %>

data/lib/device_tracker/views/users/manage.erb

@@ -17,6 +17,7 @@
           <b>Administrator: </b><%= user.is_admin? == true ? "Yes" : "No"%><br>
           <b>Device count: </b><%= user.devices.size %><br>
           <b>Account Verified: </b><%= user.is_verified? == true ? "Yes" : "No" %><br>
+          <b>Developer: <%= user.is_developer? == true ? "Yes" : "No"%></b>
         </td>
         <td width="10%">
           <a href="/users/<%= user.id %>/edit" class="btn btn-warning btn-full-width btn-xs padding-bottom">Edit</a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_tracker
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - James Ruston
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,28 +143,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.7
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: sinatra-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +178,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -179,118 +188,127 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.11
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.1.11
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.7
 - !ruby/object:Gem::Dependency
   name: sinatra-partial
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 11.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 11.3.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.12
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
@@ -311,28 +329,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -397,6 +415,7 @@ files:
 - lib/device_tracker/db/migrate/20151029085629_add_password_reset_code_to_users.rb
 - lib/device_tracker/db/migrate/20151030130341_add_missing_column_to_devices.rb
 - lib/device_tracker/db/migrate/20151102141601_add_serial_number_to_devices.rb
+- lib/device_tracker/db/migrate/20161103135510_add_is_developer_to_users.rb
 - lib/device_tracker/db/schema.rb
 - lib/device_tracker/db/seeds.rb
 - lib/device_tracker/dependencies.rb
@@ -498,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A web app for managing mobile devices