praxis-mapper 4.3 → 4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc62b721f14cfb74cf3915d1123dc9970b9033ff
-  data.tar.gz: bc4dda08a87b9d20ffd0be68d963406ea55b3972
+  metadata.gz: 537418afacaff7e279f5e83fe0a53b36414fe763
+  data.tar.gz: 443de06327dd6afc1799984487680bbaff421442
 SHA512:
-  metadata.gz: 090b9a57b17a4abaea12a5c58c8540d8c940c323b3ed32a183922353c155279d58561e2454a0c84591d6b18522fd28e4ec15b964c24b6d503c77c3edb93e46cb
-  data.tar.gz: a8425a849b5456eeff9cfa36e954a4f89dcdf0ae0d361b80b8411b29328d4d68fbd19c83b42da95c25ffe56de6b8950670c6258afe50a111cd447ac2acafa7f9
+  metadata.gz: 95ab80beda829e6ef44d6fe78d323dc98a91d62f04f96b82bd10cd3ec5927f575dfd83cc0034c47973421c24f3da3a6eee5330ca944f7bfaf1b2ebee9814aa1c
+  data.tar.gz: 983977fdb56fdb9395459ebd66992eefc0e50c4fbda2fda4e5afb713fe56419a1a2eaf40b7c421d6409613dad3f04fdb7f6c6102f74aa6bd978482497460325f

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## next
 
+## 4.4 (12/10/2017)
+
+* Fix selector generator to properly handle composite key associations.
+* Fix `default_selection` in `Query::Base` to accountt for models with composite identities.
+* Support `many_to_many` relationships without requiring the `:through` annotations (for ORMs that
+  can transparently load the intermediate relationships)
+
 ## 4.3
 
 * Added a `:through` option to `Resource.property` to specify that the property

data/lib/praxis-mapper/query/base.rb

@@ -96,7 +96,11 @@ module Praxis::Mapper
 
       def default_select
         model.identities.each_with_object({}).each do |identity, hash|
-          hash[identity] = nil
+          if identity.is_a? Array
+            identity.each { |id| hash[id] = nil }
+          else
+            hash[identity] = nil
+          end
         end
       end
 

data/lib/praxis-mapper/query/sql.rb

@@ -56,7 +56,7 @@ module Praxis::Mapper
           dataset = dataset.where(@where)
         end
 
-        clause = dataset.opts[:where].sql_literal(dataset)
+        clause = dataset.literal(dataset.opts[:where])
 
         original_where = @where
 

data/lib/praxis-mapper/selector_generator.rb

@@ -56,19 +56,27 @@ module Praxis::Mapper
       case association[:type]
       when :many_to_one
         add_track(resource, name)
-        add_select(resource, association[:key])
+        Array(association[:key]).each do |akey|
+          add_select(resource, akey)
+        end
       when :one_to_many
         add_track(resource, name)
-        add_select(associated_resource, association[:key])
-      when :many_to_many
-        head, *tail = association.fetch(:through) do
-          raise "Association #{name} on #{resource.model} must specify the " +
-            "':through' option. "
+        Array(association[:key]).each do |akey|
+          add_select(associated_resource, akey)
         end
-        new_fields = tail.reverse.inject(fields) do |thing, step|
-          {step => thing}
+      when :many_to_many
+        # If we haven't explicitly added the "through" option in the association
+        # then we'll assume the underlying ORM is able to fill in the gap. We will
+        # simply add the fields for the associated resource below
+        if association.key? :through
+          head, *tail = association[:through]
+          new_fields = tail.reverse.inject(fields) do |thing, step|
+            {step => thing}
+          end
+          return add_association(resource, head, new_fields)
+        else
+          add_track(resource, name)
         end
-        return add_association(resource, head, new_fields)
       else
         raise "no select applicable for #{association[:type].inspect}"
       end

data/lib/praxis-mapper/version.rb

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

data/praxis-mapper.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["Josep M. Blanquer","Dane Jensen"]
   spec.summary       = %q{A multi-datastore library designed for efficiency in loading large datasets.}
   spec.email = ["blanquer@gmail.com","dane.jensen@gmail.com"]
-  
+
   spec.homepage = "https://github.com/rightscale/praxis-mapper"
   spec.license = "MIT"
   spec.required_ruby_version = ">=2.1"
