praxis-mapper 4.2 → 4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ff56d63e3412602d1542aefa5a0ddeb2c6f053d
-  data.tar.gz: e55ac6835ca3be6495ccb699e72197502812664f
+  metadata.gz: cc62b721f14cfb74cf3915d1123dc9970b9033ff
+  data.tar.gz: bc4dda08a87b9d20ffd0be68d963406ea55b3972
 SHA512:
-  metadata.gz: 54bb23566ca0385a869114087e2fd91420f3e1b7e5ce890672dbbdb649d4d0fe7f63bf5b947e4d7c2af781996363d185e3ee0de160836e70d265bdd4b6a8673e
-  data.tar.gz: 088259294b44ba826033c1a39e279899be35f0c482827f0cc6deac8aa3282dd6323160ff0877b68d15b2a7ebe92e3df8c38ffc985ad050de775daee9b4388ba4
+  metadata.gz: 090b9a57b17a4abaea12a5c58c8540d8c940c323b3ed32a183922353c155279d58561e2454a0c84591d6b18522fd28e4ec15b964c24b6d503c77c3edb93e46cb
+  data.tar.gz: a8425a849b5456eeff9cfa36e954a4f89dcdf0ae0d361b80b8411b29328d4d68fbd19c83b42da95c25ffe56de6b8950670c6258afe50a111cd447ac2acafa7f9

data/.travis.yml

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

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## next
 
+## 4.3
+
+* Added a `:through` option to `Resource.property` to specify that the property
+  effectively traverses the association(s) given so that it may continue to
+  process additional subfield selections.
+* Fixed `SystemStackError` from `IdentityMap#add_selectors` if the provided
+  field hashes are self-referencing. I.e. `{author: {posts: {author: {...}}}}`
+* Fixed `SystemStackError` from `SelectorGenerator` for circular `Resource.property` definitions like `property :foo, dependencies: [:foo, :bar]`.
+* Fixed `Query::Sequel` not working with raw SQL queries.
+* Fixed SQL logging in `Query::Sequel` for query execution passing a dataset.
+
 ## 4.2
 
 * Added `Resource.property` to specify the fields and associations from the

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

@@ -52,7 +52,7 @@ module Praxis::Mapper
       #
       # @return [Array] result-set
       def _execute(ds=nil)
-        Praxis::Mapper.logger.debug "SQL:\n#{self.describe}\n"
+        Praxis::Mapper.logger.debug "SQL:\n#{self.describe(ds)}\n"
         self.statistics[:datastore_interactions] += 1
         start_time = Time.now
 
@@ -60,7 +60,7 @@ module Praxis::Mapper
           unless ds.nil?
             warn 'WARNING: Query::Sequel#_execute ignoring passed dataset due to previously-specified raw SQL'
           end
-          connection.run(@raw_query).to_a
+          connection[@raw_query].to_a
         else
           (ds || self.dataset).to_a
         end
@@ -70,8 +70,8 @@ module Praxis::Mapper
       end
 
       # @see #sql
-      def describe
-        self.sql
+      def describe(ds=nil)
+        (ds || self).sql
       end
 
       # Constructs a raw SQL statement.

data/lib/praxis-mapper/selector_generator.rb

@@ -8,9 +8,15 @@ module Praxis::Mapper
       @selectors = Hash.new do |hash, key|
         hash[key] = {select: Set.new, track: Set.new}
       end
+      @seen = Hash.new do |hash, resource|
+        hash[resource] = Set.new
+      end
     end
 
     def add(resource, fields)
+      return if @seen[resource].include? fields
+      @seen[resource] << fields
+
       fields.each do |name, field|
         map_property(resource, name, field)
       end
@@ -20,11 +26,11 @@ module Praxis::Mapper
       selectors[resource.model][:select] = true
     end
 
-    def map_property(resource, name, field)
+    def map_property(resource, name, fields)
       if resource.properties.key?(name)
-        add_property(resource, name)
+        add_property(resource, name, fields)
       elsif resource.model.associations.key?(name)
-        add_association(resource, name, field)
+        add_association(resource, name, fields)
       else
         add_select(resource, name)
       end
@@ -73,13 +79,27 @@ module Praxis::Mapper
       end
     end
 
-    def add_property(resource, name)
+    def add_property(resource, name, fields)
       dependencies = resource.properties[name][:dependencies]
-      return if dependencies.nil?
+      if dependencies
+        dependencies.each do |dependency|
+          # if dependency includes the name, then map it directly as the field
+          if dependency == name
+            add_select(resource, name)
+          else
+            apply_dependency(resource, dependency)
+          end
+        end
+      end
+
+      head, *tail = resource.properties[name][:through]
+      return if head.nil?
 
