trax_controller 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 073eda93c53968cf904385eae5a197bc0f32163a
-  data.tar.gz: e3e923554c0072ee104eb984590706b103459850
+  metadata.gz: bdbaf7390613351761a1a3babb39b491bcdf7b1d
+  data.tar.gz: ea407ce95d7f6a417606e8ea8a022bc4f49ce392
 SHA512:
-  metadata.gz: 81311299663e3952883c591f091e96fd749058088db5afc30fa3878f58c9778552eadbe6cb303c5b6c675e9553c44e8b00414b15e911b2932713651f2cbf964e
-  data.tar.gz: 46174f18c3e3f0bb6e9d648fb6443122e3a13b619ad7c6f2ee73c9e42e3fd97a3b8477400338e79394e0a989f2378c4ae95c4cbd51df338940cc300480028f37
+  metadata.gz: 98358ac5bc8959c7abd30f3c8a80b1eeeeba40a25944997ee70e70a864940b4d6a35bd61b8304be3b3c730b740cbb7f6e7a209a04ed6313e9d63b1f040b3ff49
+  data.tar.gz: 821754fbed325e38de212341e8b6b6bbd583a248debf91b75edf3278fef22d7754a2fc8824243b10de9dec1c165da376c748f8be44999269987b7c155d8f3653

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+script: bundle exec rspec
+rvm:
+  - 2.2
+  - 2.1
+notifications:
+  email: false

data/Gemfile

@@ -1,5 +1,11 @@
-
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in trax_controller.gemspec
 gemspec
+# gem 'active_model_serializers', :github => 'rails-api/active_model_serializers', :branch => "0-10-stable"
+gem 'active_model_serializers', :github => 'rails-api/active_model_serializers', :branch => "0-10-stable", :ref => "6aba26049154712d65176708ffad55fcfe512ca0"
+
+group :test do
+  gem 'activerecord'
+  gem 'rspec-rails'
+end

data/Guardfile

@@ -0,0 +1,37 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :bundler do
+  watch('Gemfile')
+  # Uncomment next line if your Gemfile contains the `gemspec' command.
+  # watch(/^.+\.gemspec/)
+end
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^spec/internal/app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/trax/controllers/#{m[1]}_controller_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('spec/rails_helper.rb')                       { "spec" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end

data/config.ru

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

data/lib/Guardfile

@@ -0,0 +1,38 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :bundler do
+  watch('Gemfile')
+  # Uncomment next line if your Gemfile contains the `gemspec' command.
+  # watch(/^.+\.gemspec/)
+end
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^spec/internal/app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/trax/controllers/#{m[1]}_controller_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  # watch('spec/internal/app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch('spec/rails_helper.rb')                       { "spec" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end

data/lib/trax/controller/action_types.rb

@@ -0,0 +1,29 @@
+module Trax
+  module Controller
+    module ActionTypes
+      extend ::ActiveSupport::Concern
+      #todo: pretty janky but works for now
+
+      included do
+        class_attribute :action_types
+
+        self.action_types = Hashie::Mash.new({
+          :collection => [:index, :search],
+          :resource => [ :show, :delete, :update, :create, :login ]
+        })
+      end
+
+      def current_action
+        :"#{request.params["action"]}"
+      end
+
+      def collection_action?
+        self.class.action_types[:collection].include?(current_action)
+      end
+
+      def resource_action?
+        self.class.action_types[:resource].include? current_action
+      end
+    end
+  end
+end

data/lib/trax/controller/actions.rb

@@ -7,80 +7,114 @@ module Trax
         respond_to :json
       end
 
-      def index
+      def index(collection: _collection, meta: collection_response_meta, serializer: collection_serializer, root: collection_root)
         render :json => collection,
-        :meta => collection_response_meta,
-        :each_serializer => collection_serializer,
-        :root => collection_root
+               :meta => meta,
+               :each_serializer => serializer,
+               :root => root
       end
 
-      def create
+      #setting resource ivar stops it from trying to create via the default behavior
+      def create(success_status:201, failure_status: :unprocessable_entity, **options)
+        set_resource_ivar(options[:resource]) if options.has_key?(:resource)
+
         create! do |success, failure|
           success.json do
-            render_resource(201)
+            render_resource(success_status, **options)
           end
 
           failure.json do
-            render_errors(:unprocessable_entity, *resource.errors.full_messages)
+            render_errors(failure_status, **options)
           end
         end
       end
 
-      def update
+      def update(success_status:200, failure_status: :unprocessable_entity, **options)
+        set_resource_ivar(options[:resource]) if options.has_key?(:resource)
+
         update! do |success, failure|
           success.json do
-            render_resource
+            render_resource(success_status, **options)
           end
 
           failure.json do
-            render_errors(:unprocessable_entity, *resource.errors.full_messages)
+            render_errors(failure_status, **options)
           end
         end
       end
 
-      def destroy
+      def destroy(success_status:200, failure_status: :method_not_allowed, **options)
+        set_resource_ivar(options[:resource]) if options.has_key?(:resource)
+
         destroy! do |success, failure|
           success.json do
-            render_resource
+            render_resource(success_status, **options)
           end
 
           failure.json do
-            render_errors(:method_not_allowed, *resource_response_meta[:errors])
+            render_errors(failure_status, **options)
           end
         end
       end
 
-      def show
-        render_resource
+      def show(*args, **options)
+        render_resource(*args, **options)
       end
 
       private
 
-      def render_resource(status = :ok)
-        render json: resource, serializer: resource_serializer, meta: resource_response_meta, status: status, scope: serialization_scope
+      def collection_serializer
+        resource_serializer
       end
 
-      def render_errors(status, *errors)
-        errors = errors.map { |str| str.last == "." ? str : str << "." }
-        render json: { meta: { errors: errors } }, status: status, serializer: nil
+      def collection_root
+        controller_name
       end
 
-      def collection_serializer
-        resource_serializer
+      #this is to avoid circular reference argument that we would otherwise get with render_resource
+      def _collection
+        collection
       end
 
-      def resource_serializer
-        "#{resource_class.name.demodulize}Serializer".constantize
+      def _resource
+        resource
       end
 
-      def collection_root
-        controller_name
+      def resource_serializer
+        "#{resource_class.name.demodulize}Serializer".constantize
       end
 
       def resource_root
         collection_root.singularize
       end
 
+      #will set the resource instance var to whatever you pass it, then render
+      def render_resource!(object, **options)
+        instance_variable_set(:"@#{self.class.resources_configuration[:self][:instance_name]}", object)
+        render_resource(**options)
+      end
+
+      def render_resource(status = :ok, resource: _resource, serializer: resource_serializer, meta: resource_response_meta, scope: serialization_scope, root: resource_root)
+        render json: resource, serializer: serializer, meta: meta, status: status, scope: scope, root: root
+      end
+
+      def render_errors(status = :unprocessable_entity, error_messages_hash:{}, **options)
+        errors = error_messages_hash.merge(resource_error_messages(**options))
+        render json: { meta: { errors: errors } }, status: status, serializer: nil
+      end
+
+      def resource_error_messages(resource: _resource, **options)
+        return nil unless resource.errors.any?
+
+        resource.errors.inject({}) do |result, error|
+          field = "#{error[0]}"
+          message = error[1]
+          result[field] = message.downcase.include?(field) ? message : "#{field.titleize} #{message}"
+          result
+        end
+      end
+
+      #this metthod is in limbo because it appears this was removed from master branch of AMS?
       def serialized_resource
         @serialized_resource ||= resource_serializer.new(resource, scope: serialization_scope)
       end

data/lib/trax/controller/collection/pageable.rb

@@ -0,0 +1,47 @@
+module Trax
+  module Controller
+    module Collection
+      module Pageable
+        extend ::ActiveSupport::Concern
+
+        PAGINATION_META_METHODS = [
+          :current_page,
+          :per_page,
+          :size,
+          :total_pages,
+          :total_entries
+        ].freeze
+
+        included do
+          collection_defaults :page => 1, :per_page => 25
+        end
+
+        def pagination_params
+          params[:page] ||= self.class.collection_options.page
+          params[:per_page] ||= self.class.collection_options.per_page
+
+          @pagination_params ||= { :page => params[:page], :per_page => params[:per_page] }
+        end
+
+        def collection
+          @collection ||= super.paginate(pagination_params)
+        end
+
+        def collection_pagination_meta
+          @collection_pagination_meta ||= ::Trax::Controller::Collection::Pageable::PAGINATION_META_METHODS.inject({}) do |h, key|
+            h[key] = collection.try(key)
+            h
+          end
+        end
+
+        def collection_response_meta
+          if collection_action?
+            super.merge!(:pagination => collection_pagination_meta)
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trax/controller/collection/searchable.rb

@@ -4,22 +4,12 @@ module Trax
       module Searchable
         extend ::ActiveSupport::Concern
 
-        def search
-          render :json => search_collection,
-                 :meta => collection_response_meta,
-                 :each_serializer => collection_serializer,
-                 :root => collection_root
+        def search(**options)
+          index(**options)
         end
 
-        def search_collection
-          @search_collection ||= begin
-            search_keys = self.class.scopes_configuration.keys
-
-            search_keys.inject(collection.all) do |result, key|
-              relation = params.has_key?("#{key}") ? result.__send__(key, params[key]) : result
-              relation
-            end.all
-          end
+        def collection_response_meta
+          super.merge!(:search_scopes => current_scopes)
         end
       end
     end

data/lib/trax/controller/collection.rb

@@ -6,6 +6,7 @@ module Trax
       autoload :Base
       autoload :ResponseMeta
       autoload :Searchable
+      autoload :Pageable
     end
   end
 end

data/lib/trax/controller/engine.rb

@@ -0,0 +1,9 @@
+module Trax
+  module Controller
+    class Engine < ::Rails::Engine
+      initializer 'trax_controller.active_model_serializers' do |app|
+        ::ActiveModel::Serializer.config.adapter = Trax::Controller::Serialization::Adapters::Json
+      end
+    end
+  end
+end

data/lib/trax/controller/resource/base.rb

@@ -9,7 +9,6 @@ module Trax
         end
 
         include ::Trax::Controller::Resource::ResponseMeta
-        include ::Trax::Controller::Resource::Errors
       end
     end
   end

data/lib/trax/controller/serialization/adapters/json.rb

@@ -0,0 +1,63 @@
+# This adapter is a workaround for
+# https://github.com/rails-api/active_model_serializers/issues/835 until
+# https://github.com/rails-api/active_model_serializers/pull/952 is merged
+
+module Trax
+  module Controller
+    module Serialization
+      module Adapters
+        class Json < ActiveModel::Serializer::Adapter::Json
+          def serializable_hash(options={})
+            is_collection? ? collection_serializable_hash(options) : resource_serializable_hash(options)
+          end
+
+          private
+
+          def collection_result
+            @collection_result ||= []
+          end
+
+          def collection_serializable_hash(options={})
+            _result = collection_result + serializer.map { |s| FlattenJson.new(s).serializable_hash(options) }
+            { root =>  _result }
+          end
+
+          def is_collection?
+            serializer.respond_to?(:each)
+          end
+
+          def resource_result
+            @resource_result ||= {}
+          end
+
+          def resource_serializable_hash(options={})
+            cache_check(serializer){ resource_result.merge!(serializer.attributes(options)) }
+            serialize_resource_associations
+            { root => resource_result }
+          end
+
+          def serialize_resource_associations
+            serializer.associations.each do |association|
+              association_serializer = association.serializer
+              association_options = association.options
+
+              if association_serializer.respond_to?(:each)
+                array_serializer = association_serializer
+
+                resource_result[association.key] = array_serializer.map do |item|
+                  cache_check(item) { FlattenJson.new(item).serializable_hash }
+                end
+              else
+                resource_result[association.key] = if association_serializer && association_serializer.object
+                  cache_check(association_serializer) { FlattenJson.new(association_serializer).serializable_hash }
+                elsif association_options[:virtual_value]
+                  association_options[:virtual_value]
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trax/controller/serialization/adapters.rb

@@ -0,0 +1,11 @@
+module Trax
+  module Controller
+    module Serialization
+      module Adapters
+        extend ::ActiveSupport::Autoload
+
+        autoload :Json
+      end
+    end
+  end
+end

data/lib/trax/controller/serialization.rb

@@ -0,0 +1,9 @@
+module Trax
+  module Controller
+    module Serialization
+      extend ::ActiveSupport::Autoload
+
+      autoload :Adapters
+    end
+  end
+end

data/lib/trax/controller.rb

@@ -2,6 +2,9 @@ require 'hashie/dash'
 require 'hashie/mash'
 require 'trax_core'
 require 'inherited_resources'
+require 'will_paginate'
+require 'active_model_serializers'
+require 'has_scope'
 
 module Trax
   module Controller
@@ -14,22 +17,19 @@ module Trax
 
     autoload :Actions
     autoload :Collection
