upmin-admin 0.1.01 → 0.1.3

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

@@ -0,0 +1,26 @@
+- date = attribute.value.nil? ? nil : attribute.value
+
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
+
+  - if attribute.editable? && f = form_builder
+    .row.date-attribute{class: attribute.form_id}
+      = f.hidden_field(attribute.name, value: date)
+
+      .col-md-12
+        .input-group.pikadate
+          %input.form-control{type: :text, value: date, id: "#{attribute.form_id}-date"}
+          %span.input-group-addon
+            %span.glyphicon.glyphicon-calendar
+
+    - content_for(:javascript) do
+      :javascript
+        $(document).ready(function() {
+          window.Upmin.Attributes.Date("#{attribute.form_id}");
+        });
+
+  - else
+    %p.well
+      -# TODO(jon): Make this show an uneditable date.
+      = date

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

@@ -0,0 +1,9 @@
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
+
+  .enum
+    - attribute.enum_options.each do |option|
+      %label.radio-inline
+        = form_builder.radio_button attribute.name, option, disabled: !attribute.editable?
+        = option.humanize

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

@@ -0,0 +1,10 @@
+-# based on "unknown" attribute type partial; does not allow editing (would
+-# have to parse the string back into cents, which is fraught with danger)
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name.gsub('cents', '')
+  %p.well
+    - if attribute.value.respond_to?(:/)
+      = number_to_currency(attribute.value / 100.to_f)
+    - else
+      = attribute.value

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

@@ -2,23 +2,24 @@
   %h3
     = model.title
 
-  %br
+    = link_to(model.path, method: :delete, class: "btn btn-sm btn-danger delete pull-right", title: "Delete #{model.title}.", data: {confirm: "Are you sure?"}) do
+      %span.glyphicon.glyphicon-trash.white
+
   %br
   %h3{style: "color: #333;"}
     Attributes
-  %hr
 
+  %hr
   .attributes
     -# Yes this is meant to be model.model - this is the raw rails model instance.
     = form_for(model, url: model.path, html: { method: :put }) do |f|
 
       -# Render each attribute
-      - model.attributes.each do |attribute|
+      - model.form_attributes.each do |attribute|
         = up_render(attribute, locals: { form_builder: f })
 
       = f.submit("Save", class: "btn btn-primary")
 
-
   - if model.associations.any?
     %br
     %br
@@ -30,7 +31,6 @@
       - model.associations.each do |association|
         = up_render(association)
 
-
   - if model.actions.any?
     %br
     %br
@@ -41,4 +41,3 @@
     .actions
       - model.actions.each do |action|
         = up_render(action)
-

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

@@ -15,7 +15,7 @@
     = form_for(model, url: model.create_path, html: { method: :post }) do |f|
 
       -# Render each attribute
-      - model.attributes.each do |attribute|
+      - model.form_attributes.each do |attribute|
         = up_render(attribute, locals: { form_builder: f })
 
       = f.submit("Create", class: "btn btn-primary")

data/app/views/upmin/partials/search_boxes/_ransack_search_box.html.haml

@@ -22,7 +22,7 @@
           .input-group-addon to
           = number_field(:q, "#{attr_name}_lteq", class: "form-control")
 
-    - if type == :datetime && Rails::VERSION::MAJOR == 4
+    - if [:datetime, :date].include?(type) && Rails::VERSION::MAJOR == 4
       -# TODO(jon): Add date fields to search boxes for Rails 3
       .form-group
         = label(:q, "#{attr_name}_cont", attr_name.to_s.capitalize.gsub("_", " "))
@@ -32,5 +32,10 @@
         To
         = date_field(:q, "#{attr_name}_lteq", class: "form-control")
 
+    - if type == :enum
+      .form-group
+        = label(:q, "#{attr_name}_cont", attr_name.to_s.capitalize.gsub("_", " "))
+        = select(:q, "#{attr_name}_eq", klass.model_class.defined_enums[attr_name.to_s], { include_blank: true }, { class: "form-control" })
+
   = submit_tag("Search", class: "btn btn-primary btn-block")
   = link_to("Clear All", klass.search_path, class: "btn btn-default btn-block")

data/config/routes.rb

@@ -1,9 +1,6 @@
 Upmin::Engine.routes.draw do
-  root to: "models#dashboard"
-
-  # TODO(jon): Add support for dashboards (or some other main page).
-  # TODO(jon): Move dashboards to an appropriate controller
-  get "/", as: :upmin_dashboard, controller: :models, action: :dashboard
+  root to: "dashboard#index"
+  get "/", as: :upmin_dashboard, controller: :dashboard, action: :index
 
   scope "m" do
     scope "/:klass" do
@@ -15,6 +12,7 @@ Upmin::Engine.routes.draw do
       scope "/i/:id" do
         get "/", as: :upmin_model, controller: :models, action: :show
         put "/", controller: :models, action: :update
+        delete "/", controller: :models, action: :destroy
 
         post "/:method", as: :upmin_action, controller: :models, action: :action
       end

data/lib/generators/upmin/install_generator.rb

@@ -0,0 +1,24 @@
+module Upmin
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+
+      desc 'Creates an initializer file at config/initializers/upmin.rb and adds Upmin route to config/routes.rb'
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      def copy_initializer
+        template 'initializer.rb', 'config/initializers/upmin.rb'
+      end
+
+      def add_route
+        route "mount Upmin::Engine => '/admin'"
+      end
+
+      def messages
+        log "\n  # Global configuration can be edited in 'config/initializers/upmin.rb'\n"
+        log "\n  # You can access Upmin at: '/admin'. Modify config/routes.rb if this conflicts with an existing route.\n\n"
+      end
+
+    end
+  end
+end

data/lib/generators/upmin/templates/initializer.rb

@@ -0,0 +1,13 @@
+# Upmin Initializer
+
+Upmin.configure do |config|
+  # List of models you want to appear in your Upmin Admin pages - default is all Models
+  # config.models = [:user, :order, :product]
+
+  # Overrides the default list of colors used to highlight models.
+  # config.colors = [::light_blue, :blue_green, :red, :yellow, :orange, :purple, :dark_blue, :dark_red, :green]
+
+  # Overrides the default of number of items displayed per page.
+  # This can also be set per model, see: https://github.com/upmin/upmin-admin-ruby/wiki/Customizing-Models
+  # items_per_page = 30
+end

data/lib/upmin/active_record/model.rb

@@ -27,10 +27,24 @@ module Upmin::ActiveRecord
 
       def attribute_type(attribute)
         adapter = model_class.columns_hash[attribute.to_s]
-        return adapter.type if adapter
+        if adapter
+          if attribute.in? enum_attributes
+            return :enum
+          else
+            return adapter.type
+          end
+        end
         return :unknown
       end
 
+      def enum_attributes
+        if model_class.respond_to? :defined_enums
+          model_class.defined_enums.keys.map(&:to_sym)
+        else
+          []
+        end
+      end
+
       def associations
         return @associations if defined?(@associations)
 

data/lib/upmin/admin.rb

@@ -29,6 +29,7 @@ require "upmin/railties/active_record"
 require "upmin/railties/paginator"
 require "upmin/railties/render"
 require "upmin/railties/render_helpers"
+require "upmin/railties/dashboard"
 require "upmin/railtie"
 
 # gems and stuff we use
@@ -36,7 +37,7 @@ require "jquery-rails"
 require "ransack"
 require "haml"
 require "sass-rails"
-
+require "chartkick"
 
 require "ostruct"
 

data/lib/upmin/attribute.rb

@@ -10,7 +10,7 @@ module Upmin
 
     def value
       # TODO(jon): Add some way to handle exceptions.
-      return model.send(name)
+      return model.model.send(name)
     end
 
     def type
@@ -62,6 +62,9 @@ module Upmin
       return "#{form_id}_is_nil"
     end
 
+    def enum_options
+      model.class.model_class.defined_enums[name.to_s].keys
+    end
 
     private
 

data/lib/upmin/configuration.rb

@@ -76,6 +76,7 @@ module Upmin
           def_models += ::ActiveRecord::Base.descendants
             .map(&:to_s)
             .select{ |m| m != "ActiveRecord::SchemaMigration" }
+            .select{ |m| m.exclude? "HABTM" }
             .sort
             .map(&:underscore)
             .map(&:to_sym)

data/lib/upmin/data_mapper/model.rb

@@ -60,3 +60,13 @@ module Upmin::DataMapper
 
   end
 end
+
+module DataMapper
+  module ClassMethods
+    #Returns an ActiveModel::Name object needed by Kaminari to render page_entries_info.
+    def model_name
+      return@_model_name ||= ActiveModel::Name.new(self)
+    end
+  end
+  Model.append_extensions(ClassMethods)
+end

data/lib/upmin/engine.rb

@@ -1,6 +1,6 @@
-# require 'haml-rails'
-# require kaminari here to affect load order so that custom kaminari views load from upmin
-require 'kaminari'
+# require kaminari here to affect load order so that custom Kaminari (bootstrap) views load from upmin,
+# unless will_paginate is used in the parent Rails app.
+require 'kaminari' unless defined?(WillPaginate)
 
 module Upmin
   class Engine < ::Rails::Engine
@@ -9,3 +9,4 @@ module Upmin
     config.autoload_paths << "#{::Rails.root}/app/upmin/models"
   end
 end
+

data/lib/upmin/model.rb

@@ -50,6 +50,15 @@ module Upmin
       return @attributes
     end
 
+    def form_attributes
+      return @form_attributes if defined?(@form_attributes)
+      @form_attributes = []
+      self.class.form_attributes.each do |attr_name|
+        @form_attributes << Upmin::Attribute.new(self, attr_name)
+      end
+      return @form_attributes
+    end
+
     def associations
       return @associations if defined?(@associations)
       @associations = []
@@ -170,10 +179,12 @@ module Upmin
     end
 
     def Model.humanized_name(type = :plural)
