upmin-admin 0.0.39 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ba30f61892c0d1f5983de9ad8ddc6f09f3b804
-  data.tar.gz: a3af7bbf0251feec69f0b8c68327bf314a976bfe
+  metadata.gz: d17a5316e3ae23cb3bfe9e66d531798356f02ad4
+  data.tar.gz: ad0e64565f7304bec6f762db4ea7549dd42cf87b
 SHA512:
-  metadata.gz: 329aa9e96c2172c45fc7b130e473d614ccb70452b3f57fb507b5ec231cb3a22528b410dbd6040edb1bff61e62c46f3c9a506a0948966cee5f4abeb0c94f65391
-  data.tar.gz: d706420835d063d0bac98ca9a3bc7af161a694f23ef6f8b1068d1e416e2cfa4597ad15b9fc9124eb1b8c547901b50738880bc37720165005f46df4d5b217c735
+  metadata.gz: 0605a9cd8ef301ec6ce36a51f0ce5d2349f084bab91b878b14f58fca4cf52975db25db4f38235a8aeed95e7b10ad8dd407c557b936a38bce2d5b34bdf1180b24
+  data.tar.gz: 6a9d6a9607628fad7263dd7513e5fd193725c4048b8e5d90dc53fb0fa728631eee4ced49c9ef2404b4439d6bfcadbb7ae42ffd43607a6fb073a09ba305d3bd42

data/README.md

@@ -2,16 +2,21 @@
 
 Upmin Admin is a framework for creating powerful admin backends with minimal effort.
 
+
 ## 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 Application
+## 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.
 
 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.
 
