hal_api-rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d831a60c614c402a648f44afb3297217d3467614
-  data.tar.gz: 4ab61c8d1411723268b4fd8c804de3506e712d8b
+  metadata.gz: 210b5c17cacf07522c44de62e2ac3aa6a10120df
+  data.tar.gz: 6e2b59bc821a8b40043e796637e9b350f8a34323
 SHA512:
-  metadata.gz: d2165a6cf92e03aaae6e2f66124a13540392c4bcc8d68c5ce0bbdaab1b26b149b6b331a52d433d37f3c8f9923e435797b27f26d29f28697da70f144db14535d7
-  data.tar.gz: abda4c8cadeb338abfbd892d76b77616eff964013696b41ba1f40bbaca8ba27bea3a2c51399909df8ab5433d37c874b9cd52320caedde2e8cdaff60f875d19ec
+  metadata.gz: 7e69e13451aca32729cb733846becf67d49fbd1c131c7d252e5af275517163a1e8211e08e8fff6a3983f39f85f5ee87c1dca22453b42542729ec9784982e84bb
+  data.tar.gz: a09e666bb380e0753d32ae9dff0dbfdbda31fc4557070fb8224f1dcc81fc41418150bd544905fdfefd931131a6551743902c0a87b682618e1cbe315e1a023e4c

data/hal_api-rails.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "kaminari"
 end

data/lib/hal_api/controller/actions.rb

@@ -12,7 +12,7 @@ module HalApi::Controller::Actions
       consume_with_content_type! res
       hal_authorize res
       res.save!
-      respond_with root_resource(res), show_options
+      respond_with root_resource(res), create_options
     end
   end
 
@@ -42,6 +42,13 @@ module HalApi::Controller::Actions
   def index_options
     valid_params_for_action(:index).tap do |options|
       options[:_keys] = options.keys
+      options[:represent_with] = Api::PagedCollectionRepresenter
+    end
+  end
+
+  def create_options
+    show_options.tap do |options|
+      options[:location] = ''
     end
   end
 

data/lib/hal_api/controller/exceptions.rb

@@ -17,7 +17,7 @@ module HalApi::Controller::Exceptions
   end
 
   def log_error(env, wrapper)
-    logger = env['action_dispatch.logger'] || ActiveSupport::Logger.new($stderr)
+    logger = env['action_dispatch.logger'] || self.logger || ActiveSupport::Logger.new($stderr)
     return unless logger
 
     exception = wrapper.exception

data/lib/hal_api/controller/resources.rb

@@ -14,10 +14,14 @@ module HalApi::Controller::Resources
 
   def show_resource
     resource
+  rescue ::ActiveRecord::RecordNotFound
+    raise HalApi::Errors::NotFound.new
   end
 
   def update_resource
     resource
+  rescue ::ActiveRecord::RecordNotFound
+    raise HalApi::Errors::NotFound.new
   end
 
   def create_resource
@@ -26,6 +30,8 @@ module HalApi::Controller::Resources
 
   def destroy_resource
     resource
+  rescue ::ActiveRecord::RecordNotFound
+    raise HalApi::Errors::NotFound.new
   end
 
   def resource

data/lib/hal_api/rails.rb

@@ -6,10 +6,8 @@ module HalApi::Rails
 
   Mime::Type.register 'application/hal+json', :hal
 
-  # roar fix for 4.1
-  # https://github.com/apotonick/roar-rails/issues/65
-  ::ActionController::Renderers.add :hal do |js, options|
-    self.content_type ||= Mime::HAL
-    js.to_json
+  ::ActionController::Renderers.add :hal do |obj, options|
+    self.content_type ||= Mime[:hal]
+    obj
   end
 end

data/lib/hal_api/rails/version.rb

@@ -1,5 +1,5 @@
 module HalApi
   module Rails
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/hal_api/representer.rb

@@ -1,6 +1,12 @@
 # encoding: utf-8
 
 class HalApi::Representer < Roar::Decorator
+  include Roar::Hypermedia
+  include Roar::JSON::HAL
+  include Roar::JSON::HAL::Links
+  include Roar::JSON
+  require 'roar/rails/hal'
+
   require 'hal_api/representer/caches'
   require 'hal_api/representer/curies'
   require 'hal_api/representer/embeds'
@@ -8,7 +14,6 @@ class HalApi::Representer < Roar::Decorator
   require 'hal_api/representer/link_serialize'
   require 'hal_api/representer/uri_methods'
 
