active_record_model_and_rspec_enhanced_templates 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7634675e1eaa90f8ef3b85f64b6d2f7fc057b6d3
-  data.tar.gz: 79f604659c251390f7e55addd9f5edc72c199747
+  metadata.gz: 41d8412ad83885b1b8946404d042d23ddc578b57
+  data.tar.gz: 00f71cb6c28db4aa4ad158aa1240be2c55626664
 SHA512:
-  metadata.gz: 7f129fdfb6df4eb1d1df9a80fa99f2ad709fb0a4e73c79e69a372f08625a2ceb2fcac41ef23378d2b1c74afce677110b2fa317199287048242306196af43fd77
-  data.tar.gz: 04cbd1666aaff72afaeb4caf3df1fa4bb52a5e8e0f56694a5548fc1dd2c3b02583f01647a0fd91ef9d1592ff3bec32abef2bc848f42dbdc159074f40e8f7ad6b
+  metadata.gz: ab687d1c0d118c565075a78ade5905f6eff69d1a210491954c0659dd81175511bd611a2272bf6fbea16e1c80fcb104c530f3a46146f631148416cdd1e4b90e5c
+  data.tar.gz: 54468cd71ee710001333606026c153d088744c58eb6f69ba499f357b08431d85cddc376122a533088cdd1ee0c18404862acea10141a9ca1d5d2e3898ab9711ea

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/active_record_model_and_rspec_enhanced_templates.gemspec

@@ -2,16 +2,16 @@
 # 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.0.3 ruby lib
+# stub: active_record_model_and_rspec_enhanced_templates 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "active_record_model_and_rspec_enhanced_templates"
-  s.version = "1.0.3"
+  s.version = "1.0.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 = "2014-10-06"
+  s.date = "2014-10-16"
   s.description = "ActiveRecord generator and RSpec templates that add some basic functionality to the model and its spec"
   s.email = "dima@koulikoff.ru"
   s.extra_rdoc_files = [

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

@@ -7,10 +7,10 @@ class <%= class_name %> < <%= parent_class_name.classify %>
 <% if attributes.any?(&:password_digest?) -%>
   has_secure_password
 <% end -%>
-<% attribute = attributes.detect{|a| a.name == 'position'} || attributes.detect{|a| a.name == 'name'} || attributes.detect{|a| a.name == 'title'} || attributes.first -%>
-<% if attribute -%>
+<% if attribute = attributes.detect{|a| a.name == 'position'} || attributes.detect{|a| a.name == 'name'} || attributes.detect{|a| a.name == 'title'} || attributes.first -%>
+
   scope :ordered, -> { order(:<%=attribute.name %>) }
-<% end -%>
 
+<% end -%>
 end
 <% end -%>

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

@@ -20,6 +20,7 @@ describe <%= class_name %>, type: :model do
 
   it { should be_valid }
 
+<% if attribute = attributes.detect{|a| a.name == 'position'} || attributes.detect{|a| a.name == 'name'} || attributes.detect{|a| a.name == 'title'} || attributes.first -%>
   describe :class do
     it 'should respond to :ordered' do
 <% if options[:fixture_replacement] == :factory_girl -%>
@@ -29,10 +30,10 @@ describe <%= class_name %>, type: :model do
       <%= class_name %>.create @valid_attrs
       <%= class_name %>.create @valid_attrs
 <% end -%>
-<% attribute = attributes.detect{|a| a.name == 'position'} || attributes.detect{|a| a.name == 'name'} || attributes.detect{|a| a.name == 'title'} || attributes.first -%>
       expect(<%= class_name %>.ordered).to eq <%= class_name %>.order(:<%=attribute.name %>)
     end
   end
 
+<% end -%>
 end
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_model_and_rspec_enhanced_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec