praxis-mapper 4.4 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 537418afacaff7e279f5e83fe0a53b36414fe763
-  data.tar.gz: 443de06327dd6afc1799984487680bbaff421442
+SHA256:
+  metadata.gz: 02ce194e017bb5f707f99d4c7cf8df5af4942fa7826ebe23796505190e87373f
+  data.tar.gz: 844f88dc837c2350de675e01f3507189be0c9ed5c34641389d7317e2f7ebb04a
 SHA512:
-  metadata.gz: 95ab80beda829e6ef44d6fe78d323dc98a91d62f04f96b82bd10cd3ec5927f575dfd83cc0034c47973421c24f3da3a6eee5330ca944f7bfaf1b2ebee9814aa1c
-  data.tar.gz: 983977fdb56fdb9395459ebd66992eefc0e50c4fbda2fda4e5afb713fe56419a1a2eaf40b7c421d6409613dad3f04fdb7f6c6102f74aa6bd978482497460325f
+  metadata.gz: '0850b69a930888858fa430d57acf1fdd8ac4a4142b27759d668dd90bf6ac1f425bed9593a0b7e06ed2f9db3f8b9487436b0e57925c3a2a8485293890eeb9f27a'
+  data.tar.gz: ce11282124a380f3dc0fe4ab7b6adfbc4a6b7e5691b0cd58339bee15e4c751b3a894259c169b25052d5c013d78d484b6e73ad5b950e57ebb19c752cd2a69e14d

data/.gitignore

@@ -24,3 +24,5 @@ bin
 .idea
 
 tmp/
+
+Gemfile.lock

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.5
+  - 2.6
 script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # praxis-mapper changelog
 
-## next
+## 4.4.1 (6/25/2019)
+
+* Fix `Resource` to not override association methods already defined 
+* Migrate to FactoryBot
 
 ## 4.4 (12/10/2017)
 

data/lib/praxis-mapper/resource.rb

@@ -100,10 +100,9 @@ module Praxis::Mapper
       return if model.nil?
 
       model.associations.each do |k,v|
-        if self.instance_methods.include? k
-          warn "WARNING: #{self.name} already has method named #{k.inspect}. Will not define accessor for resource association."
+        unless self.instance_methods.include? k
+          define_model_association_accessor(k,v)
         end
-        define_model_association_accessor(k,v)
       end
     end
 

data/lib/praxis-mapper/support/{factory_girl.rb → factory_bot.rb}

@@ -1,5 +1,5 @@
-# Hackish write support for Praxis::Mapper, needed for FactoryGirl.create calls.
-# TODO: get rid of this and use current FactoryGirl features to do it the right way.
+# Hackish write support for Praxis::Mapper, needed for FactoryBot.create calls.
+# TODO: get rid of this and use current FactoryBot features to do it the right way.
 
 module Praxis::Mapper
   class Model

data/lib/praxis-mapper/version.rb

@@ -1,5 +1,5 @@
 module Praxis
   module Mapper
-    VERSION = "4.4"
+    VERSION = "4.4.1"
   end
 end

data/spec/factories/all.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   to_create { |i| i.save }
 

data/spec/spec_helper.rb

@@ -32,7 +32,7 @@ require_relative 'spec_fixtures'
 require 'praxis-mapper/support'
 
 require 'randexp'
-require 'factory_girl'
+require 'factory_bot'
 
 require 'pry'
 
@@ -47,12 +47,12 @@ RSpec.configure do |config|
     /org\/jruby\/.*.java/
   ]
 
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 
   config.before(:suite) do
-    FactoryGirl.find_definitions
+    FactoryBot.find_definitions
     Sequel::Model.db.transaction do
-      FactoryGirl.lint
+      FactoryBot.lint
       raise Sequel::Rollback
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis-mapper
 version: !ruby/object:Gem::Version
-  version: '4.4'
+  version: 4.4.1
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -284,7 +284,7 @@ files:
 - lib/praxis-mapper/selector_generator.rb
 - lib/praxis-mapper/sequel_compat.rb
 - lib/praxis-mapper/support.rb
-- lib/praxis-mapper/support/factory_girl.rb
+- lib/praxis-mapper/support/factory_bot.rb
 - lib/praxis-mapper/support/memory_query.rb
 - lib/praxis-mapper/support/memory_repository.rb
 - lib/praxis-mapper/support/schema_dumper.rb
@@ -332,8 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A multi-datastore library designed for efficiency in loading large datasets.