-      dependencies.each do |dependency|
-        apply_dependency(resource, dependency)
+      new_fields = tail.reverse.inject(fields) do |thing, step|
+        {step => thing}
       end
+
+      add_association(resource, head, new_fields)
     end
 
     def apply_dependency(resource, dependency)

data/lib/praxis-mapper/version.rb

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

data/spec/factories/all.rb

@@ -16,6 +16,7 @@ FactoryGirl.define do
   factory :post, class: PostModel do
     title { /\w+/.gen }
     body  { /\w+/.gen }
+    created_at { DateTime.now - rand(100) }
     author
   end
 

data/spec/praxis-mapper/selector_generator_spec.rb

@@ -151,21 +151,59 @@ describe Praxis::Mapper::SelectorGenerator do
     end
   end
 
-  context 'with a property that groups multiple fields' do
-    let(:properties) { {owner_full_name: {first: true}} }
+  context 'using a property that specifies a :through option' do
+    let(:properties) { {recent_posts: {author: {full_name: true}}} }
+    let(:resource) { UserResource }
     let(:expected_selectors) do
       {
-        BlogModel => {
-          select: Set.new([:owner_id]),
-          track: Set.new([:owner])
+        PostModel => {
+          select: Set.new([:author_id, :created_at]),
+          track: Set.new([:author])
         },
         UserModel => {
           select: Set.new([:first_name, :last_name]),
-          track: Set.new()
+          track: Set.new([:posts])
         }
       }
     end
-    it 'generates selectors that ignore any unapplicable subrefinements' do
+    it 'generates the correct set of selectors' do
+      generator.selectors.should eq expected_selectors
+    end
+  end
+
+  context 'with a property with a circular definition (ie, includes its own field)' do
+    let(:resource) { PostResource }
+
+    let(:properties) { {id: true, slug: true} }
+    let(:expected_selectors) do
+      {
+        PostModel => {
+          select: Set.new([:id, :slug, :title]),
+          track: Set.new
+        }
+      }
+    end
+    it 'generates the correct set of selectors' do
+      generator.selectors.should eq expected_selectors
+    end
+  end
+
+  context 'with a property without the :through option' do
+    let(:resource) { UserResource }
+    let(:properties) { {blogs_summary: {size: true}} }
+    let(:expected_selectors) do
+     {
+       BlogModel => {
+         select: Set.new([:owner_id]),
+         track: Set.new()
+       },
+       UserModel => {
+         select: Set.new([:id]),
+         track: Set.new([:blogs])
+       }
+     }
+    end
+    it 'ignores any subsequent fields when generating selectors' do
       generator.selectors.should eq expected_selectors
     end
   end
@@ -216,6 +254,7 @@ describe Praxis::Mapper::SelectorGenerator do
     it 'generates the correct set of selectors' do
       generator.selectors.should eq(expected_selectors)
     end
+
   end
 
 end

data/spec/support/spec_sequel_models.rb

@@ -27,7 +27,10 @@ DB.create_table! :posts do
   Integer :author_id
 
   String :title
+  String :slug
   String :body
+
+  DateTime :created_at
 end
 
 
@@ -76,7 +79,7 @@ class UserModel < Sequel::Model(:users)
 
   repository_name :sequel
 
-  one_to_many :posts, class: 'PostModel', key: :post_id
+  one_to_many :posts, class: 'PostModel', key: :author_id
   one_to_many :comments, class: 'CommentModel', key: :author_id
   one_to_many :blogs, class: 'BlogModel', key: :owner_id
 

data/spec/support/spec_sequel_resources.rb

@@ -37,10 +37,16 @@ end
 class UserResource < BaseResource
   model UserModel
 
+  property :full_name, dependencies: [:first_name, :last_name]
+  property :blogs_summary, dependencies: [:id, :blogs]
+
+  property :recent_posts, dependencies: ['posts.created_at'],
+    through: [:posts]
+
+
   def full_name
     "#{first_name} #{last_name}"
   end
-  property :full_name, dependencies: [:first_name, :last_name]
 
   def blogs_summary
     {
@@ -49,9 +55,25 @@ class UserResource < BaseResource
     }
   end
 
-  property :blogs_summary, dependencies: [:id, :blogs]
+  def recent_posts
+    posts.sort_by(&:created_at).reverse[2]
+  end
+
 end
 
 class CommentResource < BaseResource
   model CommentModel
 end
+
+class PostResource < BaseResource
+  model PostModel
+
+  property :slug, dependencies: [:slug, :title]
+
+  # generate default slug from title if one wasn't set in the db
+  def slug
+    return record.slug if record.slug
+    record.title.gsub(" ", "-").downcase
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis-mapper
 version: !ruby/object:Gem::Version
-  version: '4.2'
+  version: '4.3'
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A multi-datastore library designed for efficiency in loading large datasets.