snfoil-rails 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32d3240745aa324572ea1db937ad22466878c6746c56e308de5381f31b4351b0
-  data.tar.gz: b72b77af8fa4ce5720b00a25f36e0e32b8ca509a32ac2741bcbe0fcf1357f602
+  metadata.gz: 6700afcdb719797fdaeabbf26cd6756eeaec499241e279c3c02782a9d6ff7acf
+  data.tar.gz: 35c678efb56db5936547a847e5e098a2f0fde3dc497554f9d205839c7d27469d
 SHA512:
-  metadata.gz: af661cd8ebdcf40e4c6e0e1057e21f83c4d74c2fabcd79483c6d41125885526ef66a31c05f8e533de5476ff6dd48ff4a81d5fe211c53f815d77a61f7823f4eca
-  data.tar.gz: b9805ec5b2afd65b7cd1c2882f0e2929fd6b8d7e082b617ca489ce2016534300c1dacda0ab31bced5c62e602356bf4da2f2202a09cf2380c199d1d91a6e48a52
+  metadata.gz: e33b44fccb163393262df4955445afae964e3efd013f147a93eb519479a4b1dd22a33839e31c8029b20614bfe546ae1007285f95f95b25566f1d88e06ecb1379
+  data.tar.gz: a2ecf94f51600bee7b5fac77176a27dea9bd39cf04a6fbe674a1aae78829ed6e355023a95318d05312e4001761929e1a407f7505270b80f0225536b8d5a1ba17

data/Dockerfile

@@ -0,0 +1,22 @@
+ARG RUBY_VERSION=3.4.3
+
+FROM ruby:${RUBY_VERSION}-slim
+
+RUN apt update && \
+    apt install -y --no-install-recommends \
+    build-essential \
+    libyaml-dev \
+    git \
+    curl \
+    libjemalloc2 \
+    libvips \
+    pkg-config \
+    sqlite3
+
+WORKDIR /workspace
+
+COPY . .
+
+RUN bundle install
+
+CMD ["bundle", "exec", "rspec"]

data/Gemfile

@@ -17,22 +17,21 @@ gemspec
 # gem 'byebug', group: [:development, :test]
 
 group :development, :test do
-  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
   gem 'blueprinter'
-  gem 'bundle-audit', '~> 0.1.0'
+  gem 'bundler-audit', '~> 0.9.0'
   gem 'database_cleaner-active_record'
+  gem 'debug', '~> 1.10'
   gem 'factory_bot', '~> 6.0'
-  gem 'fasterer', '~> 0.10.0'
-  gem 'jdbc-sqlite3', platform: :jruby
+  gem 'fasterer', '~> 0.11.0'
   gem 'kaminari'
   gem 'net-smtp'
-  gem 'pry-byebug', '~> 3.9', platform: :mri
   gem 'puma'
+  gem 'rails', '~> 7.0'
   gem 'rake', '~> 13.0'
-  gem 'rspec-rails', '~> 5.0'
-  gem 'rubocop', '1.33'
-  gem 'rubocop-performance', '1.14.3'
+  gem 'rspec-rails', '~> 7.0'
+  gem 'rubocop', '~> 1.75'
+  gem 'rubocop-performance', '~> 1.25'
   gem 'rubocop-rails', '~> 2.14'
-  gem 'rubocop-rspec', '2.12.1'
+  gem 'rubocop-rspec', '~> 3.6'
   gem 'sqlite3', platform: :mri
 end

data/docker-compose.yaml

@@ -0,0 +1,11 @@
+services:
+  workspace:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    command: sleep infinity
+    volumes:
+      - .:/workspace
+    env_file:
+      - path: .env
+        required: false

data/lib/generators/snfoil/all/all_generator.rb

@@ -15,7 +15,12 @@
 # limitations under the License.
 
 module SnFoil
-  class AllGenerator < Rails::Generators::Base
+  class AllGenerator < ::Rails::Generators::Base
+    def self.base_name
+      'snfoil'
+    end
+
+    namespace 'snfoil:all'
     source_root File.expand_path('templates', __dir__)
 
     argument :model, type: :string
@@ -24,6 +29,8 @@ module SnFoil
     class_option(:skip_model, desc: 'Skip Model Creation', type: :boolean, default: false)
 
     def add_model
+      return if options[:skip_model]
+
       rails_command "generate model #{call_args.join(' ')}", call_options
     end
 

data/lib/generators/snfoil/context/context_generator.rb

@@ -15,7 +15,12 @@
 # limitations under the License.
 
 module SnFoil
