skinny_controllers 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17d5297816d2a7c0b58893b33a13bbc9b3325298
-  data.tar.gz: 1dc6ed173769df962b8a6716d5178b1abd07650a
+  metadata.gz: 37c23f99827b6f219c4d8c9639047679d50e71c5
+  data.tar.gz: ba943a28a5d56c8f61245d70466fbf071aeb1c98
 SHA512:
-  metadata.gz: f109e9e339bacf50c204a3a925e1e6dbd04f8dcb53acefa4e9ec647b27ddc36eb8b1fb8ef068ad96046ea9d5b7c33543ae66bb9bf2713ef43c69d4d008f4abc4
-  data.tar.gz: df06896ca96b9706afc6c91c43cd12d044e8bb028ebce4020dbbfe949d677a5ae537c68136ff493543cea87b4afdd40fa6e9d5cf50209bc1efd67752d0235392
+  metadata.gz: f17ce4c443b039f831b12eee469de045571fc963aa5f0657363965773427dec8476ea61a9e55cdebdbae8836e3d7d2c0d01ef546d8bbed10cc4e4e69f8d4ee4a
+  data.tar.gz: 3bd1b95c27f8b5fce730bfb7caafa2adf90e1a3b2a9ea0d418baa0411c89dc898cd1ad42a1fdbb186acbd7d20b2d85d9f9f97bfeb09cd5a9553223884bbad4e1

data/README.md

