praxis 2.0.pre.5 → 2.0.pre.6

data/spec/spec_app/design/media_types/volume.rb

@@ -9,12 +9,6 @@ class Volume < Praxis::MediaType
 
     attribute :snapshots, Praxis::Collection.of(VolumeSnapshot)
     attribute :snapshots_summary, VolumeSnapshot::CollectionSummary
-
-    links do
-      link :source
-      link :snapshots, VolumeSnapshot::CollectionSummary, using: :snapshots_summary
-    end
-
   end
 
   view :default do
@@ -22,12 +16,6 @@ class Volume < Praxis::MediaType
     attribute :name
     attribute :source
     attribute :snapshots
-
-    attribute :links
-  end
-
-  view :link do
-    attribute :id
   end
 
   class Collection < Praxis::Collection

data/spec/spec_app/design/resources/instances.rb

@@ -44,7 +44,6 @@ module ApiResources
     action :show do
       routing do
         get '/:id'
-        get '/something/:id', name: :alternate
       end
 
       response :ok, media_type: 'application/json'
@@ -144,7 +143,7 @@ module ApiResources
         attribute :id
       end
 
-      payload do
+      payload required: false do
         attribute :when, DateTime
       end
 

data/spec/spec_helper.rb

@@ -7,6 +7,12 @@ $:.unshift File.expand_path('support',__dir__)
 
 require 'bundler'
 Bundler.setup :default, :test
+
+RSpec.configure do |config|
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+end
+
 require 'simplecov'
 SimpleCov.start 'praxis'
 

data/spec/support/spec_media_types.rb

@@ -6,22 +6,13 @@ class Person < Praxis::MediaType
     attribute :id, Integer
     attribute :name, String, example: /[:name:]/
     attribute :href, String, example: proc { |person| "/people/#{person.id}" }
-    attribute :links, Attributor::Collection.of(String),
-      description: 'Here to ensure an explicit links attribute works'
-
   end
 
   view :default do
     attribute :id
     attribute :name
-    attribute :links
   end
 
-  view :link do
-    attribute :id
-    attribute :name
-    attribute :href
-  end
 
   class CollectionSummary < Praxis::MediaType
     attributes do
@@ -29,11 +20,6 @@ class Person < Praxis::MediaType
       attribute :size, Integer
     end
 
-    view :link do
-      attribute :href
-      attribute :size
-    end
-
     view :default do
       attribute :href
     end
@@ -59,14 +45,6 @@ class Address < Praxis::MediaType
     attribute :residents_summary, Person::CollectionSummary
 
     attribute :fields, Praxis::Types::FieldSelector.for(Person)
-
-    links do
-      link :owner
-      link :super, Person, using: :manager
-      link :caretaker, using: :custodian
-      link :residents, using: :residents_summary
-    end
-
   end
 
   view :default do
@@ -74,15 +52,7 @@ class Address < Praxis::MediaType
     attribute :name
     attribute :owner
     attribute :fields
-
-    attribute :links
-  end
-
-  view :link do
-    attribute :id
-    attribute :name
   end
-
 end
 
 
@@ -123,10 +93,6 @@ class Blog < Praxis::MediaType
       example: proc { |blog,ctx| Post::CollectionSummary.example(ctx, href: "#{blog.href}/posts") },
       description: "Summary of information from related Post resources"
 
-    links do
-      link :posts, using: :posts_summary
-      link :owner
-    end
   end
 
   view :default do
@@ -138,7 +104,6 @@ class Blog < Praxis::MediaType
     attribute :timestamps
 
     attribute :owner
-    attribute :links
   end
 
   view :overview do
@@ -146,11 +111,6 @@ class Blog < Praxis::MediaType
     attribute :name
     attribute :description
   end
-
-  view :link do
-    attribute :href
-  end
-
 end
 
 
@@ -185,11 +145,6 @@ class Post < Praxis::MediaType
       attribute :created_at, DateTime
       attribute :updated_at, DateTime
     end
-
-    links do
-      link :author
-      link :blog
-    end
   end
 
   view :default do
@@ -202,23 +157,13 @@ class Post < Praxis::MediaType
     attribute :author
 
     attribute :timestamps
-    attribute :links
-  end
-
-  view :link do
-    attribute :href
   end
 
-
   class CollectionSummary < Praxis::MediaType
     attributes do
       attribute :href, String
       attribute :count, Integer
     end
-
-    view :link do
-      attribute :href
-    end
   end
 end
 
@@ -251,12 +196,6 @@ class User < Praxis::MediaType
 
     attribute :posts_summary, Post::CollectionSummary,
       example: proc { |user,ctx| Post::CollectionSummary.example(ctx, href: "#{user.href}/posts") }
-
-    links do
-      link :posts, using: :posts_summary
-      link :primary_blog
-    end
-
   end
 
   view :default do
@@ -265,8 +204,6 @@ class User < Praxis::MediaType
 
     attribute :first
     attribute :last
-
-    attribute :links
   end
 
   view :extended do
@@ -276,20 +213,10 @@ class User < Praxis::MediaType
     attribute :first
     attribute :last
     attribute :primary_blog, view: :overview
-
-    attribute :links
   end
 
   view :with_post_links do
     attribute :id
     attribute :posts, view: :link
   end
-
-  view :link do
-    attribute :href
-  end
-
-  view :summary do
-    attribute :links
-  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: praxis
 version: !ruby/object:Gem::Version
-  version: 2.0.pre.5
+  version: 2.0.pre.6
 platform: ruby
 authors:
 - Josep M. Blanquer
 - Dane Jensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -147,30 +147,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rake-notes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -353,20 +339,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.20
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.20
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -409,7 +381,7 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-description: 
+description:
 email:
 - blanquer@gmail.com
 - dane.jensen@gmail.com
@@ -420,6 +392,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".simplecov"
 - ".travis.yml"
 - CHANGELOG.md
@@ -431,6 +404,7 @@ files:
 - MAINTAINERS.md
 - README.md
 - Rakefile
+- TODO.md
 - bin/praxis
 - lib/api_browser/.bowerrc
 - lib/api_browser/.editorconfig
@@ -516,6 +490,7 @@ files:
 - lib/api_browser/app/views/types/standalone/default.html
 - lib/api_browser/app/views/types/standalone/struct.html
 - lib/api_browser/bower_template.json
+- lib/api_browser/package-lock.json
 - lib/api_browser/package.json
 - lib/praxis.rb
 - lib/praxis/action_definition.rb
@@ -562,7 +537,13 @@ 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/active_record_patches.rb
+- lib/praxis/extensions/attribute_filtering/active_record_patches/5x.rb
+- lib/praxis/extensions/attribute_filtering/active_record_patches/6_0.rb
+- lib/praxis/extensions/attribute_filtering/active_record_patches/6_1_plus.rb
+- lib/praxis/extensions/attribute_filtering/filter_tree_node.rb
 - lib/praxis/extensions/attribute_filtering/filtering_params.rb
 - lib/praxis/extensions/attribute_filtering/sequel_filter_query_builder.rb
 - lib/praxis/extensions/field_expansion.rb
@@ -570,6 +551,13 @@ files:
 - 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/pagination.rb
+- lib/praxis/extensions/pagination/active_record_pagination_handler.rb
+- lib/praxis/extensions/pagination/header_generator.rb
+- lib/praxis/extensions/pagination/ordering_params.rb
+- lib/praxis/extensions/pagination/pagination_handler.rb
+- lib/praxis/extensions/pagination/pagination_params.rb
+- lib/praxis/extensions/pagination/sequel_pagination_handler.rb
 - lib/praxis/extensions/rails_compat.rb
 - lib/praxis/extensions/rails_compat/request_methods.rb
 - lib/praxis/extensions/rendering.rb
@@ -577,7 +565,7 @@ files:
 - lib/praxis/handlers/json.rb
 - lib/praxis/handlers/plain.rb
 - lib/praxis/handlers/www_form.rb
-- lib/praxis/handlers/xml.rb
+- lib/praxis/handlers/xml-sample.rb
 - lib/praxis/links.rb
 - lib/praxis/mapper/active_model_compat.rb
 - lib/praxis/mapper/resource.rb
@@ -592,6 +580,7 @@ files:
 - lib/praxis/plugin.rb
 - lib/praxis/plugin_concern.rb
 - lib/praxis/plugins/mapper_plugin.rb
+- lib/praxis/plugins/pagination_plugin.rb
 - lib/praxis/plugins/rails_plugin.rb
 - lib/praxis/request.rb
 - lib/praxis/request_stages/action.rb
@@ -649,17 +638,19 @@ files:
 - spec/praxis/config_spec.rb
 - spec/praxis/controller_spec.rb
 - spec/praxis/dispatcher_spec.rb
+- spec/praxis/extensions/attribute_filtering/active_record_filter_query_builder_spec.rb
+- spec/praxis/extensions/attribute_filtering/filter_tree_node_spec.rb
+- spec/praxis/extensions/attribute_filtering/filtering_params_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/pagination/active_record_pagination_handler_spec.rb
 - spec/praxis/extensions/rendering_spec.rb
+- spec/praxis/extensions/support/spec_resources_active_model.rb
+- spec/praxis/extensions/support/spec_resources_sequel.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/mapper/resource_spec.rb
 - spec/praxis/mapper/selector_generator_spec.rb
 - spec/praxis/media_type_identifier_spec.rb
@@ -752,7 +743,7 @@ homepage: https://github.com/praxis/praxis
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -767,9 +758,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Building APIs the way you want it.
 test_files: []

data/spec/praxis/handlers/xml_spec.rb

