manage 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b46432d4fd1f5036e85a8a0187d609e413bdc0d4
+  data.tar.gz: bb3c8fcb086a0c47ea700940da85e721df96e31a
+SHA512:
+  metadata.gz: a07c1505b5592327ca8e7229de3f4601a245c1eaec0fe8e63f319e74456f91800b741e4b3f182a024e7aeb1f6273bc03ae1f3dacfe582c3e9e30d5bf8544aff5
+  data.tar.gz: 89c6e920b1dd516e29cca17a7246b334f6ef4129d81d2f3989c7efe52ba66cb6da3b131953cde16ba1e187ca62800eb42a3393d2abfc7c66e1a25d246c6f7c1c

data/Rakefile

@@ -14,21 +14,18 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-task default: :test
+task default: :spec

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

@@ -1,4 +1,3 @@
 //= require jquery
-//= require jquery_ujs
 //= require foundation
-//= require manage/init
+//= require manage/init

data/app/assets/stylesheets/manage/application.css.scss

@@ -1,2 +1,2 @@
 @import "foundation";
-@import "manage/layout";
+@import "manage/layout.css.scss";

data/app/controllers/manage/admin_users_controller.rb

@@ -1,3 +1,15 @@
 class Manage::AdminUsersController < Manage::ResourceController
+  index_fields :email, :sign_in_count, :current_sign_in_ip, :last_sign_in_ip
+  search_fields :email, :sign_in_count, :current_sign_in_ip, :last_sign_in_ip
+
+  def show
+    if params[:id] == 'sign_out'
+      signed_out = (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))
+      redirect_to '/manage/admin_users/sign_in'
+      return
+    end
+
+    super
+  end
 
 end

data/app/controllers/manage/application_controller.rb

@@ -1,19 +1,13 @@
 class Manage::ApplicationController < ActionController::Base
-  # before_filter :authenticate_admin_user!
-  before_filter :authenticate_admin
+  before_filter :auth_user!
 
-  def authenticate_admin
-    authenticate_or_request_with_http_basic do |username, password|
-      @current_user = AdminUser.where(email: username).first
-      return request_http_basic_authentication if @current_user.blank?
-      return request_http_basic_authentication unless @current_user.valid_password?(password)
-      @current_user
-    end
+  def auth_user!
+    redirect_to new_admin_user_session_path unless admin_user_signed_in?
   end
 
   helper_method :current_user
   def current_user
-    @current_user
+    current_admin_user
   end
 
 end

data/app/controllers/manage/resource_controller.rb

@@ -12,6 +12,19 @@ class Manage::ResourceController < Manage::ApplicationController
 
   respond_to :html
 
+  helper_method :list_index_fields, :list_edit_fields, :list_search_fields, :list_action_links
+
+  def end_of_association_chain
+    if self.resources_configuration[:self][:search_fields].blank?
+      self.class.search_fields :all
+    end
+
+    config = self.resources_configuration[:self]
+    @search = config[:search].new(params[:f])
+
+    @search.results 
+  end
+
   protected
   def collection
     assocation = end_of_association_chain.page(params[:page] || 1)
@@ -22,4 +35,65 @@ class Manage::ResourceController < Manage::ApplicationController
     params.permit!
   end
 
+  def self.index_fields(*fields)
+    setup_fields(:index_fields, *fields)
+  end
+
+  def self.edit_fields(*fields)
+    setup_fields(:edit_fields, *fields)
+  end
+
+  def self.search_fields(*fields)
+    setup_fields(:search_fields, *fields)
+
+    config = self.resources_configuration[:self]
+    config[:search] = Manage::Fields::Searcher.generate_search_object(resource_class, config[:search_fields])
+  end
+
+  def self.action_links(*fields)
+    setup_fields(:action_links, *fields)
+  end
+
+  def list_index_fields
+    list_fields(:index_fields)
+  end
+
+  def list_edit_fields
+    list_fields(:edit_fields)
+  end
+
+  def list_search_fields
+    list_fields(:search_fields)
+  end
+
+  def list_action_links
+    if self.resources_configuration[:self][:action_links].blank?
+      []
+    else
+      self.resources_configuration[:self][:action_links]
+    end
+  end
+
+  private
+  def self.setup_fields(key, *fields)
+    # :all means all the fields - default
+    if not fields.first.is_a?(Hash) and fields.first.to_sym == :all
+      options = fields.extract_options!
+      options[:except] ||= []
+      options[:include] ||= []
+
+      self.resources_configuration[:self][key] = (resource_class.attribute_names + Array(options[:include])) - Array(options[:except]).map(&:to_s) 
+    else
+      self.resources_configuration[:self][key] = fields
+    end
+  end
+
+  def list_fields(key)
+    if self.resources_configuration[:self][key].blank?
+      resource_class.attribute_names - %w(id created_at updated_at)
+    else
+      self.resources_configuration[:self][key]
+    end
+  end
+
 end