@@ -1,4 +1,4 @@
-# skinny-controllers
+# skinny_controllers
 [![Gem Version](https://badge.fury.io/rb/skinny_controllers.svg)](https://badge.fury.io/rb/skinny_controllers)
 [![Build Status](https://travis-ci.org/NullVoxPopuli/skinny_controllers.svg?branch=master)](https://travis-ci.org/NullVoxPopuli/skinny_controllers)
 [![Code Climate](https://codeclimate.com/github/NullVoxPopuli/skinny_controllers/badges/gpa.svg)](https://codeclimate.com/github/NullVoxPopuli/skinny_controllers)
@@ -89,7 +89,7 @@ private
 def host_from_subdomain
   @host ||= HostOperations::Read.new(current_user, host_params).run
 end
-  
+
 def host_params
   params.permit(:subdomain)
 end
@@ -149,7 +149,7 @@ end
 ### Updating
 ```ruby
 module UserOperations
-  class Create < SkinnyControllers::Operation::Base
+  class Update < SkinnyControllers::Operation::Base
     def run
       return unless allowed?
       model.update(model_params)
@@ -219,7 +219,7 @@ The following options are available:
 |`accessible_to_method`|`is_accessible_to?`| method to call an the object that the user might be able to access |
 |`accessible_to_scope`| `accessible_to`| scope / class method on an object that the user might be able to access |
 |`action_map`| see [skinny_controllers.rb](./lib/skinny_controllers.rb#L61)| |
-
+|`params_format`|`:json`| or `:json_api`|
 
 ## TODO
 

data/lib/skinny_controllers/json_api_document.rb

@@ -0,0 +1,29 @@
+module SkinnyControllers
+  # currently copied from NullVoxPopuli/json-api-document
+  # Not sure if this should be its own gem or not
+  class JsonApiDocument
+    attr_accessor :data, :id, :attributes
+
+    # @param [Hash] json the json api document
+    # @param [Symbol] key_formatter converts the attribute keys
+    def initialize(json, key_formatter: nil)
+      json = JSON.parse(json) if json.is_a?(String)
+
+      self.data = json['data']
+      self.id = data['id']
+      self.attributes = format_keys(data['attributes'], key_formatter)
+    end
+
+    private
+
+    # TODO: how to handle nested hashes
+    def format_keys(hash, key_format_method)
+      return hash unless key_format_method
+
+      hash.each_with_object({}) do |(k, v), result|
+        new_key = k.send(key_format_method)
+        result[new_key] = v
+      end
+    end
+  end
+end

data/lib/skinny_controllers/operation/base.rb

@@ -30,7 +30,7 @@ module SkinnyControllers
 
       def id_from_params
         unless @id_from_params
-          @id_from_params = params[:id]
+          @id_from_params = params[:data] ? params[:data][:id] : params[:id]
           if filter = params[:filter]
             @id_from_params = filter[:id].split(',')
           end

data/lib/skinny_controllers/operation/model_helpers.rb

@@ -28,7 +28,20 @@ module SkinnyControllers
         # for mass-assignment, rails doesn't accept
         # stringified keys.
         # TODO: why did the params hash lose its indifferent access
-        @model_params ||= params[model_param_name].symbolize_keys
+        @model_params ||= param_parser.model_params.symbolize_keys
+      end
+
+      def param_parser
+        unless @param_parser
+          @param_parser =
+            if SkinnyControllers.params_format == :json
+              Params::Json.new(params, model_param_name)
+            else
+              Params::JsonApi.new(params, model_param_name)
+            end
+        end
+
+        @param_parser
       end
 
       def model_param_name

data/lib/skinny_controllers/params/json.rb

@@ -0,0 +1,20 @@
+module SkinnyControllers
+  module Params
+    class Json
+      attr_accessor :document, :model_key
+      # @param [Params] params from controller
+      def initialize(params, model_key)
+        self.document = params
+        self.model_key = model_key
+      end
+
+      def model_params
+        document[model_key].symbolize_keys
+      end
+
+      def id
+        document[:id]
+      end
+    end
+  end
+end

data/lib/skinny_controllers/params/json_api.rb

@@ -0,0 +1,21 @@
+module SkinnyControllers
+  module Params
+    class JsonApi
+      attr_accessor :document, :model_key
+
+      # @param [Params] params from controller
+      def initialize(params, model_key)
+        self.document = JsonApiDocument.new(params)
+        self.model_key = model_key
+      end
+
+      def model_params
+        document.attributes
+      end
+
+      def id
+        document.id
+      end
+    end
+  end
+end

data/lib/skinny_controllers/policy/base.rb

@@ -20,7 +20,7 @@ module SkinnyControllers
       def method_missing(method_name, *args, &block)
         # if the method ends in a question mark, re-route to default
         if method_name.to_s =~ /(.+)\?/
-          action = $1
+          action = Regexp.last_match(1)
           # alias destroy to delete
           # TODO: this means that a destroy method, if defined,
           #       will never be called.... good or bad?

data/lib/skinny_controllers/version.rb

@@ -1,3 +1,3 @@
 module SkinnyControllers
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/lib/skinny_controllers.rb

@@ -7,6 +7,9 @@ require 'active_support/core_ext/string/inflections'
 
 # files for this gem
 require 'skinny_controllers/default_verbs'
+require 'skinny_controllers/json_api_document'
+require 'skinny_controllers/params/json'
+require 'skinny_controllers/params/json_api'
 require 'skinny_controllers/lookup/controller'
 require 'skinny_controllers/lookup/model'
 require 'skinny_controllers/lookup/operation'
@@ -61,6 +64,10 @@ module SkinnyControllers
     :accessible_to
   end
 
+  cattr_accessor :params_format do
+    :json # or :json_api
+  end
+
   # the diet uses ActionController::Base's
   # `action_name` method to get the current action.
   # From that action, we map what verb we want to use for our operation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skinny_controllers
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -189,6 +189,7 @@ files:
 - lib/skinny_controllers.rb
 - lib/skinny_controllers/default_verbs.rb
 - lib/skinny_controllers/diet.rb
+- lib/skinny_controllers/json_api_document.rb
 - lib/skinny_controllers/lookup/controller.rb
 - lib/skinny_controllers/lookup/model.rb
 - lib/skinny_controllers/lookup/operation.rb
@@ -196,6 +197,8 @@ files:
 - lib/skinny_controllers/operation/base.rb
 - lib/skinny_controllers/operation/default.rb
 - lib/skinny_controllers/operation/model_helpers.rb
+- lib/skinny_controllers/params/json.rb
+- lib/skinny_controllers/params/json_api.rb
 - lib/skinny_controllers/policy/allow_all.rb
 - lib/skinny_controllers/policy/base.rb
 - lib/skinny_controllers/policy/default.rb
@@ -224,5 +227,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: SkinnyControllers-0.5.3
+summary: SkinnyControllers-0.5.4
 test_files: []