archangel 0.0.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ada0c8ed4af07cb9635a364c3ac186aaeff079823aa2d63113b9386faa5dd74
-  data.tar.gz: 59820ae9c8fed07aef979c3f44eec939645e611bb05ce104b53ff54c9f4904f2
+  metadata.gz: e1a64319173910746312e102a3101c834448b6b48ca2820c870ef07266bfc77f
+  data.tar.gz: f691facf12d5f3fd4b705bebb3af929e3a670d954a6629b0236d2d23e798638a
 SHA512:
-  metadata.gz: f6169656cff9ed37878dc356ce5a47a61745e3829ed2d94fc646f5ede5017c84fa5587e28a7bffe1e3e0ed798ebfc3fb50b8b0a1b50a699fdc53c024fb80cc82
-  data.tar.gz: 5c6be4b10f12046913e9723f42fbb96cd28ccf138b938fa30cc0152b0570a0dc8a9f99aef3b293281855fa9da1031782d3330ec517922b3731c5b780e712a9b9
+  metadata.gz: 9c94efb7d13766d7ccadaf9cb31021c844772c23bd2997dfc85cc79fcb84ab8943ce868f2cee1abdb45857211d8da877b39ffac446fd03838b2ac68b7d90d030
+  data.tar.gz: 5014fdc8c6b90b50d1f6b3780aae9de22e93b08ab74861b4302f14e723bd69c5bfb58fcfb78f5c40f1e6fb30c5e90d33b067ccd1a163f3b66730414613e6793e

data/.jshintrc

@@ -3,12 +3,12 @@
     "$": true,
     "Archangel": true,
     "Event": true,
+    "Object": true,
     "Sortable": true,
     "XMLHttpRequest": true,
     "document": true,
     "jQuery": true,
     "localStorage": true,
-    "Object": true,
     "window": true
   },
   "boss": true,

data/.reek.yml

@@ -0,0 +1,42 @@
+---
+exclude_paths:
+  - db/migrate
+  - spec/dummy
+
+detectors:
+  BooleanParameter:
+    enabled: false
+  IrresponsibleModule:
+    enabled: false
+  UnusedPrivateMethod:
+    enabled: true
+  UtilityFunction:
+    public_methods_only: true
+
+directories:
+  "app/controllers":
+    IrresponsibleModule:
+      enabled: false
+    NestedIterators:
+      max_allowed_nesting: 2
+    UnusedPrivateMethod:
+      enabled: false
+    InstanceVariableAssumption:
+      enabled: false
+  "app/helpers":
+    IrresponsibleModule:
+      enabled: false
+    UtilityFunction:
+      enabled: false
+  "app/inputs":
+    InstanceVariableAssumption:
+      enabled: false
+  "app/mailers":
+    InstanceVariableAssumption:
+      enabled: false
+  "app/policies":
+    InstanceVariableAssumption:
+      enabled: false
+  "app/uploaders":
+    UtilityFunction:
+      enabled: false

data/.rubocop.yml

@@ -1,26 +1,15 @@
 inherit_from:
   - .rubocop_disabled.yml
   - .rubocop_enabled.yml
+  - .rubocop_exclude.yml
   - .rubocop_todo.yml
 
 AllCops:
-  Include:
-    - '**/Gemfile'
-    - '**/Rakefile'
   Exclude:
     - 'bin/**/*'
     - 'db/migrate/**/*'
     - 'spec/dummy/**/*'
 
-Metrics/BlockLength:
-  Exclude:
-    - '**/*.gemspec'
-    - '**/*.rake'
-    - 'config/initializers/simple_form_bootstrap.rb'
-    - 'config/routes.rb'
-    - 'lib/archangel/testing_support/**/*.rb'
-    - 'spec/**/*.rb'
-
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

data/.rubocop_exclude.yml

@@ -0,0 +1,12 @@
+Metrics/BlockLength:
+  Exclude:
+    - '**/*.gemspec'
+    - '**/*.rake'
+    - 'config/initializers/simple_form_bootstrap.rb'
+    - 'config/routes.rb'
+    - 'lib/archangel/testing_support/**/*.rb'
+    - 'spec/**/*.rb'
+
+Metrics/ModuleLength:
+  Exclude:
+    - 'spec/**/*.rb'

data/.rubocop_todo.yml

@@ -1,7 +1,3 @@
 Metrics/ClassLength:
   Exclude:
     - 'lib/generators/archangel/install/install_generator.rb'
-
-Metrics/ModuleLength:
-  Exclude:
-    - 'spec/**/*.rb'

data/.travis.yml

@@ -1,7 +1,6 @@
 sudo: false
 language: ruby
-cache:
-  bundler: true
+cache: bundler
 env:
   global:
     - CC_TEST_REPORTER_ID=10625f04e4c8c9fe7c22d49639163f1427fe16bc253aabcb316edbe43c41270b
@@ -19,8 +18,7 @@ script:
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - ruby-head
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0

data/Gemfile

