praxis 0.22.pre.2 → 2.0.pre.1

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_app/config.ru

@@ -9,4 +9,9 @@ $:.unshift File.expand_path('lib', __dir__)
 
 require 'praxis'
 
-run Praxis::Application.new.setup
+
+application = Praxis::Application.instance
+
+application.setup
+
+run application

data/spec/spec_helper.rb

@@ -19,12 +19,10 @@ 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
@@ -33,11 +31,9 @@ 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 +45,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/spec_resources.rb

@@ -0,0 +1,131 @@
+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
+      },
+      other_model: {
+        model: OtherModel,
+        primary_key: :id,
+        type: :many_to_one
+      }
+    }
+  end
+end
+
+class OtherModel < OpenStruct
+  include Praxis::Mapper::ActiveModelCompat
+  def self._praxis_associations
+    {
+    }
+  end
+end
+
+class PersonModel < OpenStruct
+  include Praxis::Mapper::ActiveModelCompat
+  def self._praxis_associations
+    {
+    }
+  end
+end
+
+class ParentModel < OpenStruct
+  include Praxis::Mapper::ActiveModelCompat
+  def self._praxis_associations
+    {
+    }
+  end
+end
+
+class YamlArrayModel < OpenStruct
+  include Praxis::Mapper::ActiveModelCompat
+  def self._praxis_associations
+   {
+    parents: {
+      model: ParentModel,
+      primary_key: :id,
+      type: :one_to_many
+    }
+  }
+  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 CompositeIdResource < BaseResource
+#   model CompositeIdModel
+# end
+
+class OtherResource < BaseResource
+  model OtherModel
+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 :other_resource, dependencies: [:other_model]
+
+  property :name, dependencies: [:simple_name]
+end
+
+# class SimplerResource < BaseResource
+#   model SimplerModel
+# 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: 0.22.pre.2
+  version: 2.0.pre.1
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2020-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -73,20 +73,6 @@ 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
@@ -119,16 +105,16 @@ dependencies:
   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
@@ -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
@@ -536,16 +522,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 +539,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 +551,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
@@ -629,14 +616,14 @@ files:
 - 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
@@ -687,6 +674,7 @@ files:
 - 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

data/lib/praxis/extensions/attribute_filtering/query_builder.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-require_relative 'active_record_filter_query_builder'
-
-module Praxis
-  module Extensions
-    module QueryBuilder
-    # To include in a resource object...
-      extend ActiveSupport::Concern
-
-      included do
-        # TODO: this shouldn't be needed if we incorporate it with the properties of the mapper...
-        def self.filters_mapping(hash)
-          @query_builder_class = ActiveRecordFilterQueryBuilder.for(**hash)
-        end
-        
-        def self.query_builder_class
-          @query_builder_class
-        end
-
-        def self.craft_query(base_query, filters) # rubocop:disable Metrics/AbcSize
-          # Assume QueryBuilder
-          if query_builder_class
-            unless query_builder_class.ancestors.include?(ActiveRecordFilterQueryBuilder)
-              raise ArgumentError, ':query_builder_class must a class extending FilterQueryBuilder'
-            end
-
-            if filters && query_builder_class
-              base_query = query_builder_class.new(query: base_query, model: model ).build_clause(filters)
-            end
-            # puts "FILTERS_QUERY: #{filters_query.sql}"
-          end
-          
-          base_query
-        end
-      end
-
-    end
-  end
-end

data/lib/praxis/extensions/attribute_filtering.rb

@@ -1,28 +0,0 @@
-require 'praxis/extensions/attribute_filtering/filtering_params'
-require 'praxis/extensions/attribute_filtering/query_builder'
-
-# To include in a controller
-module Praxis
-  module Extensions
-    module AttributeFiltering
-      extend ActiveSupport::Concern
-      
-      def build_query(base_query) # rubocop:disable Metrics/AbcSize
-
-        domain_model = self.media_type&.domain_model
-        raise "No domain model defined for #{self.name}. Cannot use the attribute filtering helpers without it" unless domain_model
-        
-        filters = request.params.filters if request.params&.respond_to?(:filters)
-        base_query = domain_model.craft_query( base_query , filters )
-
-        # TODO: add the field selector...and the pagination...and the ordering...
-        resolved = Praxis::MediaType::FieldResolver.resolve(self.media_type, self.expanded_fields)
-        base_query = FieldSelection::ActiveRecordQuerySelector.new(ds: base_query, model: domain_model.model,
-                                        selectors: identity_map.selectors, resolved: resolved).generate
-
-        # TODO: handle pagination and ordering
-        base_query
-      end
-    end
-  end
-end