data/app/controllers/manage/sessions_controller.rb

@@ -1,6 +1,11 @@
-# class Devise::Users::SessionsController < Devise::SessionsController
-class Manage::SessionsController < ::Devise::SessionsController
-  layout "manage/sign_in"
+module Manage
+  class SessionsController < ::Devise::SessionsController
+    layout "manage/sign_in"
 
+    def destroy
+      p 'what?'
+      super
+    end
+  end
 end
 

data/app/helpers/manage/form_helper.rb

@@ -17,4 +17,4 @@ module Manage
 
   end
 
-end
+end

data/app/helpers/manage/resource_helper.rb

@@ -1,7 +1,63 @@
 module Manage
   module ResourceHelper
+    def index_fields
+      list_index_fields
+    end
+
+    def edit_fields
+      list_edit_fields
+    end
+
     def attributes
       resource_class.attribute_names - %w(id created_at updated_at)
     end
+
+    def field_value(scope, field_data)
+      Fields::Reader.field_value(scope, field_data).to_s
+    end
+
+    def field_title(resource_class, field_data)
+      Fields::Reader.field_title(resource_class, field_data)
+    end
+
+    def action_link(scope, link_data)
+      value = nil
+
+      if link_data.is_a? (Hash)
+        relation = link_data.keys.first
+        entity = Fields::Reader.field_value(scope, relation)
+        unless entity.present?
+          return ''
+        end
+        if link_data[relation][:label_field].present?
+          value = field_value(scope, link_data[relation][:label_field])
+        elsif link_data[relation][:label].present?
+          value = link_data[relation][:label]
+        end
+
+        path = entity.class.name.dasherize.pluralize.downcase
+        return  link_to value, [scope.public_send(relation)]
+      end
+
+      if link_data.is_a? (Symbol) or link_data.is_a?(String)
+        relation = link_data.to_s
+        if scope.class.reflect_on_association(link_data.to_sym).options[:class_name].present?
+          rel_name = scope.class.reflect_on_association(link_data.to_sym).options[:class_name]
+          relation = rel_name.downcase.dasherize.pluralize
+        end
+        if scope.class.reflect_on_association(link_data.to_sym).options[:as].present?
+          key = scope.class.reflect_on_association(link_data.to_sym).options[:as].to_s + '_id'
+        else
+          key = scope.class.name.downcase.dasherize + '_id'
+        end
+        return "<a href=\"#{relation}?f%5B#{key}%5D=#{scope.id}\">#{resource_class.human_attribute_name(link_data.to_s)}</a>".html_safe
+      end
+
+      unless value
+        raise 'Unsupported link data'
+      end
+
+    end
+
   end
 end

data/app/models/admin_user.rb

@@ -0,0 +1,4 @@
+class AdminUser < ActiveRecord::Base
+  devise :database_authenticatable, :registerable, :lockable, :timeoutable,
+    :recoverable, :rememberable, :trackable, :validatable
+end

data/app/views/layouts/manage/_main_menu.html.slim

@@ -4,14 +4,10 @@ ul.right
   li.divider.hide-for-small
   li = link_to current_user.email, current_user
   li.divider.hide-for-small
-  li = link_to City.model_name.human(count: 2), manage.cities_path
-  li.divider.hide-for-small
   li = link_to 'users', users_path
   li.divider.hide-for-small
   li = link_to AdminUser.model_name.human(count:2), admin_users_path
   li.divider.hide-for-small
-  li = link_to 'terms', main_app.about_us_pages_path
-  li.divider.hide-for-small
   li.has-dropdown
     a href="#" Main Item 1
     ul.dropdown
@@ -53,4 +49,4 @@ ul.right
       li
         a href="#" Dropdown Level 1f
   li.has-form
-    a.button href="http://foundation.zurb.com/docs" Sample button
+    a.button href="http://foundation.zurb.com/docs" Sample button

data/app/views/layouts/manage/sign_in.html.slim

@@ -5,23 +5,23 @@ html
     title Manage
     = stylesheet_link_tag    "manage/application", media: "all"
     = javascript_include_tag "vendor/custom.modernizr"
-    = javascript_include_tag "manage/application"
     = csrf_meta_tags
 
-body class="#{controller.action_name} #{controller_path.gsub(/[-\/]/, '-')} simple" data-locale=I18n.locale
-  row
+body class="simple" data-locale=I18n.locale
+  section.main
     #flash
       - flash.each do |key, value|
         - key = 'info' if key == :notice