@@ -5,32 +5,30 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "brakeman", "~> 4.1", require: false
-  gem "bundler-audit", "~> 0.6", require: false
+  gem "brakeman", "~> 4.3", require: false
   gem "inch", "~> 0.8", require: false
   gem "listen", "~> 3.1", require: false
-  gem "mdl", "~> 0.4", require: false
-  gem "reek", "~> 4.7", require: false
-  gem "rubocop", "~> 0.52", require: false
-  gem "scss_lint", "~> 0.56", require: false
+  gem "mdl", "~> 0.5", require: false
+  gem "reek", "~> 5.2", require: false
+  gem "rubocop", "~> 0.59", require: false
+  gem "scss_lint", "~> 0.57", require: false
   gem "yard", "~> 0.9", require: false
 end
 
 group :development, :test do
-  gem "launchy", "~> 2.4"
-  gem "pg", "~> 1.0"
-  gem "pry-byebug", "~> 3.5"
+  gem "pg", "~> 1.1"
+  gem "pry-byebug", "~> 3.6"
   gem "sqlite3", ">= 1.3", platforms: %i[ruby mswin mswin64 mingw x64_mingw]
 end
 
 group :test do
-  gem "capybara", "~> 3.0"
-  gem "database_cleaner", "~> 1.6"
-  gem "factory_bot_rails", "~> 4.8"
+  gem "capybara", "~> 3.8"
+  gem "database_cleaner", "~> 1.7"
+  gem "factory_bot_rails", "~> 4.11"
   gem "poltergeist", "~> 1.18"
   gem "rails-controller-testing", "~> 1.0"
-  gem "rspec-rails", "~> 3.7"
+  gem "rspec-rails", "~> 3.8"
   gem "shoulda-callback-matchers", "~> 1.1"
   gem "shoulda-matchers", "~> 3.1"
