Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# .git-blame-ignore-revs
# Convert to standardrb
0d69b98cf75540aaf4a52bca0368b12447de596d
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
ruby-version: "3.2"
bundler-cache: true
- name: Lint Ruby files
run: bundle exec rubocop -ESP
run: bundle exec standardrb
16 changes: 0 additions & 16 deletions .rubocop.yml

This file was deleted.

67 changes: 0 additions & 67 deletions .rubocop_todo.yml

This file was deleted.

6 changes: 6 additions & 0 deletions .standard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parallel: true
format: progress
ruby_version: 3.1
ignore:
- "*/spec/dummy/**/*"
- "sandbox/**/*"
41 changes: 20 additions & 21 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,47 +1,46 @@
# frozen_string_literal: true

source 'https://rubygems.org'
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
gem 'solidus', github: 'solidusio/solidus', branch: branch
branch = ENV.fetch("SOLIDUS_BRANCH", "main")
gem "solidus", github: "solidusio/solidus", branch: branch

# The solidus_frontend gem has been pulled out since v3.2
if branch >= 'v3.2'
gem 'solidus_frontend'
elsif branch == 'main'
gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
if branch >= "v3.2"
gem "solidus_frontend"
elsif branch == "main"
gem "solidus_frontend", github: "solidusio/solidus_frontend"
else
gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
gem "solidus_frontend", github: "solidusio/solidus", branch: branch
end

# Needed to help Bundler figure out how to resolve dependencies,
# otherwise it takes forever to resolve them.
# See https://github.com/bundler/bundler/issues/6677
gem 'rails', '>0.a'

gem "rails", ">0.a"

# Provides basic authentication functionality for testing parts of your engine
gem 'solidus_auth_devise'
gem "solidus_auth_devise", github: "solidusio/solidus_auth_devise"

case ENV.fetch('DB', nil)
when 'mysql'
gem 'mysql2'
when 'postgresql'
gem 'pg'
case ENV.fetch("DB", nil)
when "mysql"
gem "mysql2"
when "postgresql"
gem "pg"
else
gem 'sqlite3'
gem "sqlite3"
end

group :test do
gem 'rails-controller-testing'
gem 'rspec-activemodel-mocks'
gem "rails-controller-testing"
gem "rspec-activemodel-mocks"
end

# While we still support Ruby < 3 we need to workaround a limitation in
# the 'async' gem that relies on the latest ruby, since RubyGems doesn't
# resolve gems based on the required ruby version.
gem 'async', '< 3' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
gem "async", "< 3" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3")

gemspec

Expand All @@ -50,4 +49,4 @@ gemspec
#
# We use `send` instead of calling `eval_gemfile` to work around an issue with
# how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'
send(:eval_gemfile, "Gemfile-local") if File.exist? "Gemfile-local"
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
SolidusReports
==============