-        .alert_wrapper data-dismiss="alert"
-          div(class="alert alert-#{key} #{key}")
-            button(type="button" class="close" data-dismiss="alert") ×
-            - if value.is_a?(Array)
-              - value.each do |element|
-                p #{element.html_safe}
-            - else
-              p #{value.html_safe}
-          .clearfix
+        - key = 'alert' if key == :error
+        div data-alert="" class="alert-box #{key}"
+          - if value.is_a?(Array)
+            - value.each do |element|
+              p #{element.html_safe}
+          - elsif value.is_a?(String)
+            p #{value.html_safe}
+          a.close href="#" ×
 
+    = yield
+
+  = javascript_include_tag "manage/application"
 
-  = yield

data/app/views/manage/resource/_form.html.slim

@@ -1,4 +1,4 @@
 = manage_form_for [ resource ] do |f|
-  - attributes.each do |attr|
-    = f.input attr
-  = f.submit class: 'button small'
+  - edit_fields.each do |field|
+    = f.input field
+  = f.submit class: 'button small'

data/app/views/manage/resource/index/_count.html.slim

@@ -0,0 +1,6 @@
+.panel
+  dl.sub-nav
+    dt Count:
+    dd.active
+      = collection.total_count
+

data/app/views/manage/resource/index/_filters.html.slim

@@ -1,11 +1,22 @@
-form
+= manage_form_for @search, as: :f, method: :get, url: "#{resource_class.name.underscore.pluralize}", html: {id: 'search-form'} do |f|
   fieldset
     legend Filter
+    - list_search_fields.each do |field|
+      .row
+        .columns.large-12
+          - label_text = resource_class.human_attribute_name(field)
+          - if resource_class.columns_hash[field.to_s].blank?
+            label #{label_text}
+            = f.search_field field.to_sym, placeholder: label_text
+          - elsif resource_class.columns_hash[field.to_s].type == :datetime
+            label #{label_text}
+            = f.date_field field.to_sym, placeholder: label_text
+          - elsif resource_class.columns_hash[field.to_s].type == :integer
+            label #{label_text}
+            = f.number_field field.to_sym, placeholder: label_text
+          - else
+            label #{label_text}
+            = f.search_field field.to_sym, placeholder: label_text
     .row
       .columns.large-12
-        label Name
-        input type="text" placeholder="Name"
-    .row
-      .columns.large-12
-        label City
-        input type="text" placeholder="City"
+        = f.submit 'Search', class: 'button small'

data/app/views/manage/resource/index/_table.html.slim

@@ -1,16 +1,18 @@
 table
   thead
     tr
-      - attributes.each do |attr|
-        th= resource_class.human_attribute_name(attr)
+      - index_fields.each do |field_data|
+        th = field_title(resource_class, field_data)
       th = t('.actions')
   tbody
     - collection.each do |resource|
       tr
-        - attributes.each do |attr|
-          td = resource.public_send(attr).to_s
+        - index_fields.each do |field_data|
+          td = field_value(resource, field_data)
         td
           ul.inline-list
             li = link_to t('manage.actions.show'), [resource]
             li = link_to t('manage.actions.edit'), [:edit, resource]
-            li = link_to t('manage.actions.destroy'), [resource], method: :delete, data: { confirm: t('manage.confirmations.Are you sure')}
+            li = link_to t('manage.actions.destroy'), [resource], method: :delete, data: { confirm: t('manage.confirmations.Are you sure')}
+            - list_action_links.each do |link_data|
+              li = action_link(resource, link_data)

data/app/views/manage/resource/index.html.slim

@@ -5,8 +5,9 @@ nav
 
 .row
   .columns.large-9
-    = render "manage/resource/index/table", attributes: attributes
+    = render "manage/resource/index/table", index_fields: index_fields
   .columns.large-3
     = render "manage/resource/index/filters"
 
-= paginate collection
+= paginate collection
+= render "manage/resource/index/count"

data/app/views/{sessions → manage/sessions}/new.html.slim

@@ -1,11 +1,10 @@
 h2 = t('.sign_in')
 
-= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+= simple_form_for(resource, :as => resource_name, :url => admin_user_session_path) do |f|
   .form-inputs
     = f.input :email, :required => false, :autofocus => true
     = f.input :password, :required => false
     = f.input :remember_me, :as => :boolean if devise_mapping.rememberable?
   .form-actions
-    = f.button :submit, t('devise.users.registrations.login')
+    = f.submit t('devise.users.registrations.login')
 
-= render "devise/users/shared/links"