-  gem "simplecov", "~> 0.14"
+  gem "simplecov", "~> 0.16"
 end

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Archangel
+Copyright (c) 2019 Archangel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -31,7 +31,7 @@ Deploy a sample application to [Heroku](https://www.heroku.com/) to play with.
 Add to your application's Gemfile
 
 ```
-gem "archangel", "< 1.0"
+gem "archangel", "~> 0.3"
 ```
 
 Run the bundle command

data/app/controllers/archangel/application_controller.rb

@@ -54,8 +54,6 @@ module Archangel
     #     },
     #     "content": "</p>Content of the Widget</p>",
     #     "template_id": 123,
-    #     "meta_keywords": "keywords,for,the,site",
-    #     "meta_description": "Description of the site",
     #     "deleted_at": null,
     #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
     #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"

data/app/controllers/archangel/auth/registrations_controller.rb

@@ -14,6 +14,18 @@ module Archangel
 
       protected
 
+      def after_sign_up_path_for(resource)
+        stored_location_for(resource) || root_path
+      end
+
+      def after_inactive_sign_up_path_for(resource)
+        after_sign_up_path_for(resource)
+      end
+
+      def sign_up_params
+        super.merge(site_id: current_site.id)
+      end
+
       def allow_registration
         return render_404_error unless Archangel.config.allow_registration
       end

data/app/controllers/archangel/backend/assets_controller.rb

@@ -9,232 +9,7 @@ module Archangel
     # Backend assets controller
     #
     class AssetsController < BackendController
-      before_action :set_resources, only: %i[index]
-      before_action :set_resource, only: %i[destroy edit show update]
-      before_action :set_new_resource, only: %i[create new]
-      before_action :set_wysiwyg_resource, only: %i[wysiwyg]
-
-      ##
-      # Backend assets
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/assets
-      #   GET /backend/assets.json
-      #
-      # Response
-      #   [
-      #     {
-      #       "id": 123,
-      #       "site_id": 123,
-      #       "file_name": "file_name.gif",
-      #       "file": {
-      #         "url": "/uploads/file.gif",
-      #         "small": {
-      #           "url": "/uploads/small_file.gif"
-      #         },
-      #         "tiny": {
-      #           "url": "/uploads/tiny_file.gif"
-      #         }
-      #       },
-      #       "content_type": "image/gif",
-      #       "file_size": 1234,
-      #       "deleted_at": null,
-      #       "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #       "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #     },
-      #     ...
-      #   ]
-      #
-      def index
-        respond_with @assets
-      end
-
-      ##
-      # Backend asset
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the asset id
-      #
-      # Request
-      #   GET /backend/assets/:id
-      #   GET /backend/assets/:id.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "file_name": "file_name.gif",
-      #     "file": {
-      #       "url": "/uploads/file.gif",
-      #       "small": {
-      #         "url": "/uploads/small_file.gif"
-      #       },
-      #       "tiny": {
-      #         "url": "/uploads/tiny_file.gif"
-      #       }
-      #     },
-      #     "content_type": "image/gif",
-      #     "file_size": 1234,
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def show
-        respond_with @asset
-      end
-
-      ##
-      # New backend asset
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   GET /backend/assets/new
-      #   GET /backend/assets/new.json
-      #
-      # Response
-      #   {
-      #     "id": null,
-      #     "site_id": null,
-      #     "file_name": null,
-      #     "file": {
-      #       "url": null,
-      #       "small": {
-      #         "url": null
-      #       },
-      #       "tiny": {
-      #         "url": null
-      #       }
-      #     },
-      #     "content_type": null,
-      #     "file_size": null,
-      #     "deleted_at": null,
-      #     "created_at": null,
-      #     "updated_at": null
-      #   }
-      #
-      def new
-        respond_with @asset
-      end
-
-      ##
-      # Create backend asset
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Request
-      #   POST /backend/assets
-      #   POST /backend/assets.json
-      #
-      # Paramaters
-      #   {
-      #     "asset": {
-      #       "file_name": "file_name.gif",
-      #       "file": "local/path/to/new_file.gif"
-      #     }
-      #   }
-      #
-      def create
-        @asset.save
-
-        respond_with @asset, location: -> { location_after_create }
-      end
-
-      ##
-      # Edit backend asset
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the asset id
-      #
-      # Request
-      #   GET /backend/assets/:id/edit
-      #   GET /backend/assets/:id/edit.json
-      #
-      # Response
-      #   {
-      #     "id": 123,
-      #     "site_id": 123,
-      #     "file_name": "file_name.gif",
-      #     "file": {
-      #       "url": "/uploads/file.gif",
-      #       "small": {
-      #         "url": "/uploads/small_file.gif"
-      #       },
-      #       "tiny": {
-      #         "url": "/uploads/tiny_file.gif"
-      #       }
-      #     },
-      #     "content_type": "image/gif",
-      #     "file_size": 1234,
-      #     "deleted_at": null,
-      #     "created_at": "YYYY-MM-DDTHH:MM:SS.MSZ",
-      #     "updated_at": "YYYY-MM-DDTHH:MM:SS.MSZ"
-      #   }
-      #
-      def edit
-        respond_with @asset
-      end
-
-      ##
-      # Update backend asset
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the asset id
-      #
-      # Request
-      #   PATCH /backend/assets/:id
-      #   PATCH /backend/assets/:id.json
-      #   PUT   /backend/assets/:id
-      #   PUT   /backend/assets/:id.json
-      #
-      # Paramaters
-      #   {
-      #     "asset": {
-      #       "file_name": "file_name.gif",
-      #       "file": "local/path/to/new_file.gif"
-      #       }
-      #     }
-      #   }
-      #
-      def update
-        @asset.update(resource_params)
-
-        respond_with @asset, location: -> { location_after_update }
-      end
-
-      ##
-      # Destroy backend asset
-      #
-      # Formats
-      #   HTML, JSON
-      #
-      # Params
-      #   [Integer] id - the asset id
-      #
-      # Request
-      #   DELETE /backend/assets/:id
-      #   DELETE /backend/assetsidslug.json
-      #
-      def destroy
-        @asset.destroy
-
-        respond_with @asset, location: -> { location_after_destroy }
-      end
+      include Archangel::Controllers::Backend::ResourcefulConcern
 
       ##
       # Create backend asset from WYSIWYG upload
@@ -258,11 +33,13 @@ module Archangel
       #   }
       #
       def wysiwyg
-        @asset.save
+        asset = resource_wysiwyg_content
+
+        asset.save
 
         asset_response = {
           success: true,
-          url: @asset.file.url
+          url: asset.file.url
         }
 
         respond_to do |format|
@@ -276,7 +53,7 @@ module Archangel
         %w[file file_name]
       end
 
-      def set_resources
+      def resources_content
         @assets = current_site.assets
                               .order(file_name: :asc)
                               .page(page_num).per(per_page)
@@ -284,7 +61,7 @@ module Archangel
         authorize @assets
       end
 
-      def set_resource
+      def resource_content
         resource_id = params.fetch(:id)
 
         @asset = current_site.assets.find_by!(id: resource_id)
@@ -292,15 +69,13 @@ module Archangel
         authorize @asset
       end
 
-      def set_new_resource
-        new_params = action_name.to_sym == :create ? resource_params : nil
-
-        @asset = current_site.assets.new(new_params)
+      def resource_new_content
+        @asset = current_site.assets.new(resource_new_params)
 
         authorize @asset
       end
 
-      def set_wysiwyg_resource
+      def resource_wysiwyg_content
         wysiwyg_params = params.permit(permitted_attributes).reverse_merge(
           file_name: "#{SecureRandom.hex}.jpg"
         )
@@ -309,30 +84,6 @@ module Archangel
 
         authorize @asset
       end
-
-      def resource_params
-        params.require(resource_namespace).permit(permitted_attributes)
-      end
-
-      def resource_namespace
-        controller_name.singularize.to_sym
-      end
-
-      def location_after_create
-        location_after_save
-      end
-
-      def location_after_update
-        location_after_save
-      end
-
-      def location_after_destroy
-        location_after_save
-      end
-
-      def location_after_save
-        backend_assets_path
-      end
     end
   end
 end