praxis 2.0.pre.2 → 2.0.pre.3

data/spec/spec_helper.rb

@@ -23,10 +23,21 @@ Dir["#{File.dirname(__FILE__)}/../lib/praxis/plugins/*.rb"].each do |file|
   require file
 end
 
+
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
   require file
 end
 
+def suppress_output
+  original_stdout, original_stderr = $stdout.clone, $stderr.clone
+  $stderr.reopen File.new('/dev/null', 'w')
+  $stdout.reopen File.new('/dev/null', 'w')
+  yield
+ensure
+  $stdout.reopen original_stdout
+  $stderr.reopen original_stderr
+end
+
 RSpec.configure do |config|
   config.include Rack::Test::Methods
 

data/spec/support/be_deep_equal_matcher.rb

@@ -0,0 +1,39 @@
+# Copied verbatim from: https://github.com/amogil/rspec-deep-ignore-order-matcher
+
+RSpec::Matchers.define :be_deep_equal do |expected|
+  match { |actual| match? actual, expected }
+
+  failure_message do |actual|
+    "expected that #{actual} would be deep equal with #{expected}"
+  end
+
+  failure_message_when_negated do |actual|
+    "expected that #{actual} would not be deep equal with #{expected}"
+  end
+
+  description do
+    "be deep equal with #{expected}"
+  end
+
+  def match?(actual, expected)
+    return arrays_match?(actual, expected) if expected.is_a?(Array) && actual.is_a?(Array)
+    return hashes_match?(actual, expected) if expected.is_a?(Hash) && actual.is_a?(Hash)
+    expected == actual
+  end
+
+  def arrays_match?(actual, expected)
+    exp = expected.clone
+    actual.each do |a|
+      index = exp.find_index { |e| match? a, e }
+      return false if index.nil?
+      exp.delete_at(index)
+    end
+    exp.empty?
+  end
+
+  def hashes_match?(actual, expected)
+    return false unless actual.keys.sort == expected.keys.sort
+    actual.each { |key, value| return false unless match? value, expected[key] }
+    true
+  end
+end

data/spec/support/spec_resources.rb

@@ -8,12 +8,16 @@ class SimpleModel < OpenStruct
       parent: {
         model: ParentModel,
         primary_key: :id,
-        type: :many_to_one
+        type: :many_to_one,
+        local_key_columns: [:parent_id],
+        remote_key_columns: [:id]
       },
       other_model: {
         model: OtherModel,
         primary_key: :id,
-        type: :many_to_one
+        type: :many_to_one,
+        local_key_columns: [:other_model_id],
+        remote_key_columns: [:id]
       }
     }
   end
@@ -23,14 +27,20 @@ class OtherModel < OpenStruct
   include Praxis::Mapper::ActiveModelCompat
   def self._praxis_associations
     {
-    }
-  end
-end
-
-class PersonModel < OpenStruct
-  include Praxis::Mapper::ActiveModelCompat
-  def self._praxis_associations
-    {
+      parent: {
+        model: ParentModel,
+        primary_key: :id,
+        type: :many_to_one,
+        local_key_columns: [:parent_id],
+        remote_key_columns: [:id]
+      },
+      simple_models: {
+        model: SimpleModel,
+        primary_key: :id,
+        type: :many_to_many,
+        local_key_columns: [:id],
+        remote_key_columns: [:id] # The through table is in the middle where the FKs are...
+      }
     }
   end
 end
@@ -39,6 +49,13 @@ class ParentModel < OpenStruct
   include Praxis::Mapper::ActiveModelCompat
   def self._praxis_associations
     {
+      simple_children: {
+        model: SimpleModel,
+        primary_key: :id,
+        type: :one_to_many,
+        local_key_columns: [:id],
+        remote_key_columns: [:parent_id]
+      }
     }
   end
 end
@@ -50,7 +67,9 @@ class YamlArrayModel < OpenStruct
     parents: {
       model: ParentModel,
       primary_key: :id,
-      type: :one_to_many
+      type: :one_to_many,
+      local_key_columns: [:id],
+      remote_key_columns: [:parent_id]
     }
   }
   end
