carload 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d65cff581f4e29c73cf1e4fe384de789b4b48bd8
-  data.tar.gz: e080ef8a8a7118df7553ac7b565d80880a562ff7
+  metadata.gz: 8cd7d8e37f5576e78d936449c1e5037208db1789
+  data.tar.gz: feed52ae809a23d8cdc1f591e8ea76760e387945
 SHA512:
-  metadata.gz: 7d565a9cd04ac9955051d1e41e5b789886345c8d3b7baefcd78cfc37728f90ebb816fda1f141edf21458b76c5772227a17b64faf66f7b1a54c6bb7984a821beb
-  data.tar.gz: f1f945a17a018ae47f1780e8cbd6047449ac1580defef761aa3404f858b0cd15ea4fea6f8c73819ee18004b1f00c15c585a0d2206129a09be885e9f75e5a32b8
+  metadata.gz: cbc8dcf229e5789e2f7517b8b8c7e1b717abfc63372fd76bc537571969072a0f260d8cd5b90b56aba35ea5d5780f20a6b3a2cb7222552eb1828548ba528100d2
+  data.tar.gz: 4faa773c891477b8f1b72c9b54e33ecebdd55d8c9e333ced189a8acec895c24309d54bf4ae4ca14fd4133ef4075c5d74e92cf4d1aa78b52ce68ead454f862df8

data/app/assets/stylesheets/carload/_select2.scss

@@ -11,3 +11,7 @@
 .select2-results__option--highlighted {
   background-color: $main-color !important;
 }
+
+.select2-container {
+  min-width: 174px;
+}

data/app/assets/stylesheets/carload/dashboard.scss

@@ -4,6 +4,7 @@
 //= require upload-image
 
 $spacing: 16px;
+$half-spacing: 8px;
 
 @import 'bootstrap-sprockets';
 @import 'bootstrap';
@@ -42,17 +43,30 @@ $spacing: 16px;
 
 #main-container {
   width: 100%;
-  padding-left: $spacing;
-  padding-right: $spacing;
   #main-content {
     margin-top: 50px;