@@ -17,16 +17,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  
+
   spec.add_runtime_dependency(%q<randexp>, ["~> 0"])
   spec.add_runtime_dependency(%q<sequel>, ["~> 4"])
   spec.add_runtime_dependency(%q<activesupport>, [">= 3"])
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency('bundler', ['>= 1'])
   spec.add_development_dependency "rake", "~> 0"
 
   spec.add_development_dependency(%q<redcarpet>, ["< 3.0"])
-  spec.add_development_dependency(%q<yard>, ["~> 0.8.7"])
+  spec.add_development_dependency(%q<yard>)
   spec.add_development_dependency(%q<guard>, ["~> 2"])
   spec.add_development_dependency(%q<guard-rspec>, [">= 0"])
   spec.add_development_dependency(%q<rspec>, ["< 2.99"])
@@ -35,6 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency(%q<pry-stack_explorer>, ["~> 0"])
   spec.add_development_dependency(%q<fuubar>, ["~> 1"])
   spec.add_development_dependency('sqlite3')
-  spec.add_development_dependency('factory_girl')
+  spec.add_development_dependency('factory_bot')
   spec.add_development_dependency('coveralls')
 end

data/spec/praxis-mapper/query/base_spec.rb

@@ -191,6 +191,21 @@ describe Praxis::Mapper::Query::Base do
 
     end
 
+    context "#default selection fields are always included" do
+      it "using a non-identity field" do
+        subject.select :name
+        subject.select.should include(:id => nil, :name => nil)
+      end
+
+      context "for a model with a composite identity" do
+        let(:model) { CompositeIdModel }
+        it "has a default" do
+          subject.select :id
+          subject.select.should include(:id => nil, :type => nil)
+        end
+      end
+    end
+
     context "with no query body" do
       subject { Praxis::Mapper::Query::Base.new(identity_map, model) }
 

data/spec/praxis-mapper/selector_generator_spec.rb

@@ -75,6 +75,47 @@ describe Praxis::Mapper::SelectorGenerator do
         generator.selectors.should eq expected_selectors
       end
     end
+
+    context 'that is many_to_many without a :through option' do
+      let(:properties) { {other_commented_posts: { id: true} } }
+      let(:resource) { UserResource }
+      let(:expected_selectors) do
+        {
+          PostModel => {
+            select: Set.new([:id]),
+            track: Set.new([])
+          },
+          UserModel => {
+            select: Set.new([]),
+            track: Set.new([:other_commented_posts])
+          }
+        }
+      end
+      it 'generates the correct set of selectors' do
+        generator.selectors.should eq expected_selectors
+      end
+    end
+
+
+    context 'that uses a composite key' do
+      let(:properties) { {composite_model: {id: true, type: true} } }
+      let(:resource) { OtherResource }
+      let(:expected_selectors) do
+        {
+          OtherModel => {
+            select: Set.new([:composite_id,:composite_type]),
+            track: Set.new([:composite_model])
+          },
+          CompositeIdModel => {
+            select: Set.new([:id,:type]),
+            track: Set.new
+          }
+        }
+      end
+      it 'generates the correct set of selectors' do
+        generator.selectors.should eq expected_selectors
+      end
+    end
   end
 
   context 'for a property that specifies a field from an association' do

data/spec/support/spec_sequel_models.rb

@@ -89,6 +89,10 @@ class UserModel < Sequel::Model(:users)
     join_table: 'comments', join_model: 'CommentModel',
     through: [:comments, :post]
 
+  many_to_many :other_commented_posts, class: 'PostModel',
+    left_key: :author_id, right_key: :post_id,
+    join_table: 'comments', join_model: 'CommentModel' #Explicitly not specify the :through option
+
   many_to_one :main_blog, class: 'BlogModel', key: :main_blog_id
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis-mapper
 version: !ruby/object:Gem::Version
-  version: '4.3'
+  version: '4.4'
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -57,16 +57,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +99,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A multi-datastore library designed for efficiency in loading large datasets.
@@ -360,4 +360,3 @@ test_files:
 - spec/support/spec_resources.rb
 - spec/support/spec_sequel_models.rb
 - spec/support/spec_sequel_resources.rb
-has_rdoc: