hanami 1.1.0.beta3 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 453bcdf8124ac473f5d4245104b5a47d2d4d9090
-  data.tar.gz: 06ec8e1b359f3b85f11153a9ca6f9ea72e8934b9
+  metadata.gz: 68c2bd230a6f3488602c161d3a59708efe81e221
+  data.tar.gz: 56b19feffa7910a757ec4a2503e3d18be88408d6
 SHA512:
-  metadata.gz: '009ebd38540c0ce0ebdd40d86ae490ecd875b1845fa9b0dabe9b1b49c4c5f8cb3bfb243c0d1f3170ee4b2fd1ce42b4456038610eb5f44c8ef64f0bf6252ce917'
-  data.tar.gz: 52b785fed5b9064d5282c3ed3eee797091b671b59c6470082b9bfdf850c009ea438beb673a27ad718cc823aa7b9e75c2865b27ff5296f24449732f5630fbdd04
+  metadata.gz: be888d3a7c3c3a1ee2509a77ec08c7e9e9a89602d5b03c1004545afa60e37d48db83ef98a30fded1e8a3523a7a9df63f05afbf4659022096551c54af06bda48a
+  data.tar.gz: cdf6dfb4d86ed2de9f42ab2b23fcc26382748375269ecb28be9194f422d21f930e220843c242090ef7047c82bca736167014eeb1ae0283c3de6a4e1e8911467c

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Hanami
 The web, with simplicity.
 
+## v1.1.0.rc1 - 2017-10-16
+### Added
+- [Yuji Ueki] Generate RSpec tests with `:type` metadata (eg `type: :action`)
+- [Kirill] Add `--relation` option for `hanami generate model` (eg `bundle exec hanami generate model user --relation=accounts`)
+
 ## v1.1.0.beta3 - 2017-10-04
 ### Fixed
 - [Luca Guidi] Don't require `:plugins` group when running `hanami new`

data/hanami.gemspec

@@ -21,15 +21,15 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.add_dependency 'hanami-utils',       '1.1.0.beta3'
-  spec.add_dependency 'hanami-validations', '1.1.0.beta3'
-  spec.add_dependency 'hanami-router',      '1.1.0.beta3'
-  spec.add_dependency 'hanami-controller',  '1.1.0.beta3'
-  spec.add_dependency 'hanami-view',        '1.1.0.beta3'
-  spec.add_dependency 'hanami-helpers',     '1.1.0.beta3'
-  spec.add_dependency 'hanami-mailer',      '1.1.0.beta3'
-  spec.add_dependency 'hanami-assets',      '1.1.0.beta3'
-  spec.add_dependency 'hanami-cli',         '0.1.0.beta3'
+  spec.add_dependency 'hanami-utils',       '1.1.0.rc1'
+  spec.add_dependency 'hanami-validations', '1.1.0.rc1'
+  spec.add_dependency 'hanami-router',      '1.1.0.rc1'
+  spec.add_dependency 'hanami-controller',  '1.1.0.rc1'
+  spec.add_dependency 'hanami-view',        '1.1.0.rc1'
+  spec.add_dependency 'hanami-helpers',     '1.1.0.rc1'
+  spec.add_dependency 'hanami-mailer',      '1.1.0.rc1'
+  spec.add_dependency 'hanami-assets',      '1.1.0.rc1'
+  spec.add_dependency 'hanami-cli',         '0.1.0.rc1'
   spec.add_dependency 'concurrent-ruby',    '~> 1.0'
   spec.add_dependency 'bundler'
 

data/lib/hanami/cli/commands/db/create.rb

@@ -2,14 +2,14 @@ module Hanami
   class CLI
     module Commands
       module Db
-        # @since x.x.x
+        # @since 1.1.0
         # @api private
         class Create < Command
           requires "model.configuration"
 
           desc "Create the database (only for development/test)"
 
-          # @since x.x.x
+          # @since 1.1.0
           # @api private
           def call(**options)
             context = Context.new(options: options)
@@ -19,7 +19,7 @@ module Hanami
 
           private
 
-          # @since x.x.x
+          # @since 1.1.0
           # @api private
           def create_database(*)
             require "hanami/model/migrator"

data/lib/hanami/cli/commands/db/drop.rb

@@ -1,7 +1,7 @@
 module Hanami
   class CLI
     module Commands