-      names = model_class_name.split(/(?=[A-Z])/).map{|n| n.gsub(":", "")}
+      names = @display_name ? [@display_name] : model_class_name.split(/(?=[A-Z])/).map{|n| n.gsub(":", "")}
+
       if type == :plural
         names[names.length-1] = names.last.pluralize
       end
+
       return names.join(" ")
     end
 
@@ -243,21 +254,38 @@ module Upmin
       @extra_attrs << attribute.to_sym if attribute
     end
 
+    def Model.form_attribute(attribute = nil)
+      @extra_form_attrs = [] unless defined?(@extra_form_attrs)
+      @extra_form_attrs << attribute.to_sym if attribute
+    end
+
     # Sets the attributes to the provided attributes # if any are any provided.
     # If no attributes are provided then the
     # attributes are set to the default attributes of
     # the model class.
-    def Model.attributes(*attributes)
+    def Model.attributes(*attrs)
       @extra_attrs = [] unless defined?(@extra_attrs)
 
-      if attributes.any?
-        @attributes = attributes.map{|a| a.to_sym}
+      if attrs.any?
+        @attributes = attrs.map{|a| a.to_sym}
       end
       @attributes ||= default_attributes
 
       return (@attributes + @extra_attrs).uniq
     end
 
+    # Edit/Create form specific attributes
+    def Model.form_attributes(*attrs)
+      @extra_form_attrs = [] unless defined?(@extra_form_attrs)
+
+      if attrs.any?
+        @form_attributes = attrs.map{|a| a.to_sym}
+      end
+      @form_attributes ||= default_attributes
+
+      return (@form_attributes + @extra_form_attrs).uniq
+    end
+
     # Add a single action to upmin actions. If this is called
     # before upmin_actions the actions will not include any defaults
     # actions.
@@ -276,7 +304,7 @@ module Upmin
     def Model.actions(*actions)
       if actions.any?
         # set the actions
-        @actions = actions.map{|a| a.to_sym}
+        @actions = actions.map(&:to_sym)
       end
       @actions ||= []
       return @actions
@@ -286,6 +314,10 @@ module Upmin
       return @items_per_page ||= items
     end
 
+    def Model.display_name (name)
+      return @display_name ||= name
+    end
+
 
     ###########################################################
     ### Methods that need to be to be overridden. If the

data/lib/upmin/railtie.rb

@@ -7,6 +7,7 @@ module Upmin
       ActiveSupport.on_load(:active_record) do
         if defined?(ActiveRecord)
           ::ActiveRecord::Base.send(:include, Upmin::Railties::ActiveRecord)
+          ::ActiveRecord::Base.send(:extend, Upmin::Railties::Dashboard)
         end
 
         if defined?(DataMapper)

data/lib/upmin/railties/dashboard.rb

@@ -0,0 +1,88 @@
+module Upmin::Railties
+  module Dashboard
+
+    def group_by_best_fit(limit = 30)
+      return send "group_by_#{grouping limit}"
+    end
+
+    # Selects the time period with no more than <limit> entries
+    def grouping(limit = 30)
+      seconds = range_in_seconds
+      if seconds/1.day < limit
+        return 'day'
+      elsif seconds/1.week < limit
+        return 'week'
+      elsif seconds/1.month < limit
+        return 'month'
+      else
+        return 'year'
+      end
+    end
+
+    #
+    # Date range manipulation
+    #
+    def range_in_seconds
+      return last_date - first_date
+    end
+
+    def first_date
+      order('date(created_at) ASC').first.try(:created_at) || Time.now
+    end
+
+    def last_date
+      order('date(created_at) ASC').last.try(:created_at) || Time.now
+    end
+
+    #
+    # Group by
+    #
+    def group_by_day
+      dates = where.not(created_at: nil).group('date(created_at)').order('date(created_at) ASC').count
+      # Convert sqlite String date keys to Date keys
+      dates.map { |k, v| [Date.parse(k), v] } if dates.keys.first.is_a? String
+    end
+
+    def group_by_week
+      result = Hash.new(0)
+      group_by_day.each_with_object(result) { |i, a| a[i[0].beginning_of_week.strftime] += i[1] }
+      return result
+    end
+
+    def group_by_month
+      return group_by_strftime('%b %Y')
+    end
+
+    def group_by_year
+      return group_by_strftime('%Y')
+    end
+
+    #
+    # Aggregate by
+    #
+    def group_by_day_of_week
+      template = Hash[Date::ABBR_DAYNAMES.map {|x| [x, 0]}]
+      return group_by_strftime('%a', template)
+    end
+
+    def group_by_day_of_month
+      return Hash[group_by_strftime('%d').sort]
+    end
+
+    def group_by_week_of_year
+      return Hash[group_by_strftime('%W').sort]
+    end
+
+    def group_by_month_of_year
+      template = Hash[Date::ABBR_MONTHNAMES.map {|x| [x, 0]}]
+      template.shift
+      return group_by_strftime( '%b', template)
+    end
+
+    def group_by_strftime(filter, result = Hash.new(0))
+      group_by_day.each_with_object(result) { |i, a|  a[i[0].strftime(filter)] += i[1] }
+      return result
+    end
+
+  end
+end