+You can also generate a starter application using [Rails Composer](http://www.railscomposer.com/) that sets up Devise, role-based authorization, and upmin-admin. See [Upmin Admin Interface in Rails Composer](http://blog.railsapps.org/post/97584175990/upmin-admin-interface-in-rails-composer).
+
 
 ## Installation
 
@@ -27,14 +32,15 @@ And then mount the engine in your `routes.rb` file:
 mount Upmin::Engine => '/admin'
 ```
 
-Authentication is currently supported with an existing Devise install. Simply use something like this:
+If you already have routes pointing to `/admin` you can use any path you want, for example you could use the following instead:
 
 ```ruby
-authenticate :user, lambda { |u| u.admin? } do
-  mount Upmin::Engine => '/admin'
-end
+mount Upmin::Engine => '/ice-ice-baby'
 ```
 
+And you would access your admin page at `localhost:3000/ice-ice-baby` or `yoursite.com/ice-ice-baby`.
+
+
 ### Rails 4.2
 
 Add the following to your gemfile:
@@ -45,27 +51,32 @@ 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).
+For further documentation, please visit our [Wiki](https://github.com/upmin/upmin-admin-ruby/wiki). The docs there are far from complete, but we are actively updating them. If you have any trouble or can't find the documentation to do something please [create an issue](https://github.com/upmin/upmin-admin-ruby/issues) and contribute to the docs where you can.
 
 
 ## 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).
+Upmin Admin is new. It has been live for less than a few months, so there are going to be things missing. If you want to make it better, get involved and [create issues](https://github.com/upmin/upmin-admin-ruby/issues) when you find bugs or want new features, and contribute with pull requests.
 
 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.
+1. Mongoid support
+2. Fixing bugs as we find them
+3. Adding widgets
+4. Implementing the dashboard
 
 
 ## 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.
+We are always looking for feedback and suggestions. We prefer that you create a GitHub issue, but you can use any of the following to contact us:
+
+Email - [support+admin@upmin.com](support+admin@upmin.com)
+
+Twitter - [@UpminSupport](https://twitter.com/upminsupport)
 
-Email - [support@upmin.com](support@upmin.com)
+GitHub - [Create an Issue](https://github.com/upmin/upmin-admin-ruby/issues)
 
-Chat - [http://www.hipchat.com/gvREostp6](http://www.hipchat.com/gvREostp6)
+Please note that this is an open source project, and we can't always respond immediately, but we do try to respond to all inquiries within 24 hours and are usually much faster to respond.

data/Rakefile

@@ -13,9 +13,21 @@ end
 
 task :default => "spec:all"
 
+def update_files
+    # Drop and reload spec files
+  sh "rm -rf spec/"
+  sh "cp -R ../../spec spec"
+  sh "cp ../../.rspec .rspec"
+
+  # Drop and reload Upmin::Model files
+  sh "rm -rf app/upmin/"
+  sh "cp -R ../../test_app_upmin app/upmin"
+end
+
 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|
+  %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}")
@@ -25,18 +37,18 @@ namespace :spec do
 
       # Drop migrations and recreate
       sh "rm -rf db/migrate/*"
-      sh "bundle exec rake railties:install:migrations --quiet"
+
+      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"
+        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"
+      sh "RAILS_ENV=test bundle exec rake db:drop db:create db:migrate --quiet > /dev/null"
 
-      # Drop and reload spec files
-      sh "rm -rf spec/"
-      sh "cp -R ../../spec spec"
-      sh "cp ../../.rspec .rspec"
+      update_files
 
       # Run tests
       sh "bundle exec rake"
@@ -44,16 +56,13 @@ namespace :spec do
   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|
+  %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}_quick" do
       Dir.chdir("test_apps/#{gemfile}")
       puts "Re-testing in #{`pwd`}. Bundle install and migration updates will NOT happen!"
 
-      # Drop and reload spec files
-      sh "rm -rf spec/"
-      sh "cp -R ../../spec spec"
-      sh "cp ../../.rspec .rspec"
+      update_files
 
       # Run tests
       sh "bundle exec rake"
@@ -62,14 +71,14 @@ namespace :spec do
 
   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|
+    %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate data_mapper).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|
+    %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate data_mapper).each do |gemfile|
       sh "rake spec:#{gemfile}_quick"
     end
   end

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

@@ -13,7 +13,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require ./jquery-clockpicker
-//= require ./moment
 //= require ./pikaday
 //= require ./helpers
 //= require_tree .

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

@@ -52,6 +52,10 @@ body {
   padding-top: 8px;
 }
 
+.pagination:first-of-type {
+  margin-bottom: 0px;
+}
+
 
 .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/instances.css.scss

@@ -1,8 +1,14 @@
 @import "colors";
 
+.search-result-link {
+  .upmin-model {
+    margin-bottom: 10px;
+  }
+}
+
 .upmin-model {
   padding: 20px;
-  margin: 10px 0px 10px 0;
+  margin: 10px 0px 250px 0;
   border: 1px solid #eee;
   border-left-width: 5px;
   border-radius: 3px;
@@ -65,6 +71,10 @@
     padding: 9px;
     margin-bottom: 0;
     min-height: 40px;
+
+    &.action-well {
+      margin-bottom: 32px;
+    }
   }
 
   a.active-tag-link {

data/app/controllers/upmin/models_controller.rb

@@ -6,8 +6,10 @@ module Upmin
     before_filter :set_model, only: [:show, :update, :action]
 
     before_filter :set_page, only: [:search]
+    before_filter :set_query, only: [:search]
+    before_filter :set_q_for_form_values, only: [:search]
 
-    before_filter :set_method, only: [:action]
+    before_filter :set_action, only: [:action]
     before_filter :set_arguments, only: [:action]
 
     def dashboard
@@ -25,34 +27,28 @@ module Upmin
     # POST /:model_name
     def create
       @model = @klass.new
-      instance = @model.instance
+      raw_model = @model.model
 
-      args = params[@klass.name.underscore]
-      transforms = args.delete(:transforms) || {}
+      args = params[@klass.underscore_name]
 
       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): Figure out a way to do transforms.
 
         # TODO(jon): Remove duplicate code between update and create
         if args["#{key}_is_nil"] == "1"
-          instance.send("#{key}=", nil)
+          raw_model.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)
+            raw_model.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))
+      if raw_model.save
+        flash[:notice] = "#{@klass.humanized_name(:singular)} created successfully with id=#{raw_model.id}."
+        redirect_to(@model.path)
       else
         flash.now[:alert] = "#{@klass.humanized_name(:singular)} was NOT created."
         render(:new)
@@ -62,33 +58,26 @@ module Upmin
 
     # PUT /:model_name/:id
     def update
-      instance = @model.instance
-      updates = params[@klass.name.underscore]
-      transforms = updates.delete(:transforms) || {}
 
-      updates.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
+      raw_model = @model.model
+      updates = params[@klass.underscore_name]
 
+      updates.each do |key, value|
         # TODO(jon): Remove duplicate code between update and create
         if updates["#{key}_is_nil"] == "1"
-          instance.send("#{key}=", nil)
+          raw_model.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)
+            raw_model.send("#{key}=", value)
           end
         end
       end
 
-      if instance.save
+      if raw_model.save
         flash[:notice] = "#{@klass.humanized_name(:singular)} updated successfully."
-        redirect_to(upmin_model_path(@model.path_hash))
+        redirect_to(@model.path)
       else
         flash.now[:alert] = "#{@klass.humanized_name(:singular)} was NOT updated."
         render(:show)
@@ -96,15 +85,15 @@ module Upmin
     end
 
     def search
-      @q = @klass.ransack(params[:q])
-      @results = Upmin::Paginator.paginate(@q.result(distinct: true), @page, 30)
+      # @q = @klass.ransack(params[:q])
+      # @results = Upmin::Paginator.paginate(@q.result(distinct: true), @page, 30)
     end
 
     def action
-      # begin
-      response = @model.perform_action(params[:method], @arguments)
-      flash[:notice] = "Action successfully performed with a response of: #{response}"
-        redirect_to(upmin_model_path(@model.path_hash))
+      @response = @action.perform(@arguments)
+
+      flash[:notice] = "Action successfully performed with a response of: #{@response}"
+      redirect_to(@model.path)
       # rescue Exception => e
       #   flash.now[:alert] = "Action failed with the error message: #{e.message}"
       #   render(:show)
@@ -112,22 +101,42 @@ module Upmin
     end
 
   private
+      # TODO(jon): Make the search form fill better than openstruct impl.
+      # Temporarily preserve most search form values. This will break if
+      # someone wants to search for "2014-09-05" as a string :(
+      def set_q_for_form_values
+        if params[:q]
+          q_hash = params[:q].dup
+          q_hash.each do |key, value|
+            if value.to_s.match(/[0-9]{4}\-[0-9]{2}\-[0-9]{2}/)
+              q_hash[key] = DateTime.parse(value)
+            end
+          end
+          @q = OpenStruct.new(q_hash)
+        end
+      end
 
-      def set_klass
-        @klass = Upmin::Klass.find(params[:klass])
-        raise "Invalid klass name" if @klass.nil?
+      def set_query
+        @query = Upmin::Query.new(@klass, params[:q], page: @page, per_page: 30)
       end
 
       def set_model
-        @model = @klass.find(params[:id])
+        @model = @klass.new(id: params[:id])
       end
 
-      def set_method
-        @method = params[:method].to_sym
+      def set_klass
+        @klass = 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
+
+        raise Upmin::InvalidAction.new(params[:method]) unless @action
       end
 
       def set_arguments
-        arguments = params[@method] || {}
+        arguments = params[@action.name] || {}
         @arguments = {}
         arguments.each do |k, v|
           unless k.ends_with?("_is_nil")
@@ -136,6 +145,7 @@ module Upmin
             end
           end
         end
+        @arguments = ActiveSupport::HashWithIndifferentAccess.new(@arguments)
       end
 
       def set_page

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

@@ -9,7 +9,7 @@
         %span.icon-bar
     #navbar-main.navbar-collapse.collapse
       %ul.nav.navbar-nav
-        - Upmin::Klass.all.each do |m|
+        - Upmin::Model.all.each do |m|
           %li
-            %a{href: upmin_search_path(klass: m.name)}
-              = m.name.pluralize
+            %a{href: m.search_path}
+              = m.humanized_name(:plural)

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

@@ -9,7 +9,8 @@
 
     %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"}
-    %script{:src => "//cdn.jsdelivr.net/bootstrap/3.2.0/js/bootstrap.min.js"}
+    %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"}
 
     - if content_for?(:head)
       = yield(:head)

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

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

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

@@ -1,17 +1,18 @@
 .container
   .row
     .col-md-8
+      = up_paginate(@query.paginated_results)
       -# TODO(jon): Add pagination w/ search results
-      = up_search_results(@q, @results)
+      = up_render(@query)
       %br
-      = up_paginate(@results)
+      = up_paginate(@query.paginated_results)
       %br
       %br
     .col-md-4
       -# TODO(jon): Implement up_search_box
-      = up_search_box(@klass)
+      = up_render(@klass)
       .new-button-wrapper
-        %a.btn.btn-block.btn-success{href: upmin_new_model_path(klass: @klass.name)}
+        %a.btn.btn-block.btn-success{href: upmin_new_model_path(klass: @klass.model_class_name)}
           Create a new
           = @klass.humanized_name(:singular)
         %br