+    padding-left: $spacing;
+    padding-right: $spacing;
   }
 }
 
 .model-index-panel {
   width: 100%;
+  .panel-body {
+    overflow: scroll;
+    padding-left: 0;
+    padding-right: 0;
+  }
   table {
     margin-bottom: 0;
+    table-layout: fixed;
+    width: 100%;
+    td {
+      overflow: scroll;
+    }
+    th:last-child {
+      width: 50px;
+    }
   }
 }
 .model-new-panel, .model-edit-panel {

data/app/controllers/carload/dashboard_controller.rb

@@ -11,7 +11,7 @@ module Carload
     include Croppable
 
     def index
-      authorize :dashboard, :index? unless Carload.auth_solution == :none
+      authorize :carload_dashboard, :index? unless Carload.auth_solution == :none
       @search = @model_class.search(params[:q])
       @objects = @search.result.page(params[:page])
       @show_attributes = Dashboard.model(@model_name).index_page[:shows][:attributes] + [:created_at, :updated_at]
@@ -20,16 +20,16 @@ module Carload
     end
 
     def new
-      authorize :dashboard, :new? unless Carload.auth_solution == :none
+      authorize :carload_dashboard, :new? unless Carload.auth_solution == :none
       @object = @model_class.new
     end
 
     def edit
-      authorize :dashboard, :edit? unless Carload.auth_solution == :none
+      authorize :carload_dashboard, :edit? unless Carload.auth_solution == :none
     end
 
     def create
-      authorize :dashboard, :create? unless Carload.auth_solution == :none
+      authorize :carload_dashboard, :create? unless Carload.auth_solution == :none
       @object = @model_class.create model_params
       if @object.save
         redirect_to action: :index, model: @model_names # TODO: To show page.
@@ -39,7 +39,7 @@ module Carload
     end
 
     def update
-      authorize :dashboard, :update? unless Carload.auth_solution == :none
+      authorize :carload_dashboard, :update? unless Carload.auth_solution == :none
       if @object.update model_params
         redirect_to action: :index, model: @model_names # TODO: To show page.
       else
@@ -48,7 +48,7 @@ module Carload
     end
 
     def destroy
-      authorize :dashboard, :destroy? unless Carload.auth_solution == :none
+      authorize :carload_dashboard, :destroy? unless Carload.auth_solution == :none
       @object.destroy
       redirect_to action: :index, model: @model_names
     end

data/app/helpers/carload/dashboard_helper.rb

@@ -1,16 +1,63 @@
 module Carload
   module DashboardHelper
     def generate_input form, model_name, attribute_name, column
-      if column.type == :integer and attribute_name =~ /_id/
-        associated_model = attribute_name.sub('_id', '')
-        label_attribute = Dashboard.model(model_name).associated_models[associated_model.to_sym]
-        form.association associated_model,
-          label_method: label_attribute,
-          label: t("activerecord.models.#{associated_model}"),
+      if Dashboard::ModelSpec.foreign_key? attribute_name
+        associated_model = attribute_name.gsub(/_id$/, '').to_sym
+        options = Dashboard.model(model_name).associated_models[associated_model]
+        label_attribute = options[:choose_by]
+        if options[:polymorphic]
+          forms = ''
+          options[:available_models].each_with_index do |real_model, i|
+            forms << form.input(attribute_name,
+              label: t("activerecord.attributes.#{model_name}.#{real_model}.#{label_attribute}"),
+              collection: real_model.camelize.constantize.all,
+              label_method: label_attribute,
+              value_method: :id,
+              input_html: {
+                class: 'use-select2',
+                data: {
+                  placeholder: t('carload.placeholder.select', thing: t("activerecord.attributes.#{real_model}.#{label_attribute}"))
+                }
+              },
+              wrapper_html: {
+                id: "#{real_model.camelize}-#{label_attribute}"
+              }
+            )
+          end
+          # Add JavaScript to select which real model to work on.
+          forms << <<-EOT
+            <script>
+              $('.#{model_name}_#{associated_model}_id').hide()
+              if ($('##{model_name}_#{associated_model}_type').val() != '') {
+                $('#' + $('##{model_name}_#{associated_model}_type').val() + '-#{label_attribute}').show()
+              }
+              $('##{model_name}_#{associated_model}_type').change(function() {
+                $('.#{model_name}_#{associated_model}_id').hide()
+                $('#' + $(this).val() + '-#{label_attribute}').show()
+                $('.package_packagable_id > .select2-container').css('width', '100%')
+              })
+            </script>
+          EOT
+          raw forms.html_safe
+        else
+          form.association associated_model,
+            label_method: label_attribute,
+            label: t("activerecord.models.#{associated_model}"),
+            input_html: {
+              class: 'use-select2',
+              data: {
+                placeholder: t('carload.placeholder.select', thing: t("activerecord.attributes.#{associated_model}.#{label_attribute}"))
+              }
+            }
+        end
+      elsif attribute_name =~ /_type$/
+        associated_model = attribute_name.gsub(/_type$/, '').to_sym
+        options = Dashboard.model(model_name).associated_models[associated_model]
+        form.input attribute_name, collection: options[:available_models].map(&:camelize),
           input_html: {
             class: 'use-select2',
             data: {
-              placeholder: t('carload.placeholder.select', thing: t("activerecord.attributes.#{associated_model}.#{label_attribute}"))
+              placeholder: t('carload.placeholder.select', thing: t("activerecord.attributes.#{model_name}.#{attribute_name}"))
             }
           }
       elsif needs_upload?(model_name, attribute_name) and image?(attribute_name)
@@ -20,6 +67,23 @@ module Carload
       end
     end
 
+    def generate_search_input form, model_name, attribute
+      if attribute[:options]
+        form.input "#{attribute[:name].to_s.gsub('.', '_')}_#{attribute[:term]}",
+          required: false, label: false, collection: attribute[:options],
+          input_html: {
+            class: 'use-select2',
+            data: {
+              placeholder: t('carload.placeholder.select', thing: t("activerecord.attributes.#{model_name}.#{attribute[:name]}"))
+            }
+          }
+      else
+        form.input "#{attribute[:name].to_s.gsub('.', '_')}_#{attribute[:term]}",
+          placeholder: t("activerecord.attributes.#{@model_name}.#{attribute[:name]}"),
+          required: false, label: false
+      end
+    end
+
     def generate_show object, attribute
       case attribute
       when Symbol

data/app/policies/{dashboard_policy.rb → carload_dashboard_policy.rb}

@@ -1,4 +1,4 @@
-class DashboardPolicy < Struct.new(:user, :dashboard)
+class CarloadDashboardPolicy < Struct.new(:user, :dashboard)
   [:index, :new, :edit, :destroy].each do |action|
     define_method :"#{action}?" do
       return true if Carload.auth_solution == :none

data/app/views/carload/dashboard/_form.html.erb

@@ -1,7 +1,7 @@
 <%= simple_form_for @object, url: "/carload/dashboard/#{@model_names}/#{@object.id}" do |f| %>
   <% @model_class.columns_hash.each do |name, column| %>
-    <% next if ['id', 'created_at', 'updated_at'].include? name %>
-    <%= generate_input f, @model_name, name, column %>
+    <% next if Dashboard::ModelSpec::SkippedAttributes.include? name %>
+    <%= generate_input(f, @model_name, name, column) rescue nil %>
   <% end %>
   <%= f.button :submit, t('carload.action.submit'), class: 'btn btn-primary' %>
 <% end %>

data/app/views/carload/dashboard/shared/_search_fields.html.erb

@@ -1,8 +1,7 @@
 <%= simple_form_for @search, url: dashboard_search_path(@model_names), method: :post do |f| %>
   <div class='search-fields'>
     <% @search_attributes.each do |attribute| %>
-      <%= f.input "#{attribute[:name].to_s.gsub('.', '_')}_#{attribute[:term]}", required: false, label: false,
-        placeholder: t("activerecord.attributes.#{@model_name}.#{attribute[:name]}") %>
+      <%= generate_search_input f, @model_name, attribute %>
     <% end %>
   </div>
   <div class='search-buttons'>

data/app/views/layouts/carload/dashboard.html.erb

@@ -2,6 +2,7 @@
 <html>
 <head>
   <title>Carload</title>
+  <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0'/>
   <%= stylesheet_link_tag    'carload/dashboard', media: 'all' %>
   <%= javascript_include_tag 'carload/dashboard' %>
   <%= csrf_meta_tags %>

data/config/locales/en.yml

@@ -1,4 +1,12 @@
 en:
+  date:
+    order:
+    - :year
+    - :month
+    - :day
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+
   carload:
     actions: Actions
     action:

data/config/locales/zh-CN.yml

@@ -1,4 +1,12 @@
 zh-CN:
+  date:
+    order:
+    - :year
+    - :month
+    - :day
+    month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
+    abbr_month_names: [~, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+
   carload:
     actions: 操作
     action:

data/lib/carload/dashboard.rb

@@ -3,21 +3,110 @@ module Carload
     class ModelSpec
       attr_accessor :default, :attributes, :index_page, :associated_models
 
-      def initialize
+      SkippedAttributes = [
+        'id', 'created_at', 'updated_at',
+        'encrypted_password', 'reset_password_token',
+        'reset_password_sent_at', 'remember_created_at',
+        'sign_in_count', 'current_sign_in_at',
+        'last_sign_in_at', 'current_sign_in_ip',
+        'last_sign_in_ip'
+      ].freeze
+
+      def self.foreign_key? attribute
+        attribute =~ /_id$/
+      end
+
+      def foreign_key? attribute
+        ModelSpec.foreign_key? attribute
+      end
+
+      def self.polymorphic? model_class, attribute
+        return false unless foreign_key? attribute
+        model_class.column_names.include? "#{attribute.to_s.gsub('_id', '')}_type"
+      end
+
+      def polymorphic? model_class, attribute
+        ModelSpec.polymorphic? model_class, attribute
+      end
+
+      def initialize model_class = nil
         @default = false
         @attributes = ExtendedHash.new
         @index_page = ExtendedHash.new
         @index_page[:shows] = ExtendedHash.new
         @index_page[:searches] = ExtendedHash.new
         @associated_models = {}
+        if model_class
+          @attributes[:permitted] = model_class.column_names - SkippedAttributes
+          @attributes[:permitted].each do |attribute|
+            @index_page[:shows][:attributes] ||= []
+            @index_page[:searches][:attributes] ||= []
+            if foreign_key? attribute
+              associated_model = attribute.gsub('_id', '')
+              @associated_models[associated_model] = {
+                choose_by: nil, # Wait for setting.
+                polymorphic: polymorphic?(model_class, attribute),
+                model: model_class.name.underscore.to_sym
+              }
+            else
+              @index_page[:shows][:attributes] << attribute
+              @index_page[:searches][:attributes] << { name: attribute.to_sym, term: :cont }
+            end
+          end
+        end
+      end
+
+      def changed? spec
+        not @attributes[:permitted] == spec.attributes[:permitted] or
+        not @index_page[:searches][:attributes] == spec.index_page[:searches][:attributes]
+      end
+
+      def revise_stage_1!
+        # Handle polymorphic associated models if necessary.
+        @associated_models.each do |associated_model, options|
+          next if not options or not options[:polymorphic]
+          ActiveRecord::Base.descendants.each do |model|
+            next if model.name == 'ApplicationRecord'
+            if not model.reflect_on_all_associations.map(&:name).select { |x| x.to_s =~ /\b(#{options[:model]}|#{options[:model].to_s.pluralize})\b/ }.empty?
+              options[:available_models] ||= []
+              options[:available_models] << model.name.underscore
+              if not options[:common_attributes]
+                options[:common_attributes] = model.column_names - SkippedAttributes
+              else
+                options[:common_attributes] = options[:common_attributes] & model.column_names
+              end
+            end
+          end
+        end
+      end
+
+      def revise_stage_2!
+        # Handle associated models if necessary.
+        @associated_models.each do |associated_model, options|
+          next if not options
+          if options[:polymorphic]
+            # There should be a <associated_model>_type already.
+            @index_page[:shows][:attributes] << "#{associated_model}.#{options[:choose_by]}"
+            @index_page[:searches][:attributes].each do |attribute|
+              next unless attribute[:name] == :"#{associated_model}_type"
+              attribute[:options] = options[:available_models]
+            end
+          else
+            @index_page[:searches][:attributes] << {
+              name: "#{associated_model}.#{options[:choose_by]}",
+              term: :cont
+            }
+          end
+        end
       end
     end
 
     class << self
       def model name, &block
+        name = name.to_sym
         if block_given?
           @@models ||= {}
-          spec = ModelSpec.new
+          spec = @@models[name] || ModelSpec.new
           yield spec
           @@models[name] = spec
         else
@@ -25,11 +114,16 @@ module Carload
         end
       end
 
-      def associate args
-        model_a = args.keys.first
-        model_b = args.values.first
-        @@models[model_a].associated_models[model_b] = args[:choose_by]
-        @@models[model_b].associated_models[model_a] = nil
+      def associate options
+        model_a = options.keys.first
+        model_b = options.values.first
+        options.shift
+        @@models[model_a] ||= ModelSpec.new
+        @@models[model_a].associated_models[model_b] = options
+        unless options[:polymorphic]
+          @@models[model_b] ||= ModelSpec.new
+          @@models[model_b].associated_models[model_a] = nil
+        end
       end
 
       def models
@@ -41,6 +135,36 @@ module Carload
         @@models.each do |name, spec|
           return @@default_model = name if spec.default
         end
+        @@default_model = @@models.keys.first
+      end
+
+      def write file_path
+        content = File.read("#{Carload::Engine.root}/lib/generators/carload/templates/dashboard.rb")
+        content.gsub!(/^end$/, '')
+        default = true
+        models.each do |name, spec|
+          content << <<-RUBY
+  model :#{name} do |spec|
+    spec.default = #{default}
+    spec.attributes.permitted = #{spec.attributes.permitted}
+    spec.index_page.shows.attributes = #{spec.index_page.shows.attributes}
+    spec.index_page.searches.attributes = #{spec.index_page.searches.attributes}
+  end
+          RUBY
+          default = false
+          next if spec.associated_models.empty?
+          spec.associated_models.each do |associated_model, options|
+            next if not options.class == Hash or not options[:choose_by]
+            content << <<-RUBY
+  associate(#{{ name.to_sym => associated_model.to_sym }.merge options})
+            RUBY
+          end
+        end
+        content << "end\n"
+        File.open('app/carload/dashboard.rb', 'w') do |file|
+          file.write content
+          file.close
+        end
       end
     end
   end

data/lib/carload/version.rb

@@ -1,3 +1,3 @@
 module Carload
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/generators/carload/dash_generator.rb

@@ -0,0 +1,45 @@
+module Carload
+  class DashGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+
+    def change_dashboard_file
+      # Process model once atime.
+      model = file_name
+      model_specs = {}
+      Rails.application.eager_load! # It is necessary to load models manually.
+      ActiveRecord::Base.descendants.each do |model| # Rails 5 can use ApplicationRecord.
+        next if model.name == 'ApplicationRecord'
+        name = model.name.underscore
+        model_specs[name] = Dashboard::ModelSpec.new model
+      end
+      spec = model_specs[model]
+      if not spec.associated_models.empty?
+        spec.revise_stage_1!
+        cli = HighLine.new
+        cli.say "\nModel #{model} has associated with other models."
+        spec.associated_models.each do |associated_model, options|
+          spec.associated_models[associated_model][:choose_by] = cli.choose do |menu|
+            menu.prompt = "Choose the attribute of model #{associated_model} for choosing in #{model}? "
+            attributes = options[:polymorphic] ? options[:common_attributes] : model_specs[associated_model].attributes.permitted
+            attributes.each do |attribute|
+              next if attribute =~ /_id$/
+              menu.choice attribute.to_sym
+            end
+          end
+        end
+        spec.revise_stage_2!
+      end
+      # Check if model exists in dashboard file, but it may be changed.
+      begin
+        load 'app/carload/dashboard.rb'
+      rescue LoadError
+        Dashboard.models[model.to_sym] = spec
+        Dashboard.write 'app/carload/dashboard.rb'
+      end
+      if not Dashboard.models.keys.include? model.to_sym or Dashboard.model(model).changed? spec
+        Dashboard.models[model.to_sym] = spec
+        Dashboard.write 'app/carload/dashboard.rb'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carload
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Li Dong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -198,6 +198,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Carload is built with taste, and tries to be just right!
 email:
 - dongli.init@gmail.com
@@ -225,8 +239,7 @@ files:
 - app/jobs/carload/application_job.rb
 - app/mailers/carload/application_mailer.rb
 - app/models/carload/application_record.rb
-- app/policies/application_policy.rb
-- app/policies/dashboard_policy.rb
+- app/policies/carload_dashboard_policy.rb
 - app/views/carload/dashboard/_form.html.erb
 - app/views/carload/dashboard/edit.html.erb
 - app/views/carload/dashboard/index.html.erb
@@ -258,6 +271,7 @@ files:
 - lib/carload/extended_hash.rb
 - lib/carload/version.rb
 - lib/generators/carload/USAGE
+- lib/generators/carload/dash_generator.rb
 - lib/generators/carload/install_generator.rb
 - lib/generators/carload/templates/carload.rb
 - lib/generators/carload/templates/dashboard.rb

data/app/policies/application_policy.rb

@@ -1,53 +0,0 @@
-class ApplicationPolicy
-  attr_reader :user, :record
-
-  def initialize(user, record)
-    @user = user
-    @record = record
-  end
-
-  def index?
-    false
-  end
-
-  def show?
-    scope.where(:id => record.id).exists?
-  end
-
-  def create?
-    false
-  end
-
-  def new?
-    create?
-  end
-
-  def update?
-    false
-  end
-
-  def edit?
-    update?
-  end
-
-  def destroy?
-    false
-  end
-
-  def scope
-    Pundit.policy_scope!(user, record.class)
-  end
-
-  class Scope
-    attr_reader :user, :scope
-
-    def initialize(user, scope)
-      @user = user
-      @scope = scope
-    end
-
-    def resolve
-      scope
-    end
-  end
-end