regressor 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b17c0573da2b281d3b36644b43252f74b4aae2e
-  data.tar.gz: 65c31a48fd1018e171dd8d18a5cd1801be6724df
+  metadata.gz: bfdcab4e5984a23cebaa698fe65888d2e9133cac
+  data.tar.gz: 11333c03404c2d9744abc14eb11f317d3d0dec96
 SHA512:
-  metadata.gz: 2eb3bf2e9da5dbe0975ed317db74a7d8fff91ee8ab38b740e5c7abf566b35ba8dba5f45d661cf38739e3e2ea53e8cb16d06c344cb0988172a61f8f10b1969229
-  data.tar.gz: 936c026784cc3a57687cf97b2b5b233c31a66854f60f746eabf6fd8268efc9f3e741016a50ee360fd42a1c66e59b4a8049154af2e5c43b37e249a55638297c74
+  metadata.gz: 4acccb1b860384c10200da8c5c38da8f21700a6d7245866971de24d40be9aaf27c9ebfcc8d0fd863d51ad5d980e0d24a490c6cbd5b337d1b876e4da4ed012593
+  data.tar.gz: ed378bf13882af17043aec5f78ee22fa314802a9629a082d19b3fb7a1f7f00f8a0b60231c09c7768f30b2c80972f49029b234025f21928dfb96434df290ddf4f

data/lib/generators/regressor/model_generator.rb

@@ -1,7 +1,7 @@
 require 'model/active_record_model'
 
 module Regressor
-  class ModelGenerator < Rails::Generators::Base
+  class ModelGenerator < ::Rails::Generators::Base
     source_root(File.expand_path(File.dirname(__FILE__)))
 
     def create_regression_files

data/lib/model/expression.rb

@@ -0,0 +1,25 @@
+module Regressor
+  module Model
+    class Expression
+
+      attr_accessor :subject, :expectation, :matcher, :matcher_expectation, :modification
+
+      def initialize(subject, expectation, matcher, matcher_expectation, modification = nil)
+        self.subject = subject
+        self.expectation = expectation
+        self.matcher = matcher
+        self.matcher_expectation = matcher_expectation
+        self.modification = modification
+      end
+
+      def to_s
+        if self.modification.nil?
+          "it { #{self.subject}.#{self.expectation} #{self.matcher}(:#{self.matcher_expectation}) }"
+        else
+          "it { #{self.subject}.#{self.expectation} #{self.matcher}(:#{self.matcher_expectation}).#{self.modification} }"
+        end
+      end
+
+    end
+  end
+end

data/lib/model/mongoid/database/field.rb

@@ -3,10 +3,19 @@ module Regressor
     module Mongoid
       module Database
         module Field
+
+          def fields_as_string
+            fields.join("\n  ")
+          end
+
           def fields
             @model.fields.keys.map do |field|
-              "it { is_expected.to have_field(:#{field}).of_type(#{field_type(@model, field)}) }"
-            end.join("\n  ")
+              ::Regressor::Model::Expression.new(:is_expected,
+                                                 :to,
+                                                 :have_field,
+                                                 field,
+                                                 "of_type(#{field_type(@model, field)})").to_s
+            end
           end
 
           private

data/lib/model/mongoid/relation/belongs_to.rb

@@ -3,11 +3,19 @@ module Regressor
     module Mongoid
       module Relation
         module BelongsTo
+
+          def belongs_to_relations_as_string
+            belongs_to_relations.join("\n  ")
+          end
+
           def belongs_to_relations
             @model.reflect_on_all_associations(:belongs_to).map(&:name).map do |relation|
-              "it { is_expected.to belong_to :#{relation} }"
-            end.join("\n  ")
+              ::Regressor::Model::Expression.new(:is_expected,
+                                                 :to,
+                                                 :belong_to, relation).to_s
+            end
           end
+
         end
       end
     end

data/lib/model/mongoid/relation/embedded.rb

@@ -3,11 +3,18 @@ module Regressor
     module Mongoid
       module Relation
         module Embedded
+
+          def embedded_relations_as_string
+            embedded_relations.join("\n  ")
+          end
+
           def embedded_relations
             @model.embedded_relations.keys.map do |key|
               macro = @model.embedded_relations[key].macro
-              "it { is_expected.to #{embedded_type[macro]} :#{key} }"
-            end.join("\n  ")
+              ::Regressor::Model::Expression.new(:is_expected,
+                                                 :to,
+                                                 embedded_type[macro], key).to_s
+            end
           end
 
           private

data/lib/model/mongoid/relation/has_many.rb

@@ -3,11 +3,19 @@ module Regressor
     module Mongoid
       module Relation
         module HasMany
+
+          def has_many_relations_as_string
+            has_many_relations.join("\n  ")
+          end
+
           def has_many_relations
             @model.reflect_on_all_associations(:has_many).map(&:name).map do |relation|
-              "it { is_expected.to have_many :#{relation} }"
-            end.join("\n  ")
+              ::Regressor::Model::Expression.new(:is_expected,
+                                                 :to,
+                                                 :have_many, relation).to_s
+            end
           end
+
         end
       end
     end

data/lib/model/mongoid/relation/has_one.rb

@@ -3,11 +3,19 @@ module Regressor
     module Mongoid
       module Relation
         module HasOne
+
+          def has_one_relations_as_string
+            has_one_relations.join("\n  ")
+          end
+
           def has_one_relations
             @model.reflect_on_all_associations(:has_one).map(&:name).map do |relation|
-              "it { is_expected.to have_one :#{relation} }"
-            end.join("\n  ")
+              ::Regressor::Model::Expression.new(:is_expected,
+                                                 :to,
+                                                 :have_one, relation).to_s
+            end
           end
+
         end
       end
     end

data/lib/model/mongoid_model.rb

@@ -1,3 +1,4 @@
+require 'model/expression'
 require 'model/mongoid/database/field'
 require 'model/mongoid/relation/has_many'
 require 'model/mongoid/relation/has_one'

data/lib/regressor/version.rb

@@ -1,3 +1,3 @@
 module Regressor
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

data/lib/templates/model/mongoid/model_template.erb

@@ -6,11 +6,11 @@ RSpec.describe <%= @model.model %>, regressor: true do
   <%= @model.version_include %>
 
   # === Relations ===
-  <%= @model.belongs_to_relations %>
-  <%= @model.has_one_relations %>
-  <%= @model.has_many_relations %>
-  <%= @model.embedded_relations %>
+  <%= @model.belongs_to_relations_as_string %>
+  <%= @model.has_one_relations_as_string %>
+  <%= @model.has_many_relations_as_string %>
+  <%= @model.embedded_relations_as_string %>
 
   # === Database (Fields) ===
-  <%= @model.fields %>
+  <%= @model.fields_as_string %>
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regressor
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Erwin Schens
@@ -92,6 +92,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: Regressor generates regression specs based on ActiveRecord models. Currently
   relations, validations, attributes, and database indexes are supported.
 email:
@@ -124,6 +152,7 @@ files:
 - lib/model/active_record/validation/numericality.rb
 - lib/model/active_record/validation/presence.rb
 - lib/model/active_record_model.rb
+- lib/model/expression.rb
 - lib/model/mongoid/database/field.rb
 - lib/model/mongoid/document/timestamp.rb
 - lib/model/mongoid/document/version.rb