machinist_redux 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6975277474c2f278dd63f6ebaf01e930e4e830b
-  data.tar.gz: 0f4f61f505cb8aa1dedc0abc7d55984d07fee225
+  metadata.gz: 738b5887ff27ed4cf136d70a7de741e421769988
+  data.tar.gz: 677037c04308f48228731d738d5b58a240f39e59
 SHA512:
-  metadata.gz: 6c1d8c9400d7ac81391d511c57dd655ac5d8f9c511e4a075c58178935c8360cd51af43a3610283cc742c93f27a0ab3a334685f0f9f0b00a43d464141d880dc66
-  data.tar.gz: 7efa8ffa828f5721186c24f1036d78b1523fa9a91a77d36ae763fad5995278c5516bbc3dedf0fe81561ddd27f03f8502bce7e4f0d27821c4f22691514351534b
+  metadata.gz: 95a4efdb5eb853f93e0c6a8a92f73c4642758a40be1eb3c4750986d0da72a4832c1b2a31636de1da31fb28858c8e99ffc7fec16b1b376bbd4f3dbf601dc43511
+  data.tar.gz: 616c90f941f74f33dbd10a7ff8db35bd26b003163188a41cdcc4b8a14320b11b444d59c705ca7222ecf6b5d06f991f00bc4532ec57f30498ab7b01fb2e9f664e

data/.rubocop_todo.yml

@@ -47,14 +47,6 @@ RSpec/IteratedExpectation:
 RSpec/MultipleExpectations:
   Max: 6
 
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Exclude:
-    - 'lib/machinist/active_record/blueprint.rb'
-    - 'lib/machinist/active_record/lathe.rb'
-
 # Offense count: 1
 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS

data/Gemfile

@@ -2,6 +2,8 @@ source 'http://rubygems.org'
 gemspec
 ruby RUBY_VERSION
 
+gem 'sqlite3'
+
 group :development do
   gem 'appraisal', require: false
   gem 'gem-release', require: false
@@ -22,11 +24,3 @@ group :test do
   gem 'rspec_junit_formatter', require: false
   gem 'simplecov', '~> 0.14', require: false
 end
-
-platforms :ruby do
-  gem 'sqlite3'
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end

data/gemfiles/rails_4.2.gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 ruby RUBY_VERSION
 
 gem "activerecord", "~> 4.2.8", group: :test, require: false
+gem 'sqlite3'
 
 group :development do
   gem 'appraisal', require: false
@@ -27,12 +28,4 @@ group :test do
   gem "simplecov", "~> 0.14", require: false
 end
 
-platforms :ruby do
-  gem "sqlite3"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
 gemspec path: "../"

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    machinist_redux (3.0.0)
+    machinist_redux (3.0.2)
 
 GEM
   remote: http://rubygems.org/
@@ -166,11 +166,11 @@ GEM
     ruby_dep (1.5.0)
     ruby_parser (3.9.0)
       sexp_processor (~> 4.1)
-    rubycritic (3.2.1)
+    rubycritic (3.2.2)
       flay (~> 2.8)
       flog (~> 4.4)
       launchy (= 2.4.3)
-      parser (= 2.4.0)
+      parser (~> 2.4.0)
       rainbow (~> 2.1)
       reek (~> 4.4)
       ruby_parser (~> 3.8)
@@ -184,7 +184,7 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
     sqlite3 (1.3.13)
     term-ansicolor (1.6.0)
@@ -206,7 +206,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4.2.8)
-  activerecord-jdbcsqlite3-adapter
   appraisal
   codeclimate-test-reporter
   coveralls

data/gemfiles/rails_5.0.gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 ruby RUBY_VERSION
 
 gem "activerecord", "~> 5.0.3", group: :test, require: false
+gem 'sqlite3'
 
 group :development do
   gem 'appraisal', require: false
@@ -27,12 +28,4 @@ group :test do
   gem "simplecov", "~> 0.14", require: false
 end
 
-platforms :ruby do
-  gem "sqlite3"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
 gemspec path: "../"

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    machinist_redux (3.0.0)
+    machinist_redux (3.0.2)
 
 GEM
   remote: http://rubygems.org/
@@ -166,11 +166,11 @@ GEM
     ruby_dep (1.5.0)
     ruby_parser (3.9.0)
       sexp_processor (~> 4.1)
-    rubycritic (3.2.1)
+    rubycritic (3.2.2)
       flay (~> 2.8)
       flog (~> 4.4)
       launchy (= 2.4.3)
-      parser (= 2.4.0)
+      parser (~> 2.4.0)
       rainbow (~> 2.1)
       reek (~> 4.4)
       ruby_parser (~> 3.8)
@@ -184,7 +184,7 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
     sqlite3 (1.3.13)
     term-ansicolor (1.6.0)
@@ -206,7 +206,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 5.0.3)
-  activerecord-jdbcsqlite3-adapter
   appraisal
   codeclimate-test-reporter
   coveralls

data/gemfiles/rails_5.1.gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 ruby RUBY_VERSION
 
 gem "activerecord", "~> 5.1.1", group: :test, require: false
+gem 'sqlite3'
 
 group :development do
   gem 'appraisal', require: false
@@ -27,8 +28,4 @@ group :test do
   gem "simplecov", "~> 0.14", require: false
 end
 
-platforms :ruby do
-  gem "sqlite3"
-end
-
 gemspec path: "../"

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    machinist_redux (3.0.0)
+    machinist_redux (3.0.2)
 
 GEM
   remote: http://rubygems.org/
@@ -166,11 +166,11 @@ GEM
     ruby_dep (1.5.0)
     ruby_parser (3.9.0)
       sexp_processor (~> 4.1)
-    rubycritic (3.2.1)
+    rubycritic (3.2.2)
       flay (~> 2.8)
       flog (~> 4.4)
       launchy (= 2.4.3)
-      parser (= 2.4.0)
+      parser (~> 2.4.0)
       rainbow (~> 2.1)
       reek (~> 4.4)
       ruby_parser (~> 3.8)
@@ -184,7 +184,7 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
     sqlite3 (1.3.13)
     term-ansicolor (1.6.0)

data/lib/machinist/active_record/blueprint.rb

@@ -1,14 +1,19 @@
-module Machinist::ActiveRecord
-  class Blueprint < Machinist::Blueprint
-    # Make and save an object.
-    def make!(attributes = {})
-      object = make(attributes)
-      object.save!
-      object.reload
-    end
+module Machinist
+  module ActiveRecord
+    class Blueprint < Machinist::Blueprint
+      # Make and save an object.
+      def make!(attributes = {})
+        object = make(attributes)
+        object.save!
+        object.reload
+      rescue ::ActiveRecord::RecordInvalid => exception
+        message = "#{exception.class.name}: \"#{exception.message}\" saving #{exception.record.class.name}"
+        raise Machinist::BlueprintCantSaveError.new(self, message)
+      end
 
-    def lathe_class #:nodoc:
-      Machinist::ActiveRecord::Lathe
+      def lathe_class #:nodoc:
+        Machinist::ActiveRecord::Lathe
+      end
     end
   end
 end

data/lib/machinist/active_record/lathe.rb

@@ -1,20 +1,22 @@
-module Machinist::ActiveRecord
-  class Lathe < Machinist::Lathe
-    def make_one_value(attribute, args) #:nodoc:
-      if block_given?
-        raise_argument_error(attribute) unless args.empty?
-        yield
-      else
-        make_association(attribute, args)
+module Machinist
+  module ActiveRecord
+    class Lathe < Machinist::Lathe
+      def make_one_value(attribute, args) #:nodoc:
+        if block_given?
+          raise_argument_error(attribute) unless args.empty?
+          yield
+        else
+          make_association(attribute, args)
+        end
       end
-    end
 
-    def make_association(attribute, args) #:nodoc:
-      association = @klass.reflect_on_association(attribute)
-      if association
-        association.klass.make(*args)
-      else
-        raise_argument_error(attribute)
+      def make_association(attribute, args) #:nodoc:
+        association = @klass.reflect_on_association(attribute)
+        if association
+          association.klass.make(*args)
+        else
+          raise_argument_error(attribute)
+        end
       end
     end
   end

data/lib/machinist/exceptions.rb

@@ -4,12 +4,13 @@ module Machinist
   class BlueprintCantSaveError < RuntimeError
     attr_reader :blueprint
 
-    def initialize(blueprint)
+    def initialize(blueprint, message = nil)
       @blueprint = blueprint
+      @message = message
     end
 
     def message
-      "make! is not supported by blueprints for class #{@blueprint.klass.name}"
+      @message ||= "make! is not supported by blueprints for class #{@blueprint.klass.name}"
     end
   end
 

data/lib/machinist/version.rb

@@ -1,3 +1,3 @@
 module Machinist
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machinist_redux
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Pete Yandell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies: []
 description: Machinist makes it easy to create objects for use in tests. It generates
   data for the attributes you don't care about, and constructs any necessary associated