-  include Roar::JSON::HAL
   include HalApi::Representer::FormatKeys
   include HalApi::Representer::UriMethods
   include HalApi::Representer::Curies

data/lib/hal_api/representer/caches.rb

@@ -13,6 +13,7 @@ module HalApi::Representer::Caches
     super(options)
   end
 
+  # This isn't working, comment out this optimization
   # def create_representation_with(doc, options, format)
   #   cache.fetch(cache_key(represented, options), cache_options) do
   #     response = super(doc, options, format)

data/lib/hal_api/representer/embeds.rb

@@ -1,4 +1,6 @@
+# encoding: utf-8
 require 'active_support/concern'
+require 'hal_api/paged_collection'
 
 # expects underlying model to have filename, class, and id attributes
 module HalApi::Representer::Embeds
@@ -61,14 +63,12 @@ module HalApi::Representer::Embeds
           no_curies: true,
           item_class: options.delete(:item_class),
           url: options.delete(:url),
-          item_decorator: options.delete(:item_decorator),
-          per: options.delete(:per) || Kaminari.config.default_per_page
+          item_decorator: options.delete(:item_decorator)
         }
+        getter_per = options.delete(:per) || Kaminari.config.default_per_page
         options[:getter] ||= ->(*) do
-          # set # per page based on default, option value integer, or special :all
-          per = opts.delete(:per)
-          per = self.send(name).count if per == :all
-          PagedCollection.new(self.send(name).page(1).per(per), nil, opts.merge({parent: self}))
+          per = getter_per == :all ? send(name).count : getter_per
+          HalApi::PagedCollection.new(send(name).page(1).per(per), nil, opts.merge(parent: self))
         end
         options[:decorator] = Api::PagedCollectionRepresenter
       end

data/lib/hal_api/representer/link_serialize.rb

@@ -13,8 +13,8 @@ module HalApi::Representer::LinkSerialize
 
     def set_link_property(options)
       if options.is_a?(Hash) && (options.delete(:writeable) || options[:reader])
-        name   = options[:rel].to_s.split(':').last.split('/').last
-        pname  = "set_#{name}_uri"
+        name = options[:rel].to_s.split(':').last.split('/').last
+        pname = "set_#{name}_uri"
         reader = options.delete(:reader) || ->(doc, _args) do
           try("#{name}_id=", id_from_url(doc[pname])) if doc[pname]
         end

data/lib/hal_api/representer/uri_methods.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require 'active_support/concern'
 
 # expects underlying model to have filename, class, and id attributes
@@ -13,13 +12,13 @@ module HalApi::Representer::UriMethods
       link(:self) do
         {
           href: self_url(represented),
-          profile: model_uri(represented)
+          profile: profile_url(represented)
         }
       end
     end
 
     def profile_link
-      link(:profile) { model_uri(represented) }
+      link(:profile) { profile_url(represented) }
     end
 
     def alternate_link
@@ -57,7 +56,7 @@ module HalApi::Representer::UriMethods
     "http://#{self.class.profile_host}/model/#{joined_names(args)}"
   end
 
-  alias_method :profil_url, :model_uri
+  alias_method :profile_url, :model_uri
 
   def joined_names(args)
     (Array(args.map { |arg| model_uri_part_to_string(arg) }) +
@@ -67,7 +66,11 @@ module HalApi::Representer::UriMethods
   def model_uri_suffix(args)
     represented = args.last
     klass = represented.try(:item_decorator) || self.class
-    klass.name.deconstantize.underscore.dasherize.split('/')[1..-1] || []
+    find_model_name(klass).deconstantize.underscore.dasherize.split('/')[1..-1] || []
+  end
+
+  def find_model_name(klass)
+    klass.try(:name) || klass.ancestors.detect{|c| c.try(:name) }.name
   end
 
   def model_uri_part_to_string(part)
@@ -75,7 +78,7 @@ module HalApi::Representer::UriMethods
       part.to_s.dasherize
     else
       klass = part.is_a?(Class) ? part : (part.try(:item_class) || part.class)
-      if klass.respond_to?(:base_class) && (klass.superclass != ActiveRecord::Base)
+      if klass.respond_to?(:base_class) && (klass.superclass != ActiveRecord::Base) && !klass.superclass.abstract_class
         base = klass.superclass.name.underscore.dasherize
         child = klass.name.underscore.gsub(/_#{base}$/, "").dasherize
         [base, child]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_api-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Rhoden
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -151,6 +151,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  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'
 description: JSON HAL APIs on Rails in the style of PRX v4. Uses ROAR
 email:
 - carhoden@gmail.com