-      # @since x.x.x
+      # @since 1.1.0
       # @api private
       module Db
         class Drop < Command
@@ -9,7 +9,7 @@ module Hanami
 
           desc "Drop the database (only for development/test)"
 
-          # @since x.x.x
+          # @since 1.1.0
           # @api private
           def call(**options)
             context = Context.new(options: options)
@@ -19,7 +19,7 @@ module Hanami
 
           private
 
-          # @since x.x.x
+          # @since 1.1.0
           # @api private
           def drop_database(*)
             require "hanami/model/migrator"

data/lib/hanami/cli/commands/db/rollback.rb

@@ -2,7 +2,7 @@ module Hanami
   class CLI
     module Commands
       module Db
-        # @since x.x.x
+        # @since 1.1.0
         # @api private
         class Rollback < Command
           requires "model.sql"
@@ -16,7 +16,7 @@ module Hanami
             "2 # Rollbacks last two migrations"
           ]
 
-          # @since x.x.x
+          # @since 1.1.0
           # @api private
           def call(steps:, **)
             context = Context.new(steps: steps.to_int)
@@ -26,7 +26,7 @@ module Hanami
 
           private
 
-          # @since x.x.x
+          # @since 1.1.0
           # @api private
           def rollback_database(context)
             require "hanami/model/migrator"

data/lib/hanami/cli/commands/generate/action/action_spec.rspec.erb

@@ -1,4 +1,4 @@
-RSpec.describe <%= app.classify %>::Controllers::<%= classified_controller_name %>::<%= action.classify %> do
+RSpec.describe <%= app.classify %>::Controllers::<%= classified_controller_name %>::<%= action.classify %>, type: :action do
   let(:action) { described_class.new }
   let(:params) { Hash[] }
 

data/lib/hanami/cli/commands/generate/action/view_spec.rspec.erb

@@ -1,4 +1,4 @@
-RSpec.describe <%= app.classify %>::Views::<%= classified_controller_name %>::<%= action.classify %> do
+RSpec.describe <%= app.classify %>::Views::<%= classified_controller_name %>::<%= action.classify %>, type: :view do
   let(:exposures) { Hash[foo: 'bar'] }
   let(:template)  { Hanami::View::Template.new('<%= template %>') }
   let(:view)      { described_class.new(template, exposures) }

data/lib/hanami/cli/commands/generate/app/layout_spec.rspec.erb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe <%= app.classify %>::Views::ApplicationLayout do
+RSpec.describe <%= app.classify %>::Views::ApplicationLayout, type: :view do
   let(:layout)   { <%= app.classify %>::Views::ApplicationLayout.new(template, {}) }
   let(:rendered) { layout.render }
   let(:template) { Hanami::View::Template.new('apps/<%= app %>/templates/application.html.<%= template %>') }

data/lib/hanami/cli/commands/generate/mailer/mailer_spec.rspec.erb

@@ -1,4 +1,4 @@
-RSpec.describe Mailers::<%= mailer.classify %> do
+RSpec.describe Mailers::<%= mailer.classify %>, type: :mailer do
   it 'delivers email' do
     mail = Mailers::<%= mailer.classify %>.deliver
   end

data/lib/hanami/cli/commands/generate/model.rb

@@ -11,19 +11,23 @@ module Hanami
 
           argument :model, required: true, desc: "Model name (eg. `user`)"
           option :skip_migration, type: :boolean, default: false, desc: "Skip migration"
+          option :relation, type: :string, desc: "Name of the database relation, default: pluralized model name"
 
           example [
-            "user                  # Generate `User` entity, `UserRepository` repository, and the migration",
-            "user --skip-migration # Generate `User` entity and `UserRepository` repository"
+            "user                     # Generate `User` entity, `UserRepository` repository, and the migration",
+            "user --skip-migration    # Generate `User` entity and `UserRepository` repository",
+            "user --relation=accounts # Generate `User` entity, `UserRepository` and migration to create `accounts` table"
           ]
 
           # @since 1.1.0
           # @api private
           def call(model:, **options)
             model     = Utils::String.underscore(model)
-            relation  = Utils::String.pluralize(model)
+            relation  = relation_name(options, model)
             migration = "create_#{relation}"
