administrate 0.7.0 → 0.8.0

data/lib/administrate/field/has_one.rb

@@ -3,9 +3,25 @@ require_relative "associative"
 module Administrate
   module Field
     class HasOne < Associative
+      def initialize(attribute, data, page, options = {})
+        resolver = Administrate::ResourceResolver.new("admin/#{attribute}")
+        @nested_form = Administrate::Page::Form.new(
+          resolver.dashboard_class.new,
+          data || resolver.resource_class.new,
+        )
+
+        super
+      end
+
       def self.permitted_attribute(attr)
-        attr
+        related_dashboard_attributes =
+          Administrate::ResourceResolver.new("admin/#{attr}").
+            dashboard_class.new.permitted_attributes + [:id]
+
+        { "#{attr}_attributes": related_dashboard_attributes }
       end
+
+      attr_reader :nested_form
     end
   end
 end

data/lib/administrate/order.rb

@@ -7,7 +7,7 @@ module Administrate
 
     def apply(relation)
       if relation.columns_hash.keys.include?(attribute.to_s)
-        relation.order(attribute => direction)
+        relation.order("#{attribute} #{direction}")
       else
         relation
       end

data/lib/administrate/page/base.rb

@@ -20,7 +20,7 @@ module Administrate
       def attribute_field(dashboard, resource, attribute_name, page)
         value = get_attribute_value(resource, attribute_name)
         field = dashboard.attribute_type_for(attribute_name)
-        field.new(attribute_name, value, page)
+        field.new(attribute_name, value, page, resource: resource)
       end
 
       def get_attribute_value(resource, attribute_name)

data/lib/administrate/search.rb

@@ -3,34 +3,33 @@ require "active_support/core_ext/object/blank"
 
 module Administrate
   class Search
-    def initialize(resolver, term)
-      @resolver = resolver
+    def initialize(scoped_resource, dashboard_class, term)
+      @dashboard_class = dashboard_class
+      @scoped_resource = scoped_resource
       @term = term
     end
 
     def run
       if @term.blank?
-        resource_class.all
+        @scoped_resource.all
       else
-        resource_class.where(query, *search_terms)
+        @scoped_resource.where(query, *search_terms)
       end
     end
 
     private
 
-    delegate :resource_class, to: :resolver
-
     def query
       search_attributes.map do |attr|
         table_name = ActiveRecord::Base.connection.
-          quote_table_name(resource_class.table_name)
+          quote_table_name(@scoped_resource.table_name)
         attr_name = ActiveRecord::Base.connection.quote_column_name(attr)
         "lower(#{table_name}.#{attr_name}) LIKE ?"
       end.join(" OR ")
     end
 
     def search_terms
-      ["%#{term.downcase}%"] * search_attributes.count
+      ["%#{term.mb_chars.downcase}%"] * search_attributes.count
     end
 
     def search_attributes
@@ -40,7 +39,7 @@ module Administrate
     end
 
     def attribute_types
-      resolver.dashboard_class::ATTRIBUTE_TYPES
+      @dashboard_class::ATTRIBUTE_TYPES
     end
 
     attr_reader :resolver, :term

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.7.0".freeze
+  VERSION = "0.8.0".freeze
 end

data/lib/generators/administrate/assets/assets_generator.rb

@@ -4,7 +4,6 @@ module Administrate
   module Generators
     class AssetsGenerator < Administrate::ViewGenerator
       def copy_assets
-        call_generator("administrate:assets:images")
         call_generator("administrate:assets:javascripts")
         call_generator("administrate:assets:stylesheets")
       end

data/lib/generators/administrate/routes/routes_generator.rb

@@ -43,7 +43,7 @@ module Administrate
       end
 
       def database_models
-        ActiveRecord::Base.descendants
+        ActiveRecord::Base.descendants.reject(&:abstract_class?)
       end
 
       def invalid_database_models

data/lib/generators/administrate/views/layout_generator.rb

@@ -13,6 +13,7 @@ module Administrate
           )
 
           call_generator("administrate:views:navigation")
+          copy_resource_template("_stylesheet")
           copy_resource_template("_javascript")
           copy_resource_template("_flashes")
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -20,7 +20,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,19 +70,19 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -141,20 +141,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: normalize-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -204,12 +190,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- app/assets/images/administrate/cancel.svg
-- app/assets/images/administrate/dropdown.svg
-- app/assets/images/administrate/search.svg
-- app/assets/images/administrate/sort_arrow.svg
 - app/assets/javascripts/administrate/application.js
-- app/assets/javascripts/administrate/components/_search.js
 - app/assets/javascripts/administrate/components/date_time_picker.js
 - app/assets/javascripts/administrate/components/has_many_form.js
 - app/assets/javascripts/administrate/components/table.js
@@ -240,6 +221,7 @@ files:
 - app/views/administrate/application/_collection.html.erb
 - app/views/administrate/application/_flashes.html.erb
 - app/views/administrate/application/_form.html.erb
+- app/views/administrate/application/_icons.erb
 - app/views/administrate/application/_javascript.html.erb
 - app/views/administrate/application/_navigation.html.erb
 - app/views/administrate/application/_search.html.erb
@@ -343,7 +325,6 @@ files:
 - lib/administrate/version.rb
 - lib/administrate/view_generator.rb
 - lib/generators/administrate/assets/assets_generator.rb
-- lib/generators/administrate/assets/images_generator.rb
 - lib/generators/administrate/assets/javascripts_generator.rb
 - lib/generators/administrate/assets/stylesheets_generator.rb
 - lib/generators/administrate/dashboard/USAGE

data/app/assets/images/administrate/cancel.svg

@@ -1,6 +0,0 @@
-<svg id="cancel-search" width="48" height="48" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
-  <title>cancel</title>
-  <g fill="#D8D8D8" fill-rule="evenodd">
-    <path d="M24 19.757l-8.485-8.485c-.784-.783-2.047-.782-2.827 0l-1.417 1.416c-.777.777-.78 2.046.002 2.827L19.757 24l-8.485 8.485c-.783.784-.782 2.047 0 2.827l1.416 1.417c.777.777 2.046.78 2.827-.002L24 28.243l8.485 8.485c.784.783 2.047.782 2.827 0l1.417-1.416c.777-.777.78-2.046-.002-2.827L28.243 24l8.485-8.485c.783-.784.782-2.047 0-2.827l-1.416-1.417c-.777-.777-2.046-.78-2.827.002L24 19.757zM24 47c12.703 0 23-10.297 23-23S36.703 1 24 1 1 11.297 1 24s10.297 23 23 23z"/>
-  </g>
-</svg>

data/app/assets/images/administrate/dropdown.svg

@@ -1,3 +0,0 @@
-<svg width="242" height="104" viewBox="0 0 242 104" xmlns="http://www.w3.org/2000/svg">
-  <path d="M0 0h242L121 104 0 0z" fill="#2d6586" fill-rule="evenodd"/>
-</svg>

data/app/assets/images/administrate/search.svg

@@ -1,6 +0,0 @@
-<svg id="search" width="48" height="48" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
-    <title>
-        search
-    </title>
-    <path d="M27.885 32.515c-2.864 1.966-6.333 3.116-10.07 3.116C7.976 35.63 0 27.656 0 17.817 0 7.976 7.976 0 17.816 0S35.63 7.976 35.63 17.816c0 3.736-1.15 7.205-3.115 10.07l14.53 14.53c1.278 1.277 1.275 3.352 0 4.628-1.28 1.278-3.353 1.278-4.63 0l-14.53-14.53zm-10.07-3.736c6.056 0 10.964-4.91 10.964-10.964 0-6.055-4.91-10.964-10.964-10.964-6.055 0-10.964 4.91-10.964 10.964 0 6.055 4.91 10.963 10.964 10.963z" fill-rule="evenodd"/>
-</svg>

data/app/assets/images/administrate/sort_arrow.svg

@@ -1,4 +0,0 @@
-<svg id="sort_arrow" width="48" height="48" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
-  <title>sort_arrow</title>
-  <path d="M2.988 33.02c-1.66 0-1.943-.81-.618-1.824l20-15.28c.878-.672 2.31-.67 3.188 0l20.075 15.288c1.316 1.003 1.048 1.816-.62 1.816H2.987z" />
-</svg>

data/app/assets/javascripts/administrate/components/_search.js

@@ -1,43 +0,0 @@
-$(function() {
-  "use strict";
-
-  var $input = $(".search__input");
-  var activeSuffix = "--active";
-  var timeout;
-
-  $.fn.textWidth = function(text, font) {
-    if (!$.fn.textWidth.fakeEl) {
-      $.fn.textWidth.fakeEl = $('<span style="display: none;">')
-                              .appendTo(document.body);
-    }
-
-    var htmlText = text || this.val() || this.text();
-    htmlText = $.fn.textWidth.fakeEl.text(htmlText).html();
-    htmlText = htmlText.replace(/\s/g, "&nbsp;");
-    $.fn.textWidth.fakeEl.html(htmlText).css("font", font || this.css("font"));
-    return $.fn.textWidth.fakeEl.width();
-  };
-
-  var activate = function(className) {
-    $("." + className).addClass(className + activeSuffix);
-  };
-
-  var deactivate = function(className) {
-    $("." + className).removeClass(className + activeSuffix);
-  };
-
-  $input.on("focus",   function() { activate("search__icon"); });
-  $input.on("blur",    function() { deactivate("search__icon"); });
-  $input.on("keydown", function() { deactivate("search__hint"); });
-
-  var showHint = function() { activate("search__hint"); };
-
-  $input.on("keyup", function() {
-    clearTimeout(timeout);
-
-    if($input.val().length) {
-      $(".search__hint").css("left", $input.textWidth() + 75);
-      timeout = setTimeout(showHint, 250);
-    }
-  });
-});

data/lib/generators/administrate/assets/images_generator.rb

@@ -1,17 +0,0 @@
-require "rails/generators/base"
-
-module Administrate
-  module Generators
-    module Assets
-      class ImagesGenerator < Rails::Generators::Base
-        IMAGES_PATH = "app/assets/images/administrate"
-
-        source_root File.expand_path("../../../../../", __FILE__)
-
-        def copy_images
-          directory IMAGES_PATH, IMAGES_PATH
-        end
-      end
-    end
-  end
-end