@@ -1,177 +0,0 @@
-require 'spec_helper'
-
-describe Praxis::Handlers::XML do
-
-  describe '#parse' do
-    shared_examples 'xml something' do
-      it 'works' do
-        expect(subject.parse(parsed.to_xml)).to eq(parsed)
-      end
-    end
-
-    #  XML_TYPE_NAMES = {
-    #    "Symbol"     => "symbol",
-    #    "Fixnum"     => "integer",
-    #    "Bignum"     => "integer",
-    #    "BigDecimal" => "decimal",
-    #    "Float"      => "float",
-    #    "TrueClass"  => "boolean",
-    #    "FalseClass" => "boolean",
-    #    "Date"       => "date",
-    #    "DateTime"   => "dateTime",
-    #    "Time"       => "dateTime"
-    #  }
-
-    context "Parsing symbols" do
-      let(:xml){ '<objects type="array"><object type="symbol">a_symbol</object></objects>' }
-      let(:parsed){ [:a_symbol] }
-      it_behaves_like 'xml something'
-    end
-
-    context "Parsing integers" do
-      let(:xml){ '<objects type="array"><object type="integer">1234</object></objects>' }
-      let(:parsed){ [1234] }
-      it_behaves_like 'xml something'
-    end
-
-    context "Parsing decimals" do
-      let(:xml){ '<objects type="array"><object type="decimal">0.1</object></objects>' }
-      let(:parsed){ [0.1] }
-      it_behaves_like 'xml something'
-    end
-
-    context "Parsing floats" do
-      let(:xml){ '<objects type="array"><object type="float">0.1</object></objects>' }
-      let(:parsed){ [0.1] }
-      it_behaves_like 'xml something'
-    end
-
-    context "Parsing booleans" do
-      context "that are true" do
-        let(:xml){ '<objects type="array"><object type="boolean">true</object></objects>' }
-        let(:parsed){ [true] }
-        it_behaves_like 'xml something'
-      end
-      context "that are false" do
-        let(:xml){ '<objects type="array"><object type="boolean">false</object></objects>' }
-        let(:parsed){ [false] }
-        it_behaves_like 'xml something'
-
-      end
-    end
-
-    context "Parsing dates" do
-      let(:xml){ '<objects type="array"><object type="date">2001-01-01</object></objects>' }
-      let(:parsed){ [Date.parse("2001-01-01")] }
-      it_behaves_like 'xml something'
-    end
-
-    context "Parsing dateTimes" do
-      let(:xml){ '<objects type="array"><object type="dateTime">2015-03-13T19:34:40-07:00</object></objects>' }
-      let(:parsed){ [DateTime.parse("2015-03-13T19:34:40-07:00")] }
-      it_behaves_like 'xml something'
-    end
-
-    context "Parsing hashes" do
-      context "that are empty" do
-        let(:xml){ "<hash></hash>" }
-
-        it 'get converted to empty strings' do
-          expect(subject.parse(xml)).to eq('')
-        end
-      end
-
-      context "with a couple of elements" do
-        let(:xml){ '<hash><one type="integer">1</one><two type="integer">2</two></hash>' }
-        let(:parsed){ {"one"=>1, "two"=>2} }
-        it_behaves_like 'xml something'
-      end
-      context "with hyphenated elements" do
-        let(:xml){ '<hash><part-one type="integer">1</part-one><part-two type="integer">2</part-two></hash>' }
-        let(:parsed){ {"part_one"=>1, "part_two"=>2} }
-        it_behaves_like 'xml something'
-      end
-      context "with a nested hash" do
-        let(:xml){ '<hash><one type="integer">1</one><sub_hash><first>hello</first></sub_hash></hash>' }
-        let(:parsed){ {"one"=>1, "sub_hash"=>{"first"=>"hello"} } }
-        it_behaves_like 'xml something'
-      end
-      context "with a nested array" do
-        let(:xml){ '<hash><one type="integer">1</one><two type="array"><object>just text</object></two></hash>' }
-        let(:parsed){ {"one"=>1, "two" => ["just text"] } }
-        it_behaves_like 'xml something'
-      end
-
-    end
-
-    context "Parsing an Array" do
-      context 'with a couple of simple elements in it' do
-        let(:xml){ '<objects type="array"><object>just text</object><object type="integer">1</object></objects>' }
-        let(:parsed){ ["just text", 1] }
-        it_behaves_like 'xml something'
-      end
-      context "with a nested hash" do
-        let(:xml){ '<objects type="array"><object>just text</object><object><one type="integer">1</one></object></objects>' }
-        let(:parsed){ ["just text", { "one" => 1}] }
-        it_behaves_like 'xml something'
-      end
-    end
-
-    context "Parsing XML strings created with .to_xml" do
-      let(:xml){ parsed.to_xml }
-      context 'array with a couple of simple elements in it' do
-        let(:parsed){ ["just text", 1] }
-        it_behaves_like 'xml something'
-      end
-      context 'a hash with a couple of simple elements in it' do
-        let(:parsed){ { "one"=>"just text", "two"=> 1 } }
-        it_behaves_like 'xml something'
-      end
-      context 'a array with elements of all types' do
-        let(:parsed){ ["just text",:a,1,BigDecimal(100),0.1,true,Date.new] }
-        it_behaves_like 'xml something'
-      end
-      context 'a hash with a complex substructure' do
-        let(:parsed) do
-          Hash(
-            "text" => "just text",
-            "symbol" => :a,
-            "num" => 1,
-            "bd" => BigDecimal(100),
-            "float" => 0.1,
-            "truthyness" => true,
-            "day" => Date.new,
-            "empty_string" => ""
-          )
-        end
-        it_behaves_like 'xml something'
-      end
-
-      context "transformed characters when using .to_xml" do
-        context 'underscores become dashes' do
-          let(:xml){ {"one_thing"=>1, "two_things"=>2}.to_xml  }
-          it do
-            doc = Nokogiri::XML(xml)
-
-            expect(doc.search('one-thing')).to_not be_empty
-            expect(doc.search('two-things')).to_not be_empty
-          end
-        end
-        context 'spaces become dashes' do
-          let(:xml){ {"one thing"=>1, "two things"=>2}.to_xml  }
-          let(:parsed){ {"one-thing"=>1, "two-things"=>2} }
-          it do
-            doc = Nokogiri::XML(xml)
-
-            expect(doc.search('one-thing')).to_not be_empty
-            expect(doc.search('two-things')).to_not be_empty
-          end
-        end
-      end
-    end
-
-    describe '#generate' do
-      it 'has tests'
-    end
-  end
-end