upmin-admin 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05591a19f31e85ef3e32d1032bf0886455336995
-  data.tar.gz: 5be32b7cc779891aefc057edbe0f37f0f70aaa5d
+  metadata.gz: 6bd7cc2583a8e2019373b7628b6fee2ff186c526
+  data.tar.gz: f7f129e4e4f4e2691c9822d9cff24cffdccddd56
 SHA512:
-  metadata.gz: 3f88b68c678d08d330ea6ffe1dcb1465c47a314c211014b512eec9b7d0d5d3bb421d4a070329fbcec02f59023229680df3bdc0cf0c4e81cd02f8cc149d650dc6
-  data.tar.gz: e5320ae6d314197694b4d23c9ef693efea999b87889239a51cab542787f49f0d68087aaadb97d23bb62dada48fa41fb1e06d4c16330c32e3f5839752aedceabc
+  metadata.gz: 03e51d88c3c4552e02605da44b6cae42a70c0f86f8bcbeab1950c199d063ca6c5cf2757550525ee16ee3624bc1914f1bd52f6cec69ff7cb0e458f1def3c0cd76
+  data.tar.gz: 40284c1fe7e51a3acd9d1b13397548db8d695648dbc0aa74fa97089f8f27992b372eec98adb87e06116173f5985c0541d09c2569a833df60843dc4e93fb7a9f7

data/app/assets/javascripts/upmin/application.js

@@ -15,6 +15,7 @@
 //= require ./jquery-clockpicker
 //= require ./moment
 //= require ./pikaday