@@ -66,12 +85,10 @@ class BaseResource < Praxis::Mapper::Resource
   property :href, dependencies: [:id]
 end
 
-# class CompositeIdResource < BaseResource
-#   model CompositeIdModel
-# end
-
 class OtherResource < BaseResource
   model OtherModel
+
+  property :display_name, dependencies: [:name]
 end
 
 class ParentResource < BaseResource
@@ -87,45 +104,21 @@ class SimpleResource < BaseResource
     self.other_model
   end
 
+  property :aliased_method, dependencies: [:column1, :other_model]
   property :other_resource, dependencies: [:other_model]
 
+  property :parent, dependencies: [:parent, :added_column]
+
   property :name, dependencies: [:simple_name]
-end
+  property :direct_other_name, dependencies: [ 'other_model.name' ]
+  property :aliased_other_name, dependencies: [ 'other_model.display_name' ]
 
-# class SimplerResource < BaseResource
-#   model SimplerModel
-# end
+  property :everything, dependencies: [:*]
+  property :everything_from_parent, dependencies: ['parent.*']
+  property :circular_dep, dependencies: [ :circular_dep, :column1 ]
+  property :no_deps, dependencies: []
+end
 
 class YamlArrayResource < BaseResource
   model YamlArrayModel
 end
-
-class PersonResource < BaseResource
-  model PersonModel
-
-  def href
-    "/people/#{self.id}"
-  end
-
-end
-
-# class AddressResource < BaseResource
-#   model AddressModel
-
-
-#   def href
-#     "/addresses/#{self.id}"
-#   end
-#   property :href, dependencies: [:id]
-
-#   def owner_name
-#     self.owner.name
-#   end
-#   property :owner_name, dependencies: ['owner.name']
-
-#   def resident_count
-#     self.residents.size
-#   end
-#   property :resident_count, dependencies: [:residents]
-
-# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis
 version: !ruby/object:Gem::Version
-  version: 2.0.pre.2
+  version: 2.0.pre.3
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -381,6 +381,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: 
 email:
 - blanquer@gmail.com
@@ -610,7 +638,11 @@ files:
 - spec/praxis/controller_spec.rb
 - spec/praxis/dispatcher_spec.rb
 - spec/praxis/extensions/field_expansion_spec.rb
+- spec/praxis/extensions/field_selection/active_record_query_selector_spec.rb
 - spec/praxis/extensions/field_selection/field_selector_spec.rb
+- spec/praxis/extensions/field_selection/sequel_query_selector_spec.rb
+- spec/praxis/extensions/field_selection/support/spec_resources_active_model.rb
+- spec/praxis/extensions/field_selection/support/spec_resources_sequel.rb
 - spec/praxis/extensions/rendering_spec.rb
 - spec/praxis/file_group_spec.rb
 - spec/praxis/handlers/json_spec.rb
@@ -648,7 +680,6 @@ files:
 - spec/spec_app/app/controllers/base_class.rb
 - spec/spec_app/app/controllers/instances.rb
 - spec/spec_app/app/controllers/volumes.rb
-- spec/spec_app/app/models/person.rb
 - spec/spec_app/app/responses/bulk_response.rb
 - spec/spec_app/app/responses/multipart.rb
 - spec/spec_app/app/responses/other_response.rb
@@ -670,6 +701,7 @@ files:
 - spec/spec_app/design/resources/volume_snapshots.rb
 - spec/spec_app/design/resources/volumes.rb
 - spec/spec_helper.rb
+- spec/support/be_deep_equal_matcher.rb
 - spec/support/spec_authorization_plugin.rb
 - spec/support/spec_complex_authentication_plugin.rb
 - spec/support/spec_media_types.rb
@@ -723,7 +755,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Building APIs the way you want it.

data/spec/spec_app/app/models/person.rb

@@ -1,3 +0,0 @@
-# class PersonModel #< Praxis::Mapper::Model
-#   # table_name 'people'
-# end