+    autoload :Engine
     autoload :Resource
     autoload :InheritResources
+    autoload :ActionTypes
+    autoload :Engine
+    autoload :Serialization
 
     include ::Trax::Controller::InheritResources
     include ::Trax::Controller::Collection::Base
     include ::Trax::Controller::Resource::Base
     include ::Trax::Controller::Actions
-
-    # inherit_resources
-
-
-
-    # included do
-    #   inherit_resources
-    # end
-
-
+    include ::Trax::Controller::ActionTypes
   end
 end
+
+::Trax::Controller::Engine if defined?(::Rails)

data/lib/trax_controller/version.rb

@@ -1,3 +1,3 @@
 module TraxController
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/internal/app/controllers/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/spec/internal/app/controllers/categories_controller.rb

@@ -0,0 +1,53 @@
+class CategoriesController < ::ApplicationController
+  include ::Trax::Controller
+  include ::Trax::Controller::Collection::Pageable
+
+  defaults :resource_class => ::Category
+
+  has_scope :by_id
+
+  actions :index, :show, :create, :update, :destroy
+
+  def create_with_modified_response_codes
+    create(success_status: :accepted, failure_status: 404)
+  end
+
+  def create_with_modified_resource
+    @widget = Widget.create(widget_params)
+    create(resource: @widget, root: 'widget', serializer: WidgetSerializer)
+  end
+
+  def show_without_products
+    render_resource(serializer: ::CategoriesSerializer)
+  end
+
+  def widget
+    render_resource(serializer: ::CategoriesSerializer, resource: Widget.new(:name => 'whatever'))
+  end
+
+  def widget_with_renamed_root
+    render_resource(serializer: ::CategoriesSerializer, root: 'widget', resource: Widget.new(:name => 'whatever'))
+  end
+
+  def show_by_calling_original_action
+    show(serializer: ::CategoriesSerializer, root: 'show_by_calling_original_action')
+  end
+
+  private
+
+  def category_params
+    params.require(:category).permit(:name)
+  end
+
+  def widget_params
+    params.require(:widget).permit(:name, :quantity)
+  end
+
+  def resource_serializer
+    ::CategorySerializer
+  end
+
+  def collection_serializer
+    ::CategoriesSerializer
+  end
+end

data/spec/internal/app/controllers/products_controller.rb

@@ -0,0 +1,14 @@
+class ProductsController < ::ApplicationController
+  include ::Trax::Controller
+  include ::Trax::Controller::Collection::Pageable
+
+  defaults :resource_class => ::Product
+
+  has_scope :by_id
+
+  actions :index, :show, :create, :update, :destroy
+
+  def product_params
+    params.require(:product).permit(:name, :category_id)
+  end
+end

data/spec/internal/app/models/category.rb

@@ -0,0 +1,5 @@
+class Category < ::ActiveRecord::Base
+  validates :name, :length => { :minimum => 5 }
+
+  has_many :products
+end

data/spec/internal/app/models/product.rb

@@ -0,0 +1,5 @@
+class Product < ::ActiveRecord::Base
+  validates_presence_of(:name)
+
+  belongs_to :category
+end

data/spec/internal/app/models/widget.rb

@@ -0,0 +1,4 @@
+class Widget < ::ActiveRecord::Base
+  validates :name, :length => { :minimum => 5 }
+  validates :quantity, :numericality => { :greater_than => 0 }
+end

data/spec/internal/app/serializers/categories_serializer.rb

@@ -0,0 +1,3 @@
+class CategoriesSerializer < ::ActiveModel::Serializer
+  attributes :name
+end

data/spec/internal/app/serializers/category_serializer.rb

@@ -0,0 +1,9 @@
+class CategorySerializer < ::ActiveModel::Serializer
+  attributes :name, :slug
+
+  def slug
+    name.parameterize('-')
+  end
+
+  has_many :products, :serializer => ::ProductSerializer
+end

data/spec/internal/app/serializers/product_serializer.rb

@@ -0,0 +1,3 @@
+class ProductSerializer < ::ActiveModel::Serializer
+  attributes :id, :name, :quantity, :category_id
+end

data/spec/internal/app/serializers/widget_serializer.rb

@@ -0,0 +1,3 @@
+class WidgetSerializer < ::ActiveModel::Serializer
+  attributes :id, :name, :quantity
+end

data/spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/combustion_test.sqlite