data/lib/praxis/extensions/mapper_selectors.rb

@@ -1,16 +0,0 @@
-module Praxis
-  module Extensions
-    module MapperSelectors
-      extend ActiveSupport::Concern
-      include FieldExpansion
-
-      def set_selectors
-        return unless self.media_type.respond_to?(:domain_model) &&
-          self.media_type.domain_model < Praxis::Mapper::Resource
-
-        resolved = Praxis::MediaType::FieldResolver.resolve(self.media_type, self.expanded_fields)
-        identity_map.add_selectors(self.media_type.domain_model, resolved)
-      end
-    end
-  end
-end

data/lib/praxis/media_type_collection.rb

@@ -1,127 +0,0 @@
-module Praxis
-
-  module StructCollection
-    def self.included(klass)
-      klass.instance_eval do
-        include(Enumerable)
-      end
-    end
-
-    def _members=(members)
-      @members = members
-    end
-
-    def _members
-      @members || []
-    end
-
-    def each
-      _members.each { |member| yield(member) }
-    end
-  end
-
-  class MediaTypeCollection < MediaType
-    include Enumerable
-
-    class << self
-      attr_accessor :member_attribute
-    end
-
-    def self.inherited(klass)
-      warn "DEPRECATION: MediaTypeCollection is deprecated and will be removed by 1.0"
-      super
-    end
-
-    def self._finalize!
-      super
-
-      if const_defined?(:Struct, false)
-        self::Struct.instance_eval do
-          include StructCollection
-        end
-      end
-    end
-
-    def self.member_type(type=nil)
-      return ( @member_attribute ? @member_attribute.type : nil) unless type
-      raise ArgumentError, "invalid type: #{type.name}" unless type < MediaType
-
-      member_options = {}
-      @member_attribute = Attributor::Attribute.new type, member_options
-    end
-
-    def self.example(context=nil, options: {})
-      result = super
-
-      context = case context
-      when nil
-        ["#{self.name}-#{values.object_id.to_s}"]
-      when ::String
-        [context]
-      else
-        context
-      end
-
-      members = []
-      size = rand(3) + 1
-
-      size.times do |i|
-        subcontext = context + ["at(#{i})"]
-        members << @member_attribute.example(subcontext)
-      end
-
-      result.object._members = members
-      result
-    end
-
-    def self.load(value,context=Attributor::DEFAULT_ROOT_CONTEXT, **options)
-      if value.kind_of?(String)
-        value = JSON.parse(value)
-      end
-
-      case value
-      when nil, self
-        value
-      when Hash
-        # Need to parse/deserialize first
-        self.new(self.attribute.load(value,context, **options))
-      when Array, Praxis::Mapper::ResourceDecorator
-        object = self.attribute.load({})
-        object._members = value.collect { |subvalue| @member_attribute.load(subvalue) }
-        self.new(object)
-      else
-        # Just wrap whatever value
-        self.new(value)
-      end
-    end
-
-    def self.describe(shallow = false)
-      hash = super
-      hash[:member_attribute] = member_attribute.describe(true)
-      hash
-    end
-
-    def self.member_view(name, using: nil)
-      if using
-        member_view = self.member_type.view(using)
-        return self.views[name] = CollectionView.new(name, self.member_type, member_view)
-      end
-
-      self.views[name]
-    end
-
-
-    def each
-      @object.each { |member| yield(member) }
-    end
-
-
-    def validate(context=Attributor::DEFAULT_ROOT_CONTEXT)
-      errors = super
-      self.each_with_object(errors) do |member, errors|
-        errors.push(*member.validate(context))
-      end
-    end
-
-  end
-end