[![CircleCI](https://circleci.com/gh/solidusio-contrib/solidus_reports.svg?style=svg)](https://circleci.com/gh/solidusio-contrib/solidus_reports)

This extension add the reports module to Solidus Admin. The reports section was extracted into this extension.

Installation
Expand Down Expand Up @@ -40,11 +38,11 @@ require 'solidus_reports/factories'

Releasing
---------

Your new extension version can be released using `gem-release` like this:

```shell
bundle exec gem bump -v VERSION --tag --push --remote upstream && gem release
```

Copyright (c) 2020 [name of extension creator], released under the New BSD License
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require "bundler/gem_tasks"
require 'solidus_dev_support/rake_tasks'
require "solidus_dev_support/rake_tasks"
SolidusDevSupport::RakeTasks.install

task default: 'extension:specs'
task default: "extension:specs"
4 changes: 2 additions & 2 deletions app/controllers/spree/admin/reports_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def add_available_report!(report_key, report_description_key = nil)

@@available_reports[report_key] = {
name: report_key,
description: report_description_key,
description: report_description_key
}
end
end
Expand Down Expand Up @@ -61,7 +61,7 @@ def search_params
params.fetch(:q, {}).tap do |q|
q[:completed_at_gt] = adjust_start_date q[:completed_at_gt]
q[:completed_at_lt] = adjust_end_date(q[:completed_at_lt]) if q[:completed_at_lt].present?
q[:s] ||= 'completed_at desc'
q[:s] ||= "completed_at desc"
end
end

Expand Down
20 changes: 10 additions & 10 deletions lib/generators/solidus_reports/install/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@ module SolidusReports
module Generators
class InstallGenerator < Rails::Generators::Base
class_option :auto_run_migrations, type: :boolean, default: false
source_root File.expand_path('templates', __dir__)
source_root File.expand_path("templates", __dir__)

def self.exit_on_failure?
true
end

def copy_initializer
template 'initializer.rb', 'config/initializers/solidus_reports.rb'
template "initializer.rb", "config/initializers/solidus_reports.rb"
end

def add_javascripts
append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_reports\n"
append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_reports\n"
append_file "vendor/assets/javascripts/spree/frontend/all.js", "//= require spree/frontend/solidus_reports\n"
append_file "vendor/assets/javascripts/spree/backend/all.js", "//= require spree/backend/solidus_reports\n"
end

def add_stylesheets
inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_reports\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_reports\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
inject_into_file "vendor/assets/stylesheets/spree/frontend/all.css", " *= require spree/frontend/solidus_reports\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
inject_into_file "vendor/assets/stylesheets/spree/backend/all.css", " *= require spree/backend/solidus_reports\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
end

def add_migrations
run 'bin/rails railties:install:migrations FROM=solidus_reports'
run "bin/rails railties:install:migrations FROM=solidus_reports"
end

def run_migrations
run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
run_migrations = options[:auto_run_migrations] || ["", "y", "Y"].include?(ask("Would you like to run the migrations now? [Y/n]")) # rubocop:disable Layout/LineLength
if run_migrations
run 'bin/rails db:migrate'
run "bin/rails db:migrate"
else
puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
puts "Skipping bin/rails db:migrate, don't forget to run it!" # rubocop:disable Rails/Output
end
end
end
Expand Down
6 changes: 3 additions & 3 deletions lib/solidus_reports.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

require 'solidus_reports/configuration'
require 'solidus_reports/version'
require 'solidus_reports/engine'
require "solidus_reports/configuration"
require "solidus_reports/version"
require "solidus_reports/engine"
2 changes: 1 addition & 1 deletion lib/solidus_reports/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def configuration
@configuration ||= Configuration.new
end

alias config configuration
alias_method :config, :configuration

def configure
yield configuration
Expand Down
12 changes: 8 additions & 4 deletions lib/solidus_reports/engine.rb
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
# frozen_string_literal: true

require 'solidus_core'
require 'solidus_support'
require "solidus_core"
require "solidus_support"

module SolidusReports
class Engine < Rails::Engine
include SolidusSupport::EngineExtensions

isolate_namespace ::Spree

engine_name 'solidus_reports'
engine_name "solidus_reports"

# use rspec for tests
config.generators do |g|
g.test_framework :rspec
end

initializer "solidus_reports.environment", before: :load_config_initializers do
# rubocop:disable Lint/ConstantDefinitionInBlock
# rubocop:disable Lint/OrAssignmentToConstant
REPORT_TABS ||= [:reports].freeze
# rubocop:enable Lint/ConstantDefinitionInBlock
# rubocop:enable Lint/OrAssignmentToConstant

new_item = Spree::BackendConfiguration::MenuItem.new(
REPORT_TABS,
'file',
"file",
condition: -> { can?(:admin, :reports) }
)
Spree::Backend::Config.menu_items << new_item
Expand Down
2 changes: 1 addition & 1 deletion lib/solidus_reports/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module SolidusReports
VERSION = '1.2.0'
VERSION = "1.2.0"
end
31 changes: 15 additions & 16 deletions solidus_reports.gemspec
Original file line number Diff line number Diff line change
@@ -1,36 +1,35 @@
# frozen_string_literal: true

require_relative 'lib/solidus_reports/version'
require_relative "lib/solidus_reports/version"

Gem::Specification.new do |spec|
spec.name = 'solidus_reports'
spec.name = "solidus_reports"
spec.version = SolidusReports::VERSION
spec.authors = ['Jonathan Tapia']
spec.email = 'jonathan.tapia@magmalabs.io'
spec.authors = ["Jonathan Tapia"]
spec.email = "jonathan.tapia@magmalabs.io"

spec.summary = 'Reports module from Solidus core'
spec.description = 'Reports module from Solidus core'
spec.homepage = 'http://github.com/solidusio-contrib/solidus_reports'
spec.license = 'BSD-3-Clause'
spec.summary = "Reports module from Solidus core"
spec.description = "Reports module from Solidus core"
spec.homepage = "http://github.com/solidusio-contrib/solidus_reports"
spec.license = "BSD-3-Clause"

spec.metadata['homepage_uri'] = spec.homepage
spec.metadata['source_code_uri'] = 'http://github.com/solidusio-contrib/solidus_reports'
spec.metadata['changelog_uri'] = 'https://github.com/DanielePalombo/solidus_reports/blob/master/CHANGELOG.md'
spec.metadata["homepage_uri"] = spec.homepage
spec.metadata["source_code_uri"] = "http://github.com/solidusio-contrib/solidus_reports"
spec.metadata["changelog_uri"] = "https://github.com/DanielePalombo/solidus_reports/blob/master/CHANGELOG.md"

spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 4')
spec.required_ruby_version = Gem::Requirement.new(">= 2.5", "< 5")

# Specify which files should be added to the gem when it is released.
# The `git ls-files -z` loads the files in the RubyGem that have been added into git.
files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }

spec.files = files.grep_v(%r{^(test|spec|features)/})
spec.test_files = files.grep(%r{^(test|spec|features)/})
spec.bindir = "exe"
spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5']
spec.add_dependency 'solidus_support', '~> 0.5'
spec.add_dependency "solidus_core", [">= 2.0.0", "< 5"]
spec.add_dependency "solidus_support", "~> 0.5"

spec.add_development_dependency 'solidus_dev_support', '~> 2.7'
spec.add_development_dependency "solidus_dev_support", "~> 2.7"
end
Loading
Loading