super 0.0.4 → 0.0.5

data/lib/generators/super/webpacker/webpacker_generator.rb

@@ -9,6 +9,14 @@ module Super
       )
     end
 
+    def set_asset_handler_to_webpacker
+      insert_into_file(
+        "config/initializers/super.rb",
+        "  c.asset_handler = Super::Assets.webpacker\n",
+        before: /\bend\b/
+      )
+    end
+
     def remind_about_erb
       say "Make sure ERB is set up for Webpacker!", :bold
       say "Run if needed: rails webpacker:install:erb", :bold

data/lib/super.rb

@@ -1,16 +1,14 @@
-require "tsort"
 require "active_support/concern"
 
-require "super/action"
-require "super/action/step"
 require "super/action_inquirer"
 require "super/assets"
+require "super/compatibility"
 require "super/configuration"
 require "super/controls"
-require "super/engine"
-require "super/error"
 require "super/display"
 require "super/display/schema_types"
+require "super/engine"
+require "super/error"
 require "super/form/schema_types"
 require "super/layout"
 require "super/link"
@@ -20,4 +18,6 @@ require "super/panel"
 require "super/partial"
 require "super/plugin"
 require "super/schema"
+require "super/step"
 require "super/version"
+require "super/view_helper"

data/lib/super/compatibility.rb

@@ -0,0 +1,13 @@
+module Super
+  module Compatability
+    module_function
+
+    def rails_50_errable_fields(field)
+      if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 0
+        [field.to_s, field.to_sym]
+      else
+        field
+      end
+    end
+  end
+end

data/lib/super/controls.rb

@@ -116,146 +116,5 @@ module Super
     def form_schema(action:)
       @actual.form_schema(action: action)
     end
-
-    # @return [Action]
-    def index
-      if @actual.respond_to?(:index)
-        return @actual.index
-      end
-
-      Super::Action.new(
-        steps: [
-          :load_resources,
-          :paginate,
-        ],
-        page: Super::Layout.new(
-          mains: [
-            Super::Panel.new(
-              Super::Partial.new("resources_header"),
-              Super::Partial.new("index")
-            )
-          ]
-        )
-      )
-    end
-
-    # @return [Action]
-    def show
-      if @actual.respond_to?(:show)
-        return @actual.show
-      end
-
-      Super::Action.new(
-        steps: [
-          :load_resource,
-        ],
-        page: Super::Layout.new(
-          mains: [
-            Super::Panel.new(
-              Super::Partial.new("resource_header"),
-              Super::Partial.new("show")
-            )
-          ]
-        )
-      )
-    end
-
-    # @return [Action]
-    def new
-      if @actual.respond_to?(:new)
-        return @actual.new
-      end
-
-      Super::Action.new(
-        steps: [
-          :new_resource,
-        ],
-        page: Super::Layout.new(
-          mains: [
-            Super::Panel.new(
-              Super::Partial.new("resources_header"),
-              Super::Partial.new("form")
-            )
-          ]
-        )
-      )
-    end
-
-    # @return [Action]
-    def create
-      if @actual.respond_to?(:create)
-        return @actual.create
-      end
-
-      Super::Action.new(
-        steps: [
-          :create_resource,
-        ],
-        page: Super::Layout.new(
-          mains: [
-            Super::Panel.new(
-              Super::Partial.new("resources_header"),
-              Super::Partial.new("form")
-            )
-          ]
-        )
-      )
-    end
-
-    # @return [Action]
-    def edit
-      if @actual.respond_to?(:edit)
-        return @actual.edit
-      end
-
-      Super::Action.new(
-        steps: [
-          :load_resource,
-        ],
-        page: Super::Layout.new(
-          mains: [
-            Super::Panel.new(
-              Super::Partial.new("resource_header"),
-              Super::Partial.new("form")
-            )
-          ]
-        )
-      )
-    end
-
-    # @return [Action]
-    def update
-      if @actual.respond_to?(:update)
-        return @actual.update
-      end
-
-      Super::Action.new(
-        steps: [
-          :load_resource,
-        ],
-        page: Super::Layout.new(
-          mains: [
-            Super::Panel.new(
-              Super::Partial.new("resource_header"),
-              Super::Partial.new("form")
-            )
-          ]
-        )
-      )
-    end
-
-    # @return [Action]
-    def destroy
-      if @actual.respond_to?(:destroy)
-        return @actual.destroy
-      end
-
-      Super::Action.new(
-        steps: [
-          :load_resource,
-        ],
-        page: Super::Layout.new
-      )
-    end
   end
 end

data/lib/super/step.rb

@@ -0,0 +1,36 @@
+module Super
+  module Step
+    module_function
+
+    def load_resources(controls, _params, action_inquirer)
+      controls.scope(action: action_inquirer)
+    end
+
+    def initialize_pagination(resources, query_params, limit: Super.configuration.index_resources_per_page)
+      Pagination.new(
+        total_count: resources.size,
+        limit: limit,
+        query_params: query_params,
+        page_query_param: :page
+      )
+    end
+
+    def paginate_resources(resources, pagination)
+      resources
+        .limit(pagination.limit)
+        .offset(pagination.offset)
+    end
+
+    def load_resource(controls, params, action_inquirer)
+      controls.scope(action: action_inquirer).find(params[:id])
+    end
+
+    def build_resource(controls, action_inquirer)
+      controls.scope(action: action_inquirer).build
+    end
+
+    def build_resource_with_params(controls, action_inquirer, create_permitted_params)
+      controls.scope(action: action_inquirer).build(create_permitted_params)
+    end
+  end
+end

