upmin-admin 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bd7cc2583a8e2019373b7628b6fee2ff186c526
-  data.tar.gz: f7f129e4e4f4e2691c9822d9cff24cffdccddd56
+  metadata.gz: 43ba30f61892c0d1f5983de9ad8ddc6f09f3b804
+  data.tar.gz: a3af7bbf0251feec69f0b8c68327bf314a976bfe
 SHA512:
-  metadata.gz: 03e51d88c3c4552e02605da44b6cae42a70c0f86f8bcbeab1950c199d063ca6c5cf2757550525ee16ee3624bc1914f1bd52f6cec69ff7cb0e458f1def3c0cd76
-  data.tar.gz: 40284c1fe7e51a3acd9d1b13397548db8d695648dbc0aa74fa97089f8f27992b372eec98adb87e06116173f5985c0541d09c2569a833df60843dc4e93fb7a9f7
+  metadata.gz: 329aa9e96c2172c45fc7b130e473d614ccb70452b3f57fb507b5ec231cb3a22528b410dbd6040edb1bff61e62c46f3c9a506a0948966cee5f4abeb0c94f65391
+  data.tar.gz: d706420835d063d0bac98ca9a3bc7af161a694f23ef6f8b1068d1e416e2cfa4597ad15b9fc9124eb1b8c547901b50738880bc37720165005f46df4d5b217c735

data/README.md

@@ -0,0 +1,71 @@
+# Upmin Admin
+
+Upmin Admin is a framework for creating powerful admin backends with minimal effort.
+
+## Demo Videos
+
+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 Application
+
+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.
+
+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.
+
+
+## Installation
+
+Installing `upmin-admin` is incredibly easy. Simple add the gem to your `Gemfile`:
+
+```ruby
+gem 'upmin-admin'
+```
+
+And then mount the engine in your `routes.rb` file:
+
+```ruby
+mount Upmin::Engine => '/admin'
+```
+
+Authentication is currently supported with an existing Devise install. Simply use something like this:
+
+```ruby
+authenticate :user, lambda { |u| u.admin? } do
+  mount Upmin::Engine => '/admin'
+end
+```
+
+### Rails 4.2
+
+Add the following to your gemfile:
+
+```ruby
+gem 'ransack', github: 'activerecord-hackery/ransack', branch: 'rails-4.2'
+```
+
+`upmin-admin` currently depends on ransack, and you need to use the 4.2 branch of ransack due to changes in ActiveRecord.
+
+## Documentation
+
+We are currently working on the docs on our [Wiki](https://github.com/upmin/upmin-admin-ruby/wiki), but they are far from complete so if you have any trouble or can't find the documentation to do something please let us know via email - [support@upmin.com](support@upmin.com) or chat with us on [HipChat](http://www.hipchat.com/gvREostp6).
+
+
+## Going Forward
+
+There are a lot of things that need built going forward and we are looking for anyone who wants to get involved. Just hop in our hipchat (link below) or email us (link also below).
+
+The major features that are being worked on now are:
+
+1. DataMapper support
+2. Fixing bugs - specifically ones like ActsAsTaggable causing the menu to have far too many models.
+3. Implementing the Dashboard
+4. Adding useful widgets, such as an EasyPost Tracking label widget, a Stripe Card widget, and other commonly used APIs, as well as Map widgets for plotting routes or just showing a location.
+
+
+## Support & Feedback
+
+The goal of Upmin is to make it easier to build admin pages with minimal effort. With that in mind, we are always looking for feedback and suggestions. You can get in touch several ways.
+
+Email - [support@upmin.com](support@upmin.com)
+
+Chat - [http://www.hipchat.com/gvREostp6](http://www.hipchat.com/gvREostp6)

data/Rakefile

@@ -1,34 +1,77 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
+#!/usr/bin/env rake
+# encoding: utf-8
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-require 'rdoc/task'
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Upmin'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+task :default => "spec:all"
 
+namespace :spec do
+  # Full bundle install & test.
+  %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate).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"
 
+      # Drop migrations and recreate
+      sh "rm -rf db/migrate/*"
+      sh "bundle exec rake railties:install:migrations --quiet"
 
-Bundler::GemHelper.install_tasks
+      if gemfile == "active_record_32"
+        sh "bundle exec rake db:drop db:create db:migrate --quiet"
+      end
 
-require 'rake/testtask'
+      sh "RAILS_ENV=test bundle exec rake db:drop db:create db:migrate --quiet"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+      # Drop and reload spec files
+      sh "rm -rf spec/"
+      sh "cp -R ../../spec spec"
+      sh "cp ../../.rspec .rspec"
+
+      # Run tests
+      sh "bundle exec rake"
+    end
+  end
 
+  # Use existing models & install and just rake.
+  %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate).each do |gemfile|
+    desc "Run Tests against #{gemfile}"
+    task "#{gemfile}_quick" do
+      Dir.chdir("test_apps/#{gemfile}")
+      puts "Re-testing in #{`pwd`}. Bundle install and migration updates will NOT happen!"
 
-task default: :test
+      # Drop and reload spec files
+      sh "rm -rf spec/"
+      sh "cp -R ../../spec spec"
+      sh "cp ../../.rspec .rspec"
+
+      # Run tests
+      sh "bundle exec rake"
+    end
+  end
+
+  desc "Run Tests against all ORMs"
+  task :all do
+    %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate).each do |gemfile|
+      sh "rake spec:#{gemfile}"
+    end
+  end
+
+  desc "Run Tests against all ORMs"
+  task :all_quick do
+    %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate).each do |gemfile|
+      sh "rake spec:#{gemfile}_quick"
+    end
+  end
+
+end

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

@@ -0,0 +1,6 @@
+.action-well input.boolean {
+    float: left;
+    height: auto;
+    margin: 4px 8px;
+    clear:both;
+}

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

@@ -5,7 +5,6 @@
     clear:both;
 }
 
-
 ol.progbar {
     margin: 0 0 50px 0;
     padding: 0;

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

@@ -35,6 +35,24 @@ body {
   }
 }
 
+.nilable-addon {
+  .form-group {
+    margin-bottom: 0;
+  }
+  label {
+    padding-top: 6px;
+    padding-left: 28px;
+  }
+  input[type=checkbox] {
+    margin-top: -17px !important;
+  }
+}
+
+.new-button-wrapper {
+  padding-top: 8px;
+}
+
+
 .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;}
 .wizard span:after {width:0px; height:0px; border-top: 20px inset transparent; border-bottom: 20px inset transparent; border-left: 20px solid #efefef; position: absolute; content: ""; top: 0; right: -20px; z-index:2;}

data/app/controllers/upmin/models_controller.rb

@@ -2,7 +2,7 @@ require_dependency "upmin/application_controller"
 
 module Upmin
   class ModelsController < ApplicationController
-    before_filter :set_klass, only: [:show, :update, :search, :action]
+    before_filter :set_klass, only: [:new, :create, :show, :update, :search, :action]
     before_filter :set_model, only: [:show, :update, :action]
 
     before_filter :set_page, only: [:search]
@@ -17,6 +17,49 @@ module Upmin
     def show
     end
 
+    # GET /:model_name/new
+    def new
+      @model = @klass.new
+    end
+
+    # POST /:model_name
+    def create
+      @model = @klass.new
+      instance = @model.instance
+
+      args = params[@klass.name.underscore]
+      transforms = args.delete(:transforms) || {}
+
+      args.each do |key, value|
+        # 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] and not value.blank?
+          value = transform(transforms, key, value)
+        end
+
+        # TODO(jon): Remove duplicate code between update and create
+        if args["#{key}_is_nil"] == "1"
+          instance.send("#{key}=", nil)
+        else
+          if key.ends_with?("_is_nil")
+            # Skip this, since we use the non _is_nil arg.
+          else
+            instance.send("#{key}=", value)
+          end
+        end
+      end
+
+      if instance.save
+        flash[:notice] = "#{@klass.humanized_name(:singular)} created successfully with id=#{instance.id}."
+        redirect_to(upmin_model_path(@model.path_hash))
+      else
+        flash.now[:alert] = "#{@klass.humanized_name(:singular)} was NOT created."
+        render(:new)
+      end
+    end
+
+
     # PUT /:model_name/:id
     def update
       instance = @model.instance
@@ -31,7 +74,16 @@ module Upmin
           value = transform(transforms, key, value)
         end
 
-        instance.send("#{key}=", value)
+        # TODO(jon): Remove duplicate code between update and create
+        if updates["#{key}_is_nil"] == "1"
+          instance.send("#{key}=", nil)
+        else
+          if key.ends_with?("_is_nil")
+            # Skip this, since we use the non _is_nil arg.
+          else
+            instance.send("#{key}=", value)
+          end
+        end
       end
 
       if instance.save
@@ -76,7 +128,14 @@ module Upmin
 
       def set_arguments
         arguments = params[@method] || {}
-        @arguments = arguments.select{|k, v| !v.empty? }
+        @arguments = {}
+        arguments.each do |k, v|
+          unless k.ends_with?("_is_nil")
+            if arguments["#{k}_is_nil"] != "1"
+              @arguments[k] = v
+            end
+          end
+        end
       end
 
       def set_page

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

@@ -0,0 +1,21 @@
+.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.instance.errors.any?
+        %ul
+          - @model.instance.errors.each do |field, error|
+            %li
+              %b
+                = field
+              = error
+  .row
+    .col-sm-12
+      = up_model(@model.instance)

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

@@ -4,9 +4,14 @@
       -# TODO(jon): Add pagination w/ search results
       = up_search_results(@q, @results)
       %br
-      = up_paginate @results
+      = up_paginate(@results)
       %br
       %br
     .col-md-4
       -# TODO(jon): Implement up_search_box
       = up_search_box(@klass)
+      .new-button-wrapper
+        %a.btn.btn-block.btn-success{href: upmin_new_model_path(klass: @klass.name)}
+          Create a new
+          = @klass.humanized_name(:singular)
+        %br

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

@@ -9,9 +9,9 @@
       %button.close{"data-dismiss" => "alert", type: "button"}
         %span{"aria-hidden" => "true"} ×
       = alert
-      - if @instance.errors.any?
+      - if @model.instance.errors.any?
         %ul
-          - @instance.errors.each do |field, error|
+          - @model.instance.errors.each do |field, error|
             %li
               %b
                 = field

data/app/views/upmin/partials/actions/_action.html.haml

@@ -1,4 +1,4 @@
-.well
+.well.action-well
   = form_tag(upmin_action_path(upmin_model.path_hash.merge(method: action_name))) do
     - upmin_model.action_parameters(action_name).each do |param_type, param_name|
 
@@ -6,8 +6,19 @@
 
       .form-group
         = label(action_name, param_name, param_name.to_s.capitalize.gsub("_", " "))
-        = text_field(action_name, param_name, class: "form-control")
+
         - if param_type == :opt
+          .input-group
+            = text_field(action_name, param_name, class: "form-control")
+            .input-group-addon.nilable-addon
+              .form-group
+                %label{for: "#{action_name}_#{param_name}_is_nil"}
+                  Do Not Provide
+                = check_box(action_name, "#{param_name}_is_nil", class: "boolean")
           %small
             * Optional
+        - else
+          = text_field(action_name, param_name, class: "form-control")
+
+
     = submit_tag("Submit", class: "btn btn-primary")

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

@@ -0,0 +1,14 @@
+- if editable && f = form_builder
+  -# TODO(jon): Find a better place for code like this. Kinda sucks to have it in the view.
+  - is_nil = upmin_model.attribute(attr_name).nil? && !upmin_model.instance.new_record?
+  .input-group
+    = up_attribute(upmin_model.instance, attr_name, locals: { form_builder: form_builder })
+    .input-group-addon.nilable-addon
+      .form-group
+        %label{for: "#{upmin_model.klass.name.underscore}_#{attr_name}_is_nil"}
+          Make This Nil
+        = check_box(upmin_model.klass.name.underscore, "#{attr_name}_is_nil", class: "boolean", checked: is_nil, value: is_nil)
+
+- else
+  %p.well
+    = nilable

data/app/views/upmin/partials/models/_model.html.haml

@@ -28,12 +28,17 @@
 
     -# Render each attribute
     - upmin_model.klass.attributes.each do |attribute|
-      .form-group
+      - any_errors = model.errors[attribute].any?
+      .form-group{class: any_errors ? "has-error" : ""}
         -# = f.label(attribute.to_s) # Not using this because it drops _id and this isn't always desirable
 
         %label{for: upmin_model.attribute_form_id(attribute)}
           = upmin_model.attribute_label_name(attribute)
-        = up_attribute(upmin_model.instance, attribute, locals: { form_builder: f })
+        - if upmin_model.attribute_type(attribute) == :string
+          = up_attribute(upmin_model.instance, attribute, locals: { form_builder: f }, as: :nilable)
+        - else
+          = up_attribute(upmin_model.instance, attribute, locals: { form_builder: f })
+
 
     = f.submit("Save", class: "btn btn-primary")
 

data/app/views/upmin/partials/models/_new_model.html.haml

@@ -0,0 +1,44 @@
+-# The following are all available to you here:
+-# unknown - This is the model passed into the up_model method.
+-#    This attribute is always present in any partial rendered
+-#    by Upmin, and will always match the name of the partial
+-#    *UNLESS* nil, true, or false are passed in.
+-# upmin_model - This is an Upmin::Model instantiated with unknown
+-#    and is always present.
+-#
+-# In general, the upmin_model makes it significantly easier to
+-# render a view, so I suggest using it. It is way simpler than
+-# trying to find all associations for a model on your own.
+-#
+-# Just an FYI: upmin_model.instance == unknown
+
+.upmin-model{class: upmin_model.color}
+  -# Display the model title as "Model # ID"
+  %h3
+    Create a
+    = upmin_model.klass.humanized_name(:singular)
+
+  %br
+  %br
+  %h3{style: "color: #333;"}
+    Attributes
+  %hr
+  -# Create a form to wrap the attributes in.
+  -# TODO(jon): Update the URL with a decent helper?
+  = form_for(upmin_model.instance, url: upmin_create_model_path(klass: @klass.name), html: { method: :post }) do |f|
+
+    -# Render each attribute
+    - upmin_model.klass.attributes.each do |attribute|
+      - any_errors = new_model.errors[attribute].any?
+      .form-group{class: any_errors ? "has-error" : ""}
+        -# = f.label(attribute.to_s) # Not using this because it drops _id and this isn't always desirable
+
+        %label{for: upmin_model.attribute_form_id(attribute)}
+          = upmin_model.attribute_label_name(attribute)
+        - if upmin_model.attribute_type(attribute) == :string
+          = up_attribute(upmin_model.instance, attribute, locals: { form_builder: f }, as: :nilable)
+        - else
+          = up_attribute(upmin_model.instance, attribute, locals: { form_builder: f })
+
+    = f.submit("Create", class: "btn btn-primary")
+