praxis 2.0.pre.2 → 2.0.pre.7

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

@@ -14,16 +14,11 @@ class Instance < Praxis::MediaType
 
     attribute :volumes, Volume::Collection
     
-    links do
-      link :root_volume
-      link :other_volume, Volume, using: :data_volume
-    end
   end
 
   view :default do
     attribute :id
     attribute :root_volume
-    attribute :links
   end
 
   view :link do
@@ -40,9 +35,6 @@ class Instance < Praxis::MediaType
     attribute :id
     attribute :name
     attribute :root_volume
-    attribute :links do
-      attribute :root_volume
-    end
   end
 
 

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'
 
@@ -23,10 +29,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_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

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