-  class ContextGenerator < Rails::Generators::Base
+  class ContextGenerator < ::Rails::Generators::Base
+    def self.base_name
+      'snfoil'
+    end
+
+    namespace 'snfoil:context'
     source_root File.expand_path('templates', __dir__)
 
     argument :model, type: :string
@@ -23,7 +28,7 @@ module SnFoil
     class_option :path, desc: 'Base path for file', type: :string, default: 'app/contexts'
 
     def add_app_file
-      file_name = if modules.length.zero?
+      file_name = if modules.empty?
                     name
                   else
                     "#{modules.join('/')}/#{name}"
@@ -47,7 +52,7 @@ module SnFoil
     end
 
     def class_modules
-      return if modules.length.zero?
+      return if modules.empty?
 
       @class_modules ||= "#{modules.map(&:camelize).join('::')}::"
     end

data/lib/generators/snfoil/controller/controller_generator.rb

@@ -15,7 +15,12 @@
 # limitations under the License.
 
 module SnFoil
-  class ControllerGenerator < Rails::Generators::Base
+  class ControllerGenerator < ::Rails::Generators::Base
+    def self.base_name
+      'snfoil'
+    end
+
+    namespace 'snfoil:controller'
     source_root File.expand_path('templates', __dir__)
 
     argument :model, type: :string
@@ -30,7 +35,7 @@ module SnFoil
     private
 
     def file_name
-      @file_name ||= if modules.length.zero?
+      @file_name ||= if modules.empty?
                        name
                      else
                        "#{modules.join('/')}/#{name}"
@@ -58,7 +63,7 @@ module SnFoil
     end
 
     def class_modules
-      return if modules.length.zero?
+      return if modules.empty?
 
       @class_modules ||= "#{modules.map(&:camelize).join('::')}::"
     end

data/lib/generators/snfoil/jsonapi_deserializer/jsonapi_deserializer_generator.rb

@@ -15,7 +15,12 @@
 # limitations under the License.
 
 module SnFoil
-  class JsonapiDeserializerGenerator < Rails::Generators::Base
+  class JsonapiDeserializerGenerator < ::Rails::Generators::Base
+    def self.base_name
+      'snfoil'
+    end
+
+    namespace 'snfoil:jsonapi_deserializer'
     source_root File.expand_path('templates', __dir__)
 
     argument :model, type: :string
@@ -23,7 +28,7 @@ module SnFoil
     class_option :path, desc: 'Base path for file', type: :string, default: 'app/jsonapi_deserializers'
 
     def add_app_file
-      file_name = if modules.length.zero?
+      file_name = if modules.empty?
                     name
                   else
                     "#{modules.join('/')}/#{name}"
@@ -47,7 +52,7 @@ module SnFoil
     end
 
     def class_modules
-      return if modules.length.zero?
+      return if modules.empty?
 
       @class_modules ||= "#{modules.map(&:camelize).join('::')}::"
     end

data/lib/generators/snfoil/jsonapi_serializer/jsonapi_serializer_generator.rb

@@ -15,7 +15,12 @@
 # limitations under the License.
 
 module SnFoil
-  class JsonapiSerializerGenerator < Rails::Generators::Base
+  class JsonapiSerializerGenerator < ::Rails::Generators::Base
+    def self.base_name
+      'snfoil'
+    end
+
+    namespace 'snfoil:jsonapi_serializer'
     source_root File.expand_path('templates', __dir__)
 
     argument :model, type: :string
@@ -23,7 +28,7 @@ module SnFoil
     class_option :path, desc: 'Base path for file', type: :string, default: 'app/jsonapi_serializers'
 
     def add_app_file
-      file_name = if modules.length.zero?
+      file_name = if modules.empty?
                     name
                   else
                     "#{modules.join('/')}/#{name}"
@@ -47,7 +52,7 @@ module SnFoil
     end
 
     def class_modules
-      return if modules.length.zero?
+      return if modules.empty?
 
       @class_modules ||= "#{modules.map(&:camelize).join('::')}::"
     end

data/lib/generators/snfoil/policy/policy_generator.rb

@@ -15,7 +15,12 @@
 # limitations under the License.
 
 module SnFoil
-  class PolicyGenerator < Rails::Generators::Base
+  class PolicyGenerator < ::Rails::Generators::Base
+    def self.base_name
+      'snfoil'
+    end
+
+    namespace 'snfoil:policy'
     source_root File.expand_path('templates', __dir__)
 
     argument :model, type: :string
@@ -23,7 +28,7 @@ module SnFoil
     class_option :path, desc: 'Base path for file', type: :string, default: 'app/policies'
 
     def add_app_file
-      file_name = if modules.length.zero?
+      file_name = if modules.empty?
                     name
                   else
                     "#{modules.join('/')}/#{name}"
@@ -47,7 +52,7 @@ module SnFoil
     end
 
     def class_modules
-      return if modules.length.zero?
+      return if modules.empty?
 
       @class_modules ||= "#{modules.map(&:camelize).join('::')}::"
     end

data/lib/generators/snfoil/searcher/searcher_generator.rb

@@ -15,7 +15,12 @@
 # limitations under the License.
 
 module SnFoil
-  class SearcherGenerator < Rails::Generators::Base
+  class SearcherGenerator < ::Rails::Generators::Base
+    def self.base_name
+      'snfoil'
+    end
+
+    namespace 'snfoil:searcher'
     source_root File.expand_path('templates', __dir__)
 
     argument :model, type: :string
@@ -23,7 +28,7 @@ module SnFoil
     class_option :path, desc: 'Base path for file', type: :string, default: 'app/searchers'
 
     def add_app_file
-      file_name = if modules.length.zero?
+      file_name = if modules.empty?
                     name
                   else
                     "#{modules.join('/')}/#{name}"
@@ -47,7 +52,7 @@ module SnFoil
     end
 
     def class_modules
-      return if modules.length.zero?
+      return if modules.empty?
 
       @class_modules ||= "#{modules.map(&:camelize).join('::')}::"
     end

data/lib/snfoil/rails/api/destroy.rb

@@ -42,7 +42,7 @@ module SnFoil
 
           def render_destroy(**options)
             if options[:object].errors.empty?
-              render json: {}, status: :no_content
+              render status: :no_content
             else
               render json: options[:object].errors, status: :unprocessable_entity
             end

data/lib/snfoil/rails/searcher.rb

@@ -48,7 +48,7 @@ module SnFoil
           @snfoil_order_by_direction = direction
         end
 
-        def distinct(bool = true) # rubocop:disable Style/OptionalBooleanParameter reason: class configuration looks better this way
+        def distinct(bool = true) # rubocop:disable Style/OptionalBooleanParameter --- reason: class configuration looks better this way
           @snfoil_is_distinct = bool
         end
 

data/lib/snfoil/rails/version.rb

@@ -16,6 +16,6 @@
 
 module SnFoil
   module Rails
-    VERSION = '1.1.0'
+    VERSION = '1.1.2'
   end
 end

data/lib/tasks/snfoil/rails_tasks.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :snfoil do
 #   # Task goes here

data/snfoil-rails.gemspec

@@ -6,13 +6,13 @@ Gem::Specification.new do |spec|
   spec.name          = 'snfoil-rails'
   spec.version       = SnFoil::Rails::VERSION
   spec.authors       = ['Matthew Howes', 'Danny Murphy', 'Cliff Campbell']
-  spec.email         = ['howeszy@gmail.com', 'dmurph24@gmail.com', 'cliffcampbell@hey.com']
+  spec.email         = ['matt.howes@limitedeffort.io', 'cliffcampbell@hey.com']
 
   spec.summary       = 'Snfoil Rails Helpers'
   spec.description   = 'Additional functionality gem for using SnFoil with Rails'
   spec.homepage      = 'https://github.com/limited-effort/snfoil-rails'
   spec.license       = 'Apache-2.0'
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
@@ -31,8 +31,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '>= 5.2.6'
   spec.add_dependency 'snfoil', '>= 1.1.0', '< 2.0'
   spec.add_dependency 'snfoil-controller', '>= 1.1.1', '< 2.0'
-
-  spec.add_development_dependency 'puma'
-  spec.add_development_dependency 'rails', '~> 6.0'
-  spec.add_development_dependency 'rake', '~> 13.0'
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: snfoil-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Matthew Howes
 - Danny Murphy
 - Cliff Campbell
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,52 +65,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
 description: Additional functionality gem for using SnFoil with Rails
 email:
-- howeszy@gmail.com
-- dmurph24@gmail.com
+- matt.howes@limitedeffort.io
 - cliffcampbell@hey.com
 executables: []
 extensions: []
@@ -119,9 +75,11 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
+- docker-compose.yaml
 - lib/generators/snfoil/all/USAGE
 - lib/generators/snfoil/all/all_generator.rb
 - lib/generators/snfoil/context/USAGE
@@ -169,7 +127,6 @@ metadata:
   source_code_uri: https://github.com/limited-effort/snfoil-rails
   changelog_uri: https://github.com/limited-effort/snfoil-rails/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -177,15 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Snfoil Rails Helpers
 test_files: []