data/spec/internal/config/routes.rb

@@ -0,0 +1,17 @@
+Rails.application.routes.draw do
+  resources :products, :defaults => { :format => :json }
+  resources :categories, :defaults => { :format => :json } do
+    collection do
+      post 'create_with_modified_response_codes'
+      post 'create_with_modified_resource'
+    end
+
+    member do
+      delete 'destroy_with_modified_response_codes'
+      get 'show_without_products'
+      get 'show_by_calling_original_action'
+      get 'widget'
+      get 'widget_with_renamed_root'
+    end
+  end
+end

data/spec/internal/db/schema.rb

@@ -0,0 +1,61 @@
+
+::ActiveRecord::Schema.define do
+  create_table "products", :force => true do |t|
+    t.string   "name"
+    t.integer  "category_id"
+    t.integer  "user_id"
+    t.decimal  "price"
+    t.integer  "quantity"
+    t.boolean  "in_stock"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "categories", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "first_name"
+    t.string   "last_name"
+    t.string   "email"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "widgets", :force => true do |t|
+    t.string "uuid"
+    t.string "name"
+    t.string  "subdomain"
+    t.string  "website"
+    t.integer  "status"
+    t.integer  "quantity"    
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "people", :force => true do |t|
+    t.string "name"
+    t.string "uuid"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "staplers", :force => true do |t|
+    t.string "name"
+    t.string "type"
+    t.integer "attribute_set_id"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "swingline_stapler_attribute_sets", :force => true do |t|
+    t.float "speed"
+    t.string "owner"
+
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/spec_helper.rb

@@ -1,18 +1,25 @@
 require 'rubygems'
 require 'bundler'
+require 'combustion'
+require 'pry'
+require 'active_record'
+
+::Combustion.schema_format = :ruby
+::Combustion.initialize! :all
+
+require 'rspec/rails'
 require 'simplecov'
 require 'pry'
 require 'trax_controller'
 
-SimpleCov.start do
+::SimpleCov.start do
   add_filter '/spec/'
 end
 
-RSpec.configure do |config|
-  config.before(:suite) do
-  end
+::RSpec.configure do |config|
+  config.include RSpec::Rails::RequestExampleGroup, type: :feature
 end
 
-Bundler.require(:default, :development, :test)
+::Bundler.require(:default, :development, :test)
 
 ::Dir["#{::File.dirname(__FILE__)}/support/*.rb"].each {|f| require f }

data/spec/trax/controller_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
-
 describe ::Trax::Controller do
-  it {
-    should respond_to(:defaults)
-  }
+
 end

data/spec/trax/controllers/categories_controller_spec.rb

@@ -0,0 +1,206 @@
+require 'spec_helper'
+
+::RSpec.describe CategoriesController, :type => :controller do
+  before(:all) do
+    @shoes_category = ::Category.create(:name => 'mens shoes')
+    @watches_category = ::Category.create(:name => 'mens watches')
+
+    @product1 = ::Product.create(:name => "DC Villan", :quantity => 0, :in_stock => false, :category => @shoes_category)
+    @product2 = ::Product.create(:name => "Nixon Rotolog", :quantity => 2, :in_stock => true, :category => @watches_category)
+  end
+
+  context '#index' do
+    it {
+      get :index
+      expect(response).to be_ok
+      json = ::JSON.parse(response.body)
+      expect(json).to have_key('categories')
+    }
+
+    context "serialization of associations" do
+      it {
+        get :index
+        json = ::JSON.parse(response.body)
+        expect(json["categories"][0]).to_not have_key('products')
+      }
+    end
+  end
+
+  context "#show" do
+    context "serialization of associations" do
+      it {
+        get :show, :id => @shoes_category.id
+        json = ::JSON.parse(response.body)
+        expect(json["category"]).to have_key('products')
+        expect(json["category"]["products"][0]["name"]).to eq("DC Villan")
+      }
+    end
+  end
+
+  context "overriding default resource actions and render resource" do
+    describe "#show_without_products" do
+      it {
+        get :show_without_products, :id => @shoes_category.id
+        json = ::JSON.parse(response.body)
+        expect(json["category"]).to_not have_key('products')
+      }
+    end
+
+    describe "#widget" do
+      it "render resource can have resource passed to it" do
+        get :widget, :id => @shoes_category.id
+        json = ::JSON.parse(response.body)
+        expect(json["category"]["name"]).to eq "whatever"
+      end
+    end
+
+    describe "#widget_with_renamed_root" do
+      it "allows root key to be overridden" do
+        get :widget_with_renamed_root, :id => @shoes_category.id
+        json = ::JSON.parse(response.body)
+        expect(json["widget"]["name"]).to eq "whatever"
+      end
+    end
+
+    describe "#show_by_calling_original_action" do
+      it "allows show method itself to be called passing in overridden options" do
+        get :show_by_calling_original_action, :id => @shoes_category.id
+        json = ::JSON.parse(response.body)
+        expect(json["show_by_calling_original_action"]["name"]).to eq @shoes_category.name
+      end
+    end
+  end
+
+  context '#create_with_modified_resource' do
+    let(:widget_name) { 'My New Widget' }
+    let(:widget_quantity) { 10 }
+    let(:params){ {
+      :format => :json,
+      :widget => widget_params
+    }}
+    let(:widget_params) { { :name => widget_name, :quantity => widget_quantity } }
+    before { post :create_with_modified_resource, params }
+
+    context 'success' do
+      it { expect(response).to be_successful }
+      it {
+        json = JSON.parse response.body
+        expect(json).to have_key("widget")
+      }
+      it { expect(response.status).to eq 201 }
+    end
+
+    context 'failure' do
+      let(:widget_name) { 'My New Widget' }
+      let(:widget_quantity) { 0 }
+
+      context 'default failure action' do
+        before { post :create_with_modified_resource, params }
+
+        it { expect(response).to_not be_successful }
+        it {
+          json = JSON.parse response.body
+          expect(json["meta"]["errors"]).to have_key("quantity")
+        }
+        it { expect(response.status).to eq 422 }
+      end
+    end
+  end
+
+  context '#create' do
+    let(:category_name) { 'My New Category'}
+    let(:params){ {
+      :format => :json,
+      :category => category_params
+    }}
+    let(:category_params) { { :name => category_name } }
+
+    context 'success' do
+      context 'with default create action' do
+        before { post :create, params }
+
+        it { expect(response).to be_successful }
+        it {
+          json = JSON.parse response.body
+          expect(json).to have_key("category")
+        }
+        it { expect(response.status).to eq 201 }
+      end
+
+      context 'allows overrides' do
+        context 'response code override' do
+          before { post :create_with_modified_response_codes, params }
+
+          it { expect(response.status).to eq 202 }
+        end
+      end
+    end
+
+    context 'failure' do
+      let(:category_name) { 'a' }
+
+      context 'default create action' do
+        before { post :create, params }
+
+        it { expect(response).to_not be_successful }
+        it {
+          json = JSON.parse response.body
+          expect(json["meta"]["errors"]).to have_key("name")
+        }
+        it { expect(response.status).to eq 422 }
+      end
+
+      context 'allows overrides' do
+        context 'response code override' do
+          before { post :create_with_modified_response_codes, params }
+
+          it { expect(response.status).to eq 404 }
+        end
+      end
+    end
+  end
+
+  context '#update' do
+    let(:category) { ::Category.create(:name => category_name) }
+    let(:category_name) { 'My New Category'}
+    let(:new_category_name) { 'mynewcategoryname' }
+    let(:params){ {
+      :format => :json,
+      :id => category.id,
+      :category => category_params
+    }}
+    let(:category_params) { { :name => new_category_name } }
+
+    context 'success' do
+      context 'with default update action' do
+        before { put(:update, params) }
+
+        it { expect(response).to be_successful }
+        it {
+          json = JSON.parse response.body
+          expect(json).to have_key("category")
+        }
+        it {
+          json = JSON.parse response.body
+          expect(json["category"]["name"]).to eq(new_category_name)
+        }
+        it { expect(response.status).to eq 200 }
+      end
+    end
+
+    context 'failure' do
+      let(:new_category_name) { 'a' }
+
+      context 'default update action' do
+        before { put :update, params }
+
+        it { expect(response).to_not be_successful }
+        it {
+          json = JSON.parse response.body
+          expect(json["meta"]["errors"]).to have_key("name")
+        }
+        it { expect(response.status).to eq 422 }
+      end
+    end
+  end
+end

data/spec/trax/controllers/products_controller_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+::RSpec.describe ProductsController, :type => :controller do
+  before(:all) do
+    @product1 = ::Product.create(:name => "apple imac", :quantity => 0, :in_stock => false)
+    @product2 = ::Product.create(:name => "apple macbook", :quantity => 2, :in_stock => true)
+    @product3 = ::Product.create(:name => "apple ipod", :quantity => 3, :in_stock => true)
+  end
+
+  context '#index' do
+    it {
+      get :index
+      expect(response).to be_ok
+      json = JSON.parse response.body
+      expect(json).to have_key('products')
+    }
+
+    context 'pagination' do
+      ["current_page", "per_page", "size", "total_pages", "total_entries"].each do |k|
+        it {
+          get :index
+          json = JSON.parse response.body
+          expect(json["meta"]["pagination"]).to have_key(k)
+        }
+      end
+
+
+    end
+  end
+
+  describe '#show' do
+    it 'shows' do
+      get :show, id: @product1.id
+
+      expect(response).to be_ok
+      json = JSON.parse response.body
+      expect(json).to have_key('product')
+    end
+  end
+end

data/trax_controller.gemspec

@@ -19,8 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "trax_core"
+  spec.add_dependency "will_paginate"
+  spec.add_dependency "has_scope"
   spec.add_development_dependency "rails"
   spec.add_development_dependency "inherited_resources"
+  spec.add_development_dependency 'combustion', '~> 0.5.3'
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3"
@@ -35,4 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-bundler', '~> 2'
   spec.add_development_dependency 'rb-fsevent'
   spec.add_development_dependency 'terminal-notifier-guard'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trax_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trax_core
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: has_scope
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -256,26 +298,54 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- config.ru
+- lib/Guardfile
 - lib/trax.rb
 - lib/trax/controller.rb
+- lib/trax/controller/action_types.rb
 - lib/trax/controller/actions.rb
 - lib/trax/controller/collection.rb
 - lib/trax/controller/collection/base.rb
+- lib/trax/controller/collection/pageable.rb
 - lib/trax/controller/collection/response_meta.rb
 - lib/trax/controller/collection/searchable.rb
+- lib/trax/controller/engine.rb
 - lib/trax/controller/inherit_resources.rb
 - lib/trax/controller/resource.rb
 - lib/trax/controller/resource/base.rb
-- lib/trax/controller/resource/errors.rb
 - lib/trax/controller/resource/response_meta.rb
+- lib/trax/controller/serialization.rb
+- lib/trax/controller/serialization/adapters.rb
+- lib/trax/controller/serialization/adapters/json.rb
 - lib/trax_controller.rb
 - lib/trax_controller/version.rb
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/categories_controller.rb
+- spec/internal/app/controllers/products_controller.rb
+- spec/internal/app/models/category.rb
+- spec/internal/app/models/product.rb
+- spec/internal/app/models/widget.rb
+- spec/internal/app/serializers/categories_serializer.rb
+- spec/internal/app/serializers/category_serializer.rb
+- spec/internal/app/serializers/product_serializer.rb
+- spec/internal/app/serializers/widget_serializer.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
 - spec/spec_helper.rb
 - spec/trax/controller_spec.rb
+- spec/trax/controllers/categories_controller_spec.rb
+- spec/trax/controllers/products_controller_spec.rb
 - trax_controller.gemspec
 homepage: http://www.github.com/jasonayre
 licenses:
@@ -297,10 +367,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Resourceful, standardized controllers
 test_files:
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/categories_controller.rb
+- spec/internal/app/controllers/products_controller.rb
+- spec/internal/app/models/category.rb
+- spec/internal/app/models/product.rb
+- spec/internal/app/models/widget.rb
+- spec/internal/app/serializers/categories_serializer.rb
+- spec/internal/app/serializers/category_serializer.rb
+- spec/internal/app/serializers/product_serializer.rb
+- spec/internal/app/serializers/widget_serializer.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
 - spec/spec_helper.rb
 - spec/trax/controller_spec.rb
+- spec/trax/controllers/categories_controller_spec.rb
+- spec/trax/controllers/products_controller_spec.rb

data/lib/trax/controller/resource/errors.rb

@@ -1,21 +0,0 @@
-module Trax
-  module Controller
-    module Resource
-      module Errors
-        extend ::ActiveSupport::Concern
-
-        def resource_errors?
-          resource.errors.any?
-        end
-
-        def resource_response_meta
-          if resource_action? && resource_errors?
-            super.merge!(:errors => resource.errors.messages)
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end