-            context   = Context.new(model: model, relation: relation, migration: migration, test: options.fetch(:test), options: options)
+            context   = Context.new(model: model, relation: relation, migration: migration, test: options.fetch(:test), override_relation_name: override_relation_name?(options), options: options)
+
+            assert_valid_relation!(context)
 
             generate_entity(context)
             generate_repository(context)
@@ -34,6 +38,13 @@ module Hanami
 
           private
 
+          def assert_valid_relation!(context)
+            if Utils::Blank.blank?(context.relation)
+              warn "`#{context.relation}' is not a valid relation name"
+              exit(1)
+            end
+          end
+
           # @since 1.1.0
           # @api private
           def generate_entity(context)
@@ -91,6 +102,22 @@ module Hanami
           def skip_migration?(context)
             context.options.fetch(:skip_migration, false)
           end
+
+          # @since 1.1.0
+          # @api private
+          def relation_name(options, model)
+            if override_relation_name?(options)
+              Utils::String.underscore(options[:relation])
+            else
+              Utils::String.pluralize(model)
+            end
+          end
+
+          # @since 1.1.0
+          # @api private
+          def override_relation_name?(options)
+            !options.fetch(:relation, nil).nil?
+          end
         end
       end
     end

data/lib/hanami/cli/commands/generate/model/entity_spec.rspec.erb

@@ -1,3 +1,3 @@
-RSpec.describe <%= model.classify %> do
+RSpec.describe <%= model.classify %>, type: :entity do
   # place your tests here
 end

data/lib/hanami/cli/commands/generate/model/repository.erb

@@ -1,2 +1,5 @@
 class <%= model.classify %>Repository < Hanami::Repository
+<%- if override_relation_name -%>
+  self.relation = :<%= relation %>
+<%- end -%>
 end

data/lib/hanami/cli/commands/generate/model/repository_spec.rspec.erb

@@ -1,3 +1,3 @@
-RSpec.describe <%= model.classify %>Repository do
+RSpec.describe <%= model.classify %>Repository, type: :repository do
   # place your tests here
 end

data/lib/hanami/cli/commands/new.rb

@@ -299,7 +299,7 @@ module Hanami
             application_name: options.fetch(:application_name),
             application_base_url: options.fetch(:application_base_url),
             hanami_head: options.fetch(:hanami_head),
-            hanami_model_version: '1.1.0.beta3',
+            hanami_model_version: '1.1.0.rc1',
             code_reloading: code_reloading?,
             hanami_version: hanami_version,
             project_module: Utils::String.classify(project),

data/lib/hanami/common_logger.rb

@@ -36,11 +36,11 @@ module Hanami
     # @api private
     RACK_ERRORS          = 'rack.errors'.freeze
 
-    # @since x.x.x
+    # @since 1.1.0
     # @api private
     QUERY_HASH           = 'rack.request.query_hash'.freeze
 
-    # @since x.x.x
+    # @since 1.1.0
     # @api private
     FORM_HASH            = 'rack.request.form_hash'.freeze
 

data/lib/hanami/config/load_paths.rb

@@ -8,12 +8,22 @@ module Hanami
     # @since 0.1.0
     # @api private
     class LoadPaths < Utils::LoadPaths
+      # Overrides Utils::LoadPath initialize method
+      #
+      # @see Hanami::Utils::LoadPaths#initialize
+      #
+      # @since 0.1.0
       # @api private
       def initialize(root)
         super()
         @root = root
       end
 
+      # Requires relative @pats [Utils::Kernel.Array] variable via each method
+      #
+      # @see Hanami::Utils::LoadPaths#each
+      #
+      # @since 0.1.0
       # @api private
       def load!
         each do |path|
@@ -23,6 +33,10 @@ module Hanami
 
       protected
 
+      # Overrides Utils::LoadPath realpath method
+      #
+      # @see Hanami::Utils::LoadPaths#realpath
+      #
       # @api private
       def realpath(path)
         @root.join(path).realpath

data/lib/hanami/version.rb

@@ -6,7 +6,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '1.1.0.beta3'.freeze
+    VERSION = '1.1.0.rc1'.freeze
 
     # @since 0.9.0
     # @api private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta3
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -16,126 +16,126 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-router
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-controller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-view
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0.beta3
+        version: 0.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0.beta3
+        version: 0.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement