praxis 0.22.pre.1 → 2.0.pre.4

data/spec/spec_app/config/environment.rb

@@ -21,35 +21,17 @@ Praxis::Application.configure do |application|
   application.bootloader.use SimpleAuthenticationPlugin, config_file: 'config/authentication.yml'
   application.bootloader.use AuthorizationPlugin
 
-
-  adapter_name = 'sqlite'
-  db_name = ':memory:'
-  connection_opts = if RUBY_PLATFORM !~ /java/
-    { adapter: adapter_name , database: db_name }
-   else
-    require 'jdbc/sqlite3'
-    { adapter: 'jdbc', uri: "jdbc:#{adapter_name}:#{db_name}" }
-  end
-
-  application.bootloader.use Praxis::Plugins::PraxisMapperPlugin, {
-    config_data: {
-      repositories: { default: connection_opts },
-      log_stats: 'detailed'
-    }
-  }
-
   # enable "development-mode" options
   application.config.praxis.validate_responses = true
   application.config.praxis.validate_response_bodies = true
   application.config.praxis.show_exceptions = true
 
-  # FIXME: until we have a better way to unit test such a feature...
   # Silly callback code pieces to test that the deferred callbacks work even for sub-stages
-  application.bootloader.after :app, :models do
-    PersonModel.identity(:other_id)
+  application.bootloader.after :app, :controllers do
+    $after_app_controllers = :worked
   end
   application.bootloader.after :app do
-    raise "After sub-stage hooks not working!" unless PersonModel.identities.include? :other_id
+    raise "After sub-stage hooks not working!" unless $after_app_controllers == :worked
   end
 
 

data/spec/spec_helper.rb

@@ -19,25 +19,32 @@ require 'rack/test'
 require 'rspec/its'
 require 'rspec/collection_matchers'
 
-
 Dir["#{File.dirname(__FILE__)}/../lib/praxis/plugins/*.rb"].each do |file|
   require file
 end
 
-APP = Praxis::Application.instance
+
 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
 
   config.before(:suite) do
+    Praxis::Mapper::Resource.finalize!
     Praxis::Blueprint.caching_enabled = true
-    APP.setup(root:'spec/spec_app')
-
-    # create the table
-    setup_database!
+    Praxis::Application.instance.setup(root:'spec/spec_app')
   end
 
   config.before(:each) do
@@ -49,17 +56,6 @@ RSpec.configure do |config|
   config.before(:all) do
     # disable logging below warn level
     Praxis::Application.instance.logger.level = 2 # warn
-    Thread.current[:praxis_instance] = APP
   end
 end
 
-# create the test db schema
-def setup_database!
-  mapper = Praxis::Application.instance.plugins[:praxis_mapper]
-  Sequel.connect(mapper.config.repositories["default"]['connection_settings'].dump) do |db|
-    db.create_table! :people do
-      primary_key :id
-      string :name
-    end
-  end
-end

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

@@ -0,0 +1,124 @@
+require 'ostruct'
+
+require 'praxis/mapper/active_model_compat'
+class SimpleModel < 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]
+      },
+      other_model: {
+        model: OtherModel,
+        primary_key: :id,
+        type: :many_to_one,
+        local_key_columns: [:other_model_id],
+        remote_key_columns: [:id]
+      }
+    }
+  end
+end
+
+class OtherModel < 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
+
+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
+
+class YamlArrayModel < OpenStruct
+  include Praxis::Mapper::ActiveModelCompat
+  def self._praxis_associations
+   {
+    parents: {
+      model: ParentModel,
+      primary_key: :id,
+      type: :one_to_many,
+      local_key_columns: [:id],
+      remote_key_columns: [:parent_id]
+    }
+  }
+  end
+end
+
+# A set of resource classes for use in specs
+class BaseResource < Praxis::Mapper::Resource
+  def href
+    base_href = '' # "/api"
+    base_href + "/#{self.class.collection_name}/#{self.id}"
+  end
+
+  property :href, dependencies: [:id]
+end
+
+class OtherResource < BaseResource
+  model OtherModel
+
+  property :display_name, dependencies: [:name]
+end
+
+class ParentResource < BaseResource
+  model ParentModel
+end
+
+class SimpleResource < BaseResource
+  model SimpleModel
+
+  resource_delegate :other_model => [:other_attribute]
+
+  def other_resource
+    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]
+  property :direct_other_name, dependencies: [ 'other_model.name' ]
+  property :aliased_other_name, dependencies: [ 'other_model.display_name' ]
+
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis
 version: !ruby/object:Gem::Version
-  version: 0.22.pre.1
+  version: 2.0.pre.4
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -31,20 +31,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -73,62 +73,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: praxis-mapper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: praxis-blueprints
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: attributor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -189,42 +175,42 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -371,16 +357,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -395,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
@@ -536,16 +550,14 @@ files:
 - lib/praxis/exceptions/invalid_trait.rb
 - lib/praxis/exceptions/stage_not_found.rb
 - lib/praxis/exceptions/validation.rb
-- lib/praxis/extensions/attribute_filtering.rb
 - lib/praxis/extensions/attribute_filtering/active_record_filter_query_builder.rb
 - lib/praxis/extensions/attribute_filtering/filtering_params.rb
-- lib/praxis/extensions/attribute_filtering/query_builder.rb
+- lib/praxis/extensions/attribute_filtering/sequel_filter_query_builder.rb
 - lib/praxis/extensions/field_expansion.rb
 - lib/praxis/extensions/field_selection.rb
 - lib/praxis/extensions/field_selection/active_record_query_selector.rb
 - lib/praxis/extensions/field_selection/field_selector.rb
 - lib/praxis/extensions/field_selection/sequel_query_selector.rb
-- lib/praxis/extensions/mapper_selectors.rb
 - lib/praxis/extensions/rails_compat.rb
 - lib/praxis/extensions/rails_compat/request_methods.rb
 - lib/praxis/extensions/rendering.rb
@@ -555,8 +567,11 @@ files:
 - lib/praxis/handlers/www_form.rb
 - lib/praxis/handlers/xml.rb
 - lib/praxis/links.rb
+- lib/praxis/mapper/active_model_compat.rb
+- lib/praxis/mapper/resource.rb
+- lib/praxis/mapper/selector_generator.rb
+- lib/praxis/mapper/sequel_compat.rb
 - lib/praxis/media_type.rb
-- lib/praxis/media_type_collection.rb
 - lib/praxis/media_type_identifier.rb
 - lib/praxis/middleware_app.rb
 - lib/praxis/multipart/parser.rb
@@ -564,7 +579,7 @@ files:
 - lib/praxis/notifications.rb
 - lib/praxis/plugin.rb
 - lib/praxis/plugin_concern.rb
-- lib/praxis/plugins/praxis_mapper_plugin.rb
+- lib/praxis/plugins/mapper_plugin.rb
 - lib/praxis/plugins/rails_plugin.rb
 - lib/praxis/request.rb
 - lib/praxis/request_stages/action.rb
@@ -623,20 +638,24 @@ 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
 - spec/praxis/handlers/xml_spec.rb
 - spec/praxis/links_spec.rb
-- spec/praxis/media_type_collection_spec.rb
+- spec/praxis/mapper/resource_spec.rb
+- spec/praxis/mapper/selector_generator_spec.rb
 - spec/praxis/media_type_identifier_spec.rb
 - spec/praxis/media_type_spec.rb
 - spec/praxis/middleware_app_spec.rb
 - spec/praxis/multipart/parser_spec.rb
 - spec/praxis/notifications_spec.rb
 - spec/praxis/plugin_concern_spec.rb
-- spec/praxis/plugins/praxis_mapper_plugin_spec.rb
 - spec/praxis/request_spec.rb
 - spec/praxis/request_stages/action_spec.rb
 - spec/praxis/request_stages/request_stage_spec.rb
@@ -661,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
@@ -683,10 +701,12 @@ 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
 - spec/support/spec_resource_definitions.rb
+- spec/support/spec_resources.rb
 - spec/support/spec_simple_authentication_plugin.rb
 - tasks/loader.thor
 - tasks/thor/app.rb
@@ -735,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.