active_record_model_and_rspec_enhanced_templates 1.1.1 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa655377d29f8e5d90b4fe6dca60153c9897076f
-  data.tar.gz: cfcdea086ae54b76b973c663bffeb4771b0cb978
+SHA256:
+  metadata.gz: 9f34e84fdc2fa0622dbbccea20cd6ad720b9b583a32e88e0cdc7c774abe73d8d
+  data.tar.gz: 8cffbae2ad3719d3dacf1bcc94fff6dc2c6ff12fa809a8c415ae17cf55a99ff3
 SHA512:
-  metadata.gz: 33900573bb80ffc10bab7cbba5bdaa62017f32b8271ba484c7ad6aec3b534118d94be814e8d31dfbd79eff9f96eb1daf3444f1ecd18ff9db5d29ee8cc2e2e444
-  data.tar.gz: c87d196a7cf49c31e5396796fa48f16bdc9d1afcd427ebd17b5b18e4386d53a7d87041d0fcc7dcee8d8f42a1c1c38b2fc71ff4b03c95d490a4b48f860288e95c
+  metadata.gz: 5bcd1264691ab7a46f2e43b70a2e7201cb8339e240747151392b8d29f111b82fe6993d2dc8c4f1d7cf29495e504dbe943dc6eeed7a7d57431e29bdeb4ea1adb8
+  data.tar.gz: e30701ddf869851b82308398fc6428d42eea60033fa0ca89866fbe6c58354c69db85732389a476653355e5fc85304e6b82c758bcc01cc5143612e30c119fa4f3

data/Gemfile

@@ -6,6 +6,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem 'rake', '~> 11.0'
   gem "rspec", "~> 3.1"
   gem "rdoc", "~> 4.1"
   gem "bundler", "~> 1.6"

data/Rakefile

@@ -21,6 +21,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{ActiveRecord generator and RSpec templates that add some basic functionality to the model and its spec}
   gem.email = "dima@koulikoff.ru"
   gem.authors = ["Dmitri Koulikoff"]
+  gem.version = File.exist?('VERSION') ? File.read('VERSION') : ""
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.4

data/active_record_model_and_rspec_enhanced_templates.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: active_record_model_and_rspec_enhanced_templates 1.1.1 ruby lib
+# stub: active_record_model_and_rspec_enhanced_templates 1.4 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "active_record_model_and_rspec_enhanced_templates"
-  s.version = "1.1.1"
+  s.name = "active_record_model_and_rspec_enhanced_templates".freeze
+  s.version = "1.4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Dmitri Koulikoff"]
-  s.date = "2016-10-04"
-  s.description = "ActiveRecord generator and RSpec templates that add some basic functionality to the model and its spec"
-  s.email = "dima@koulikoff.ru"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Dmitri Koulikoff".freeze]
+  s.date = "2020-06-08"
+  s.description = "ActiveRecord generator and RSpec templates that add some basic functionality to the model and its spec".freeze
+  s.email = "dima@koulikoff.ru".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -33,33 +33,29 @@ Gem::Specification.new do |s|
     "spec/active_record_model_and_rspec_enhanced_templates_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/dima4p/active_record_model_and_rspec_enhanced_templates"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "ActiveRecord generator and RSpec templates that add some basic functionality"
+  s.homepage = "http://github.com/dima4p/active_record_model_and_rspec_enhanced_templates".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.1.2".freeze
+  s.summary = "ActiveRecord generator and RSpec templates that add some basic functionality".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 3.1"])
-      s.add_development_dependency(%q<rdoc>, ["~> 4.1"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.6"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.0"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 3.1"])
-      s.add_dependency(%q<rdoc>, ["~> 4.1"])
-      s.add_dependency(%q<bundler>, ["~> 1.6"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_dependency(%q<simplecov>, ["~> 0.0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<rake>.freeze, ["~> 11.0"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.1"])
+    s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.1"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.6"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.0"])
+    s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.0"])
   else
-    s.add_dependency(%q<rspec>, ["~> 3.1"])
-    s.add_dependency(%q<rdoc>, ["~> 4.1"])
-    s.add_dependency(%q<bundler>, ["~> 1.6"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0"])
-    s.add_dependency(%q<simplecov>, ["~> 0.0"])
+    s.add_dependency(%q<rake>.freeze, ["~> 11.0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.1"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 4.1"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.6"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.0"])
+    s.add_dependency(%q<simplecov>.freeze, ["~> 0.0"])
   end
 end
 

data/lib/templates/active_record/model/model.rb

@@ -5,16 +5,16 @@ class <%= class_name %> < <%= parent_class_name.classify %>
 <% if attributes.any?(&:reference?) -%>
 
 <% attributes.select(&:reference?).each do |attribute| -%>
-  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %>
+  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.respond_to?(:polymorphic?) and attribute.polymorphic? %><%= ', required: true' if  attribute.respond_to?(:required?) and attribute.required? %>
 <% end -%>
 <% end -%>
-<% if attributes.any?(&:token?) -%>
+<% if attributes.first.respond_to?(:token) and attributes.any?(&:token?) -%>
 
 <% attributes.select(&:token?).each do |attribute| -%>
   has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
 <% end -%>
 <% end -%>
-<% if attributes.any?(&:password_digest?) -%>
+<% if (attributes.any?(&:password_digest?) rescue false) -%>
 
   has_secure_password
 <% end -%>

data/lib/templates/rspec/model/model_spec.rb

@@ -7,8 +7,8 @@ require 'spec_helper'
 <% module_namespacing do -%>
 describe <%= class_name %>, type: :model do
 
-<% if options[:fixture_replacement] == :factory_girl -%>
-  subject { create :<%= singular_name %> }
+<% if options[:fixture_replacement] == :factory_bot -%>
+  subject(:<%= singular_name %>) { create :<%= singular_name %> }
 <% else -%>
   before :each do
     @valid_attrs = {
@@ -19,7 +19,7 @@ describe <%= class_name %>, type: :model do
 <% end -%>
 
   describe 'validations' do
-    it { should be_valid }
+    it { is_expected.to be_valid }
   end   # validations
 
 <% if attribute = attributes.detect{|a| a.name == 'position'} || attributes.detect{|a| a.name == 'name'} || attributes.detect{|a| a.name == 'title'} || attributes.first -%>
@@ -27,13 +27,6 @@ describe <%= class_name %>, type: :model do
     describe 'scopes' do
       describe '.ordered' do
         it 'orders the records of <%= class_name %> by :<%=attribute.name %>' do
-<% if options[:fixture_replacement] == :factory_girl -%>
-          create :<%= singular_name %>
-          create :<%= singular_name %>
-<% else -%>
-          <%= class_name %>.create @valid_attrs
-          <%= class_name %>.create @valid_attrs
-<% end -%>
           expect(<%= class_name %>.ordered).to eq <%= class_name %>.order(:<%=attribute.name %>)
         end
       end   # .ordered

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_record_model_and_rspec_enhanced_templates
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: '1.4'
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -121,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord generator and RSpec templates that add some basic functionality