upmin-admin 0.1.01 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 910d8396eb70b53feb5a498af6acc41edb1e3d1e
-  data.tar.gz: 6e2d7366490c0dfb137a503a02fd6784111714c4
+  metadata.gz: 04a4f4f1edcfc6d6b2717175fcba3473962400d6
+  data.tar.gz: 40a38a4a7233b3a9ddb09e826731911b346c0286
 SHA512:
-  metadata.gz: 4aea3404252228d686ed20f0a480e7d32898c70ef6edc895b387272bc14cfdb82bf6e06f8044fa15360fcf3ddc3dea147b6429c3cd6997460dff5d785e153e01
-  data.tar.gz: bdb283f1c155465a8f94be4b5d290d21ff0c2883c9536323850b809a5e3a0223df65c2d3212f44bb073c89bd587c3b192e1d49f9ded56fe327a6dbdafc815df8
+  metadata.gz: b6a111fa50f037447043dc456538dbd033ebae0f77b17fd5ce42228ce529576c60c0c9a8844fa84769dcf1e522a9e240121a8a46e509deb946713f6a3465b5d0
+  data.tar.gz: 3acbf22f1bf9df75aab7b3481e30712b935d5c26cb7b6613bd61c9962ea59e80a17357ab396c1c3c7317291611b0b1fef958595ead294d0ecf5c79c366187912

data/README.md

@@ -6,15 +6,9 @@ Upmin Admin is a framework for creating powerful Ruby on Rails admin backends wi
 Upmin currently supports Rails 3.2, 4.0, 4.1 & 4.2.
 
 
-## Demo Videos
-
-**NOTE** - The videos are currently outdated, and are only relevant for versions below `0.1.0`. Please refer to the docs for recent releases until we get them updated.
-
-To see videos showing how to install and giving a pretty good overview of the main features of upmin-admin go to [https://www.upmin.com/admin-rails](https://www.upmin.com/admin-rails).
-
 ## Demo Applications
 
-There is also a demo application you can test out here: [store_demo](https://github.com/upmin/store_demo). The repository is maintained and updated by [Upmin](https://www.upmin.com), but you are welcome to contribute to it.
+There is a demo application you can test out here: [store_demo](https://github.com/upmin/store_demo).
 
 If you do choose to use the [store_demo](https://github.com/upmin/store_demo), please follow the directions in the [README](https://github.com/upmin/store_demo/blob/master/README.md) to ensure you have seed data to work with.
 
@@ -29,31 +23,29 @@ Installing `upmin-admin` is incredibly easy. Simple add the gem to your `Gemfile
 gem 'upmin-admin'
 ```
 
-And then mount the engine in your `routes.rb` file:
+Then run the generator:
 
 ```ruby
-mount Upmin::Engine => '/admin'
+rails g upmin:install
 ```
 
-If you already have routes pointing to `/admin` you can use any path you want, for example you could use the following instead:
+This mounts the engine in your `routes.rb` file:
 
 ```ruby
-mount Upmin::Engine => '/ice-ice-baby'
+mount Upmin::Engine => '/admin'
 ```
 
-And you would access your admin page at `localhost:3000/ice-ice-baby` or `yoursite.com/ice-ice-baby`.
-
-
-### Rails 4.2
+And adds a configuration file at `config/initializers/upmin.rb`
 
-Add the following to your gemfile:
+If you already have routes pointing to `/admin` you can use any path you want, for example you could use the following instead:
 
 ```ruby
-gem 'ransack', github: 'activerecord-hackery/ransack', branch: 'rails-4.2'
+mount Upmin::Engine => '/ice-ice-baby'
 ```
 
-`upmin-admin` currently depends on ransack, and you need to use the 4.2 branch of ransack due to changes in ActiveRecord.
+And you would access your admin page at `localhost:3000/ice-ice-baby` or `example.com/ice-ice-baby`.
 
+If you prefer not to use the generator, simply add the route, and optionally the config file as documented in the wiki.
 
 ## Documentation
 

data/Rakefile

@@ -1,8 +1,7 @@
 #!/usr/bin/env rake
 # encoding: utf-8
 
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -35,28 +34,29 @@ namespace :spec do
   %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate data_mapper).each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task "#{gemfile}" do
-      Dir.chdir("test_apps/#{gemfile}")
-      puts "Testing in #{`pwd`}"
-      sh "bundle install --quiet"
-      sh "bundle update --quiet"
+      Dir.chdir("test_apps/#{gemfile}") do
+        puts "Testing in #{`pwd`}"
+        sh "bundle install --quiet"
+        sh "bundle update --quiet"
 
-      # Drop migrations and recreate
-      sh "rm -rf db/migrate/*"
+        # Drop migrations and recreate
+        sh "rm -rf db/migrate/*"
 
-      if gemfile != "data_mapper"
-        sh "bundle exec rake railties:install:migrations > /dev/null"
-      end
+        if gemfile != "data_mapper"
+          sh "bundle exec rake railties:install:migrations > /dev/null"
+        end
 
-      if gemfile == "active_record_32"
-        sh "bundle exec rake db:drop db:create db:migrate --quiet > /dev/null"
-      end
+        if gemfile == "active_record_32"
+          sh "bundle exec rake db:drop db:create db:migrate --quiet > /dev/null"
+        end
 
-      sh "RAILS_ENV=test bundle exec rake db:drop db:create db:migrate --quiet > /dev/null"
+        sh "RAILS_ENV=test bundle exec rake db:drop db:create db:migrate --quiet > /dev/null"
 
-      update_files
+        update_files
 
-      # Run tests
-      sh "bundle exec rake"
+        # Run tests
+        sh "bundle exec rake"
+      end
     end
   end
 

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

@@ -7,9 +7,9 @@
       return null;
     } else {
       var m = moment();
-      m.utc().year(matches[1]);
-      m.utc().month(matches[2]);
-      m.utc().date(matches[3]);
+      m.utc().year(parseInt(matches[1]));
+      m.utc().month(parseInt(matches[2])-1);
+      m.utc().date(parseInt(matches[3]));
       return m;
     }
   }
@@ -68,13 +68,8 @@
     return curMoment;
   }
 
-
-
-
-
-
-  // Initializing the attribute view.
-  var init = function(formId) {
+  // Initializing the DateTime attribute view.
+  var initDateTime = function(formId) {
     var dtSection = $("." + formId + ".datetime-attribute");
     var hiddenInput = dtSection.find("input#" + formId + "[type=hidden]");
     var dateInput = dtSection.find("#" + formId + "-date");
@@ -123,6 +118,35 @@
     });
   }
 
+    // Initializing the Date attribute view.
+    // TODO: Dry this up against DateTime
+    var initDate = function(formId) {
+        var dtSection = $("." + formId + ".date-attribute");
+        var hiddenInput = dtSection.find("input#" + formId + "[type=hidden]");
+        var dateInput = dtSection.find("#" + formId + "-date");
+
+        var dtMoment = moment(hiddenInput.val());
+        if (hiddenInput.val() == "") {
+            dtMoment = null;
+        }
+
+        var handleDateSelect = function() {
+            var newDateMoment = parseDate(dateInput.val());
+            setInputDate(newDateMoment, hiddenInput);
+            return newDateMoment;
+        }
+
+        // Create Date Picker
+        var datePicker = new Pikaday({ field: $("#" + formId + "-date")[0], onSelect: handleDateSelect });
+
+        dtSection.closest("form").submit(function(event) {
+            event.preventDefault();
+
+            handleDateSelect();
+
+            event.target.submit();
+        });
+    }
 
   if (window.Upmin == null) {
     window.Upmin = {};
@@ -130,5 +154,7 @@
   if (window.Upmin.Attributes == null) {
     window.Upmin.Attributes = {};
   }
-  window.Upmin.Attributes.DateTime = init;
+
+  window.Upmin.Attributes.DateTime = initDateTime;
+  window.Upmin.Attributes.Date = initDate;
 })();

data/app/assets/stylesheets/upmin/application.css

@@ -13,4 +13,3 @@
  *= require_tree .
  *= require_self
  */
-

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

@@ -52,10 +52,17 @@ body {
   padding-top: 8px;
 }
 
+.page-entries-info {
+  margin: 5px 0px 15px;
+}
+
 .pagination:first-of-type {
-  margin-bottom: 0px;
+  margin: 5px 0px 0px;
 }
 
+.pagination:last-of-type {
+  margin: 10px 0px 20px;
+}
 
 .wizard span {padding: 12px 12px 10px 12px; margin-right:5px; background:#efefef; position:relative; display:inline-block; }
 .wizard span:before {width:0px; height:0px; border-top: 20px inset transparent; border-bottom: 20px inset transparent; border-left: 20px solid #fff; position: absolute; content: ""; top: 0; left: 0;}

data/app/assets/stylesheets/upmin/dashboard.css

@@ -0,0 +1,16 @@
+
+.panel .panel-heading {
+    border-bottom: 1px solid #d7d7d7;
+    color: #666;
+    font-size: 14px;
+    font-weight: 200;
+    padding: 7px 10px 4px;
+}
+
+.panel .panel-footer {
+    background: #fbfbfb;
+    border-top: 1px solid #e2e2e2;
+    color: #808080;
+    font-size: 12px;
+    padding: 8px 10px 5px;
+}

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

@@ -24,6 +24,9 @@
         > a {
           color: $hex;
         }
+        > a.delete {
+          color: #fff;
+        }
       }
     }
   }
@@ -67,6 +70,10 @@
     font-size: 1.1em;
   }
 