data/lib/super/version.rb

@@ -1,3 +1,3 @@
 module Super
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/super/view_helper.rb

@@ -0,0 +1,43 @@
+module Super
+  module ViewHelper
+    module_function
+
+    # For example, calling `classes("always", ["sometimes", condition])` would
+    # return the string "always sometimes" or "always"
+    def classes(*list)
+      result = list.map do |c|
+        case c
+        when String
+          c
+        when Array
+          if c.size != 2
+            raise %(Expected exactly two elements (["class", some_condition]), got: #{c.inspect})
+          end
+
+          c if c.last
+        end
+      end
+
+      result.compact.join(" ")
+    end
+
+    def errors_accounting_for_reflections(model_instance, column_or_association)
+      errable_fields(model_instance, column_or_association)
+        .flat_map { |field| Compatability.rails_50_errable_fields(field) }
+        .flat_map { |field| model_instance.errors.full_messages_for(field) }
+        .uniq
+    end
+
+    def errable_fields(model_instance, column_or_association)
+      column_or_association = column_or_association.to_s
+      reflection = model_instance.class.reflect_on_association(column_or_association)
+      reflection ||= model_instance.class.reflections.values.find { |r| r.foreign_key == column_or_association }
+
+      if reflection
+        [reflection.name.to_s, reflection.foreign_key.to_s]
+      else
+        [column_or_association]
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -26,6 +26,48 @@ dependencies:
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.142'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.142'
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,6 +171,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - LICENSE
 - README.md
 - Rakefile
@@ -161,6 +204,12 @@ files:
 - app/views/super/feather/README.md
 - app/views/super/feather/_chevron_down.svg
 - config/routes.rb
+- docs/README.md
+- docs/controls.md
+- docs/faq.md
+- docs/quick_start.md
+- docs/webpacker.md
+- docs/yard_customizations.rb
 - frontend/super-frontend/build.js
 - frontend/super-frontend/dist/application.css
 - frontend/super-frontend/dist/application.js
@@ -185,10 +234,9 @@ files:
 - lib/generators/super/webpacker/templates/pack_super_application.js.erb.tt
 - lib/generators/super/webpacker/webpacker_generator.rb
 - lib/super.rb
-- lib/super/action.rb
-- lib/super/action/step.rb
 - lib/super/action_inquirer.rb
 - lib/super/assets.rb
+- lib/super/compatibility.rb
 - lib/super/configuration.rb
 - lib/super/controls.rb
 - lib/super/display.rb
@@ -204,26 +252,9 @@ files:
 - lib/super/partial.rb
 - lib/super/plugin.rb
 - lib/super/schema.rb
-- lib/super/test_support/copy_app_templates/controllers/favorite_things_controller.rb
-- lib/super/test_support/copy_app_templates/controllers/members_controller.rb
-- lib/super/test_support/copy_app_templates/controllers/ships_controller.rb
-- lib/super/test_support/copy_app_templates/migrations/20190216224956_create_members.rb
-- lib/super/test_support/copy_app_templates/migrations/20190803143320_create_ships.rb
-- lib/super/test_support/copy_app_templates/migrations/20190806014121_add_ship_to_members.rb
-- lib/super/test_support/copy_app_templates/migrations/20191126050453_create_favorite_things.rb
-- lib/super/test_support/copy_app_templates/models/favorite_thing.rb
-- lib/super/test_support/copy_app_templates/models/member.rb
-- lib/super/test_support/copy_app_templates/models/ship.rb
-- lib/super/test_support/copy_app_templates/routes.rb
-- lib/super/test_support/copy_app_templates/seeds.rb
-- lib/super/test_support/copy_app_templates/views/members/_favorite_things.html.erb
-- lib/super/test_support/fixtures/favorite_things.yml
-- lib/super/test_support/fixtures/members.yml
-- lib/super/test_support/fixtures/ships.yml
-- lib/super/test_support/generate_copy_app.rb
-- lib/super/test_support/generate_dummy.rb
-- lib/super/test_support/starfleet_seeder.rb
+- lib/super/step.rb
 - lib/super/version.rb
+- lib/super/view_helper.rb
 - lib/tasks/super_tasks.rake
 homepage: 
 licenses:
@@ -244,8 +275,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
-summary: A simple, powerful, zero* dependency Rails admin framework
+summary: A simple, powerful, zero dependency Rails admin framework
 test_files: []

data/lib/super/action.rb

@@ -1,22 +0,0 @@
-module Super
-  class Action
-    def initialize(steps:, page:)
-      @steps = steps
-      @page = page
-    end
-
-    attr_reader :page
-
-    def steps
-      resolved_steps = @steps.map do |step|
-        if step.respond_to?(:call)
-          step
-        elsif self.class.steps.key?(step)
-          self.class.steps[step]
-        end
-      end
-
-      resolved_steps.compact
-    end
-  end
-end