+//= require ./helpers
 //= require_tree .
 
 function runUpmin() {

data/app/assets/javascripts/upmin/attributes/datetime.js

@@ -0,0 +1,134 @@
+(function() {
+
+  // Methods used in datetime parsing and setting.
+  function parseDate(dateString) {
+    var matches = dateString.match(/(\d+).(\d+).(\d+)/i);
+    if (matches == null || matches.length < 4) {
+      return null;
+    } else {
+      var m = moment();
+      m.utc().year(matches[1]);
+      m.utc().month(matches[2]);
+      m.utc().date(matches[3]);
+      return m;
+    }
+  }
+
+  function setInputDate(newMoment, hiddenInput) {
+    if (newMoment == null || !newMoment.isValid()) {
+      hiddenInput.val("");
+      return null;
+    }
+
+    var curMoment = moment(hiddenInput.val());
+    if (!curMoment.isValid()) {
+      curMoment = newMoment;
+    } else {
+      curMoment.utc().year(newMoment.utc().year());
+      curMoment.utc().month(newMoment.utc().month());
+      curMoment.utc().date(newMoment.utc().date());
+    }
+    hiddenInput.val(curMoment.utc().format());
+    return curMoment;
+  }
+
+  function parseTime(timeString) {
+    var matches = timeString.match(/(\d+)(?::(\d\d))?\s*(p?)/i);
+    if (matches == null || matches.length < 4) {
+      return null;
+    } else {
+      var m = moment();
+
+      var h = parseInt(matches[1]);
+      if (h == 12 && !matches[3]) {
+        h = 0
+      } else if (matches[3]) {
+        h += (h < 12) ? 12 : 0;
+      }
+      m.utc().hour(h);
+      m.utc().minute(matches[2]);
+      return m;
+    }
+  }
+
+  function setInputTime(newMoment, hiddenInput) {
+    if (newMoment == null || !newMoment.isValid()) {
+      hiddenInput.val("");
+      return null;
+    }
+
+    var curMoment = moment(hiddenInput.val());
+    if (!curMoment.isValid()) {
+      curMoment = newMoment;
+    } else {
+      curMoment.utc().hour(newMoment.utc().hour());
+      curMoment.utc().minute(newMoment.utc().minute());
+    }
+    hiddenInput.val(curMoment.utc().format());
+    return curMoment;
+  }
+
+
+
+
+
+
+  // Initializing the attribute view.
+  var init = function(formId) {
+    var dtSection = $("." + formId + ".datetime-attribute");
+    var hiddenInput = dtSection.find("input#" + formId + "[type=hidden]");
+    var dateInput = dtSection.find("#" + formId + "-date");
+    var timeInput = dtSection.find("#" + formId + "-time");
+
+    var dtMoment = moment(hiddenInput.val());
+    if (hiddenInput.val() == "") {
+      dtMoment = null;
+    }
+
+    var handleDateSelect = function() {
+      var newDateMoment = parseDate(dateInput.val());
+      setInputDate(newDateMoment, hiddenInput);
+      return newDateMoment;
+    }
+
+    var handleTimeSelect = function() {
+      var newTimeMoment = parseTime(timeInput.val());
+      setInputTime(newTimeMoment, hiddenInput);
+      return newTimeMoment;
+    }
+
+    // Create Date Picker
+    var datePicker = new Pikaday({ field: $("#" + formId + "-date")[0], onSelect: handleDateSelect });
+
+    // Create Time Picker
+    $("#" + formId + "-time").clockpicker({
+      autoclose: true,
+      donetext: "Done",
+      twelvehour: true,
+      afterDone: handleTimeSelect,
+    });
+
+    if (dtMoment != null) {
+      timeInput.val(dtMoment.utc().format("hh:mmA"));
+    }
+
+    dtSection.closest("form").submit(function(event) {
+      event.preventDefault();
+
+      // Only date is *required* so the order here is important.
+      handleTimeSelect();
+      handleDateSelect();
+
+      event.target.submit();
+    });
+  }
+
+
+  if (window.Upmin == null) {
+    window.Upmin = {};
+  }
+  if (window.Upmin.Attributes == null) {
+    window.Upmin.Attributes = {};
+  }
+  window.Upmin.Attributes.DateTime = init;
+})();

data/app/assets/stylesheets/upmin/attributes.css.scss

@@ -1,3 +1,11 @@
+.upmin-model input.boolean {
+    float: left;
+    height: auto;
+    margin: 4px 8px;
+    clear:both;
+}
+
+
 ol.progbar {
     margin: 0 0 50px 0;
     padding: 0;

data/app/assets/stylesheets/upmin/base.css.scss

@@ -8,8 +8,6 @@ body {
 .navbar {
 
   background-color: #2c3e50;
-  height: 60px;
-
 }
 
 .btn {

data/app/controllers/upmin/models_controller.rb

@@ -27,7 +27,7 @@ module Upmin
         # TODO(jon): Figure out a better way to do transforms.
         #   This could cause issues and is exploitable, but it
         #   should be fine for now since this is only on admin pages
-        if transforms[key]
+        if transforms[key] and not value.blank?
           value = transform(transforms, key, value)
         end
 
@@ -45,7 +45,7 @@ module Upmin
 
     def search
       @q = @klass.ransack(params[:q])
-      @results = @q.result(distinct: true).page(@page).per(30)
+      @results = Upmin::Paginator.paginate(@q.result(distinct: true), @page, 30)
     end
 
     def action
@@ -80,7 +80,7 @@ module Upmin
       end
 
       def set_page
-        @page = params[:page] || 0
+        @page = params[:page] || 1
       end
 
       # TODO(jon): Figure out a better way to do transforms that is easy to extend.

data/app/views/upmin/models/search.html.haml

@@ -4,7 +4,7 @@
       -# TODO(jon): Add pagination w/ search results
       = up_search_results(@q, @results)
       %br
-      = paginate @results
+      = up_paginate @results
       %br
       %br
     .col-md-4

data/app/views/upmin/partials/attributes/_boolean.html.haml

@@ -0,0 +1,8 @@
+- boolean ||= "false"
+
+- if editable && f = form_builder
+  = f.check_box(attr_name, value: boolean, class: "boolean")
+
+- else
+  %p.well
+    = f.check_box(attr_name, {value: boolean, class: "boolean", disabled: "disabled"})

data/app/views/upmin/partials/attributes/_datetime.html.haml

@@ -1,92 +1,33 @@
 - datetime ||= nil
+- datetime_str = datetime.utc.iso8601 if datetime
 - if editable && f = form_builder
-  = f.hidden_field(attr_name, value: datetime)
-  - # TODO(jon): Figure out a better way to do transforms. This works for now though.
-  = f.hidden_field("transforms[#{attr_name}]", value: "DateTime#parse")
-  .row
+  .row.datetime-attribute{class: form_id}
+    = f.hidden_field(attr_name, value: datetime_str)
+    - # TODO(jon): Figure out a better way to do transforms. This works for now though.
+    = f.hidden_field("transforms[#{attr_name}]", value: "DateTime#parse")
+
     .col-xs-12.col-md-4
       .input-group.pikadate
-        %input.form-control{type: :text, value: datetime, id: "#{form_id}-date"}
+        %input.form-control{type: :text, value: datetime_str, id: "#{form_id}-date"}
         %span.input-group-addon
           %span.glyphicon.glyphicon-calendar
+
     .col-xs-12.col-md-4
       .input-group.clockpicker{"data-align" => "top", "data-autoclose" => "true", "data-placement" => "right"}
-        %input.form-control{:type => "text", :value => datetime, id: "#{form_id}-time"}
+        %input.form-control{:type => "text", :value => datetime_str, id: "#{form_id}-time"}
         %span.input-group-addon
           %span.glyphicon.glyphicon-time
 
+    .col-xs-12.col-md-4
+      %small
+        Date & Time are shown in UTC. If not time is provided, the current time in UTC will be used.
 
 
   - content_for(:javascript) do
     :javascript
-      (function() {
-        var datePicker,
-            hiddenInput = $('##{form_id}'),
-            date = new Date(hiddenInput.val());
-
-        // Date Specific Code
-        var handleDateSelect = function() {
-          var pickerDate = datePicker.getDate();
-          console.log("Setting the date from " + date + " to " + pickerDate);
-
-          date.setUTCFullYear(pickerDate.getUTCFullYear());
-          date.setUTCMonth(pickerDate.getUTCMonth());
-          date.setUTCDate(pickerDate.getUTCDate());
-
-          hiddenInput.val(date.toUTCString());
-        }
-
-        datePicker = new Pikaday({ field: $('##{form_id}-date')[0], onSelect: handleDateSelect });
-
-        // Time Specific Code
-        var timeInput = $('##{form_id}-time');
-
-        var parseTime = function(timeString) {
-          var ret = new Date();
-
-          var time = timeString.match(/(\d+)(?::(\d\d))?\s*(p?)/i);
-          if (!time) {
-            return NaN;
-          }
-          var hours = parseInt(time[1], 10);
-          if (hours == 12 && !time[3]) {
-            hours = 0;
-          } else {
-            hours += (hours < 12 && time[3]) ? 12 : 0;
-          }
-
-          ret.setHours(hours);
-          ret.setMinutes(parseInt(time[2], 10) || 0);
-          ret.setSeconds(0, 0);
-          return ret;
-        }
-
-        var handleTimeSelect = function() {
-          var time = parseTime(timeInput.val());
-
-          date.setUTCHours(time.getUTCHours());
-          date.setUTCMinutes(time.getUTCMinutes());
-
-          hiddenInput.val(date.toUTCString());
-        }
-
-        timeInput.clockpicker({
-          autoclose: true,
-          donetext: "Done",
-          twelvehour: true,
-          afterDone: handleTimeSelect,
-          default: date.getHours() + ":" + date.getMinutes()
-        });
-
-        timeInput.val(date.getHours() + ":" + date.getMinutes());
-
-
-        // Make sure we set times when the form is input in case the user typed in values.
-        timeInput.closest("form").submit(function(event) {
-          // TODO(jon): Add code to handle typed in dates.
-          handleTimeSelect();
-        });
-      })();
+      $(document).ready(function() {
+        window.Upmin.Attributes.DateTime("#{form_id}");
+      });
 
 
 - else

data/app/views/upmin/partials/attributes/_float.html.haml

@@ -0,0 +1,7 @@
+- float ||= nil
+- if editable && f = form_builder
+  = f.text_field(attr_name, value: float, class: "form-control")
+
+- else
+  %p.well
+    = float

data/app/views/upmin/partials/attributes/_text.html.haml

@@ -0,0 +1,7 @@
+- text ||= nil
+- if editable && f = form_builder
+  = f.text_area(attr_name, value: text, rows: 4, class: "form-control")
+
+- else
+  %p.well
+    = text

data/lib/upmin/admin.rb

@@ -4,17 +4,23 @@ require "upmin/engine"
 require "upmin/klass"
 require "upmin/model"
 
+require "upmin/paginator"
+
 # Monkey patch code into rails
 require "upmin/railties/active_record"
+require "upmin/railties/paginator"
 require "upmin/railties/render"
 require "upmin/railties/render_helpers"
 require "upmin/railtie"
 
 # gems and stuff we use
+require "jquery-rails"
 require "ransack"
 require "haml"
 require "sass-rails"
-require "kaminari"
+
+# If WillPaginate is present we just use it, but by default upmin-admin uses Kaminari
+require "kaminari" unless defined?(WillPaginate)
 
 module Upmin
   module Admin

data/lib/upmin/paginator.rb

@@ -0,0 +1,14 @@
+module Upmin
+  module Paginator
+
+    def Paginator.paginate(chain, page = 1, per_page = 30)
+      if defined?(WillPaginate)
+        # Ignore per page for now - just use the will_paginate default
+        return chain.page(page.to_i)
+      else # Use Kaminari
+        return chain.page(page).per(per_page)
+      end
+    end
+
+  end
+end

data/lib/upmin/railtie.rb

@@ -9,10 +9,12 @@ module Upmin
 
       ActiveSupport.on_load(:action_controller) do
         ::ActionController::Base.send(:include, Upmin::Railties::Render)
+        ::ActionController::Base.send(:include, Upmin::Railties::Paginator)
       end
 
       ActiveSupport.on_load(:action_view) do
         ::ActionView::Base.send(:include, Upmin::Railties::Render)
+        ::ActionView::Base.send(:include, Upmin::Railties::Paginator)
       end
     end
   end

data/lib/upmin/railties/paginator.rb

@@ -0,0 +1,14 @@
+
+module Upmin::Railties
+  module Paginator
+
+    def up_paginate(scope, options = {}, &block)
+      if defined?(WillPaginate)
+        return will_paginate(scope, options)
+      else # Use Kaminari
+        return paginate(scope, options, &block)
+      end
+    end
+
+  end
+end

data/lib/upmin/version.rb

@@ -1,3 +1,3 @@
 module Upmin
-  VERSION = "0.0.37"
+  VERSION = "0.0.38"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upmin-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - Jon Calhoun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,6 +106,8 @@ files:
 - app/assets/images/upmin/logo_large.png
 - app/assets/images/upmin/logo_small.png
 - app/assets/javascripts/upmin/application.js
+- app/assets/javascripts/upmin/attributes/datetime.js
+- app/assets/javascripts/upmin/helpers.js
 - app/assets/javascripts/upmin/jquery-clockpicker.js
 - app/assets/javascripts/upmin/models.js
 - app/assets/javascripts/upmin/moment.js
@@ -131,10 +133,13 @@ files:
 - app/views/upmin/models/show.html.haml
 - app/views/upmin/partials/actions/_action.html.haml
 - app/views/upmin/partials/associations/_associations.html.haml
+- app/views/upmin/partials/attributes/_boolean.html.haml
 - app/views/upmin/partials/attributes/_datetime.html.haml
+- app/views/upmin/partials/attributes/_float.html.haml
 - app/views/upmin/partials/attributes/_integer.html.haml
 - app/views/upmin/partials/attributes/_progress_bar.html.haml
 - app/views/upmin/partials/attributes/_string.html.haml
+- app/views/upmin/partials/attributes/_text.html.haml
 - app/views/upmin/partials/attributes/_unknown.html.haml
 - app/views/upmin/partials/models/_model.html.haml
 - app/views/upmin/partials/search_boxes/_ransack_search_box.html.haml
@@ -148,8 +153,10 @@ files:
 - lib/upmin/engine.rb
 - lib/upmin/klass.rb
 - lib/upmin/model.rb
+- lib/upmin/paginator.rb
 - lib/upmin/railtie.rb
 - lib/upmin/railties/active_record.rb
+- lib/upmin/railties/paginator.rb
 - lib/upmin/railties/render.rb
 - lib/upmin/railties/render_helpers.rb
 - lib/upmin/version.rb