+  .radio, .radio-inline input {
+    height: auto;
+  }
+
   .well {
     padding: 9px;
     margin-bottom: 0;

data/app/controllers/upmin/dashboard_controller.rb

@@ -0,0 +1,11 @@
+require_dependency "upmin/application_controller"
+
+module Upmin
+  class DashboardController < ApplicationController
+
+    def index
+      @models = Upmin::Model.all
+    end
+
+  end
+end

data/app/controllers/upmin/models_controller.rb

@@ -2,8 +2,8 @@ require_dependency "upmin/application_controller"
 
 module Upmin
   class ModelsController < ApplicationController
-    before_filter :set_klass, only: [:new, :create, :show, :update, :search, :action]
-    before_filter :set_model, only: [:show, :update, :action]
+    before_filter :set_klass, only: [:new, :create, :show, :update, :destroy, :search, :action]
+    before_filter :set_model, only: [:show, :update, :destroy, :action]
 
     before_filter :set_page, only: [:search]
     before_filter :set_query, only: [:search]
@@ -12,9 +12,6 @@ module Upmin
     before_filter :set_action, only: [:action]
     before_filter :set_arguments, only: [:action]
 
-    def dashboard
-    end
-
     # GET /:model_name/:id
     def show
     end
@@ -29,7 +26,7 @@ module Upmin
       @model = @klass.new
       raw_model = @model.model
 
-      args = params[@klass.underscore_name]
+      args = params[@klass.underscore_name] || []
 
       args.each do |key, value|
         # TODO(jon): Figure out a way to do transforms.
@@ -55,7 +52,6 @@ module Upmin
       end
     end
 
-
     # PUT /:model_name/:id
     def update
 
@@ -89,6 +85,25 @@ module Upmin
       # @results = Upmin::Paginator.paginate(@q.result(distinct: true), @page, 30)
     end
 
+  # DELETE /:model_name/:id
+  def destroy
+    raw_model = @model.model
+    #destroy does not work when using datamapper and have associations but destroy! works fine
+    #destroy! does not exist in ActiveRecord
+    if defined?(raw_model.destroy!)
+      @result = raw_model.destroy! #data mapper
+    else
+      @result = raw_model.destroy #active record
+    end
+    if @result
+      flash.now[:notice] = "#{@klass.humanized_name(:singular)} deleted successfully."
+      redirect_to @klass.search_path
+    else
+      flash.now[:alert] = "#{@klass.humanized_name(:singular)} was NOT deleted."
+      render(:show)
+    end
+  end
+
     def action
       @response = @action.perform(@arguments)
 
@@ -128,9 +143,13 @@ module Upmin
         @klass = Upmin::Model.find_class(params[:klass])
       end
 
+    def set_klasses
+      @klasses = Upmin::Model.find_class(params[:klass])
+    end
+
       def set_action
-        action_name = params[:method].to_sym
-        @action = @model.actions.select{ |action| action.name == action_name }.first
+        action_name = params[:method]
+        @action = @model.actions.select{ |action| action.name.to_s == action_name }.first
 
         raise Upmin::InvalidAction.new(params[:method]) unless @action
       end

data/app/views/layouts/upmin/application.html.haml

@@ -1,16 +1,20 @@
 !!!
 %html
   %head
+    %meta{ name: "viewport", content: "width=device-width, initial-scale=1.0" }
     %title
       Upmin Dashboard
     = stylesheet_link_tag("upmin/application", media: "all")
+    %script{src: "//cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.3/moment.min.js"}
     = javascript_include_tag("upmin/application")
     = csrf_meta_tags
 
-    %link{href: "//cdn.jsdelivr.net/bootstrap/3.2.0/css/bootstrap.min.css", rel: "stylesheet", type: "text/css"}
-    %link{href: "//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css", rel: "stylesheet"}
+    %link{href: "//cdn.jsdelivr.net/bootstrap/3.2.0/css/bootstrap.min.css", rel: "stylesheet"}
+    -#%link{href: "//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css", rel: "stylesheet"}
     %script{src: "//cdn.jsdelivr.net/bootstrap/3.2.0/js/bootstrap.min.js"}
     %script{src: "//cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.3/moment.min.js"}
+    -# TODO (matt): Only include this on the dashboard page:
+    = javascript_include_tag "//www.google.com/jsapi", "chartkick"
 
     - if content_for?(:head)
       = yield(:head)

data/app/views/upmin/dashboard/_chart.html.haml

@@ -0,0 +1,9 @@
+-limit ||= 30
+.col-sm-6.col-md-4
+  .panel.panel-default
+    .panel-heading
+      #{model.humanized_name} created per #{model.model_class.grouping limit}
+    .panel-body
+      = column_chart model.model_class.group_by_best_fit limit
+    .panel-footer
+      Number of #{model.model_name.plural} created per #{model.model_class.grouping limit}, for all #{model.count} records.

data/app/views/upmin/dashboard/index.html.haml

@@ -0,0 +1,14 @@
+-if defined?(DataMapper)
+  .container
+    .row
+      .jumbotron
+        %h2
+          Sorry, the default dashboard doesn't support DataMapper
+        %p
+          Please create a custom dashboard view in:
+        %code
+          app/views/upmin/dashboard/index.html.[haml|erb|etc]
+-else
+  .container-fluid
+    .row
+      = render partial: 'chart', collection: @models, as: 'model', locals: { limit: 30 }

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

@@ -1,13 +1,29 @@
 .container
+  - if notice
+    .alert.alert-dismissable.alert-info
+      %button.close{"data-dismiss" => "alert", type: "button"}
+        %span{"aria-hidden" => "true"} ×
+      = notice
+  - if alert
+    .alert.alert-dismissable.alert-danger
+      %button.close{"data-dismiss" => "alert", type: "button"}
+        %span{"aria-hidden" => "true"} ×
+      = alert
+      - if @model.errors.any?
+        %ul
+          - @model.errors.each do |field, error|
+            %li
+              %b
+                = field
+              = error
   .row
     .col-md-8
+      .page-entries-info
+        = page_entries_info(@query.paginated_results)
       = up_paginate(@query.paginated_results)
-      -# TODO(jon): Add pagination w/ search results
       = up_render(@query)
-      %br
       = up_paginate(@query.paginated_results)
-      %br
-      %br
+
     .col-md-4
       -# TODO(jon): Implement up_search_box
       = up_render(@klass)

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

@@ -2,9 +2,4 @@
   %label{for: attribute.form_id}
     = attribute.label_name
 
-  - if attribute.editable? && f = form_builder
-    = f.check_box(attribute.name, value: boolean, class: "boolean")
-
-  - else
-    %p.well
-      = attribute.value
+  = form_builder.check_box(attribute.name, value: boolean, class: "boolean", disabled: !attribute.editable?)