radriar 0.1.0.alpha.1 → 0.1.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b2f240868f2a031e59cb508385c188e21c519c1
-  data.tar.gz: dfb6a0b56d81e1326544d4b6e06cb51d6dbc5649
+  metadata.gz: 57ea1f5b5028c2d60f066bccee36a662244afee1
+  data.tar.gz: bdaacb50e3f2dff27b6dee7fc8193cc1286ea984
 SHA512:
-  metadata.gz: eefda213eda77dd73061d8729e524deb40d99ca8332ec08bfb885d75295dcfbb6d6f6506728f4e390d7b80788f88224359d113a5d1f2f89b6c0bec729f25f48e
-  data.tar.gz: d685d4e61915d4c4ce2f57b13e329305ddd51e48c3bb4bdb537d9184aaf8b419b84277d7ab9431a508344602dc4f415860420b0678df6951ae56481bcdd074be
+  metadata.gz: 81064a99af29b82f73cdba951a496ff56457bd1e21066c8dd56bffaffc323b06d4f57ffb65def6242c1077d11b837831d4be438b11edc2c3eae2fa5c9ef1e0ec
+  data.tar.gz: 14c0d00e8d89a439a00f8bce1e78bdf3301d39e932c1120086a9cbd2aa52462cd0330101b6245c3d6b4a84f8e889484e79101842304ccef4d690dd37216eeab5

data/TODO.md

@@ -3,3 +3,4 @@
 * Choose a higher-level place to override for key translation.
 * Paginate collections automatically
 * Exposed actions as links
+* Figure out whether to do key translation in links or not.

data/lib/radriar/api/context.rb

@@ -42,6 +42,7 @@ module Radriar
           failure: ->(msg) { error!(msg, 403)}
         }
       end
+      alias_method :delete_params, :success_or_forbidden_handlers
     end
   end
 end

data/lib/radriar/grape.rb

@@ -20,12 +20,12 @@ class ::Grape::API
       helpers Radriar::API::Context
       helpers Radriar::API::StrongParametersSupport
       helpers Radriar::Roar::Representers
+      include Radriar::Roar::KeyTranslation
+      include Radriar::Roar::HAL
 
       Radriar::Representable.representer_namespace = representer_namespace
       Radriar::Representable.hypermedia = hypermedia
-
-      include Radriar::Roar::KeyTranslation if translate_keys
-      include Radriar::Roar::HAL
+      Radriar::Representable.translate_keys = translate_keys
     end
   end
 end

data/lib/radriar/representable.rb

@@ -1,10 +1,13 @@
 module Radriar
   module Representable
     mattr_accessor :representer_namespace
-    mattr_accessor :hypermedia
 
-    def self.hypermedia?
-      !!hypermedia
+    [:hypermedia, :translate_keys].each do |option|
+      mattr_accessor option.to_sym
+
+      self.define_singleton_method "#{option}?".to_sym do
+        !!send(option.to_sym)
+      end
     end
   end
 end

data/lib/radriar/roar/key_translation.rb

@@ -4,6 +4,47 @@ module Radriar
     module KeyTranslation
       extend ActiveSupport::Concern
 
+      included do
+        unless ::Representable::Hash.instance_methods.include?(:__radriar_old_to_hash)
+          ::Representable::Hash.module_eval do
+            # TODO: Module#prepend giving too much headache
+            alias_method :__radriar_old_to_hash,   :to_hash
+            alias_method :__radriar_old_from_hash, :from_hash
+
+            define_method(:from_hash) do |data, options={}, binding_builder=::Representable::Hash::PropertyBinding|
+              if Radriar::Representable.translate_keys?
+                data = filter_wrap(UnderscoreKeys.new(data), options)
+                update_properties_from(data, options, binding_builder)
+              else
+                __radriar_old_from_hash(data, options, binding_builder)
+              end
+            end
+
+            define_method(:to_hash) do |options={}, binding_builder=::Representable::Hash::PropertyBinding|
+              if Radriar::Representable.translate_keys?
+                CamelizeKeys.new(__radriar_old_to_hash(options, binding_builder))
+              else
+                __radriar_old_to_hash(options, binding_builder)
+              end
+            end
+          end
+        end
+
+        unless ::Grape::Endpoint.instance_methods.include?(:__radriar_old_params)
+          ::Grape::Endpoint.class_eval do
+            alias_method :__radriar_old_params, :params
+
+            define_method(:params) do
+              if Radriar::Representable.translate_keys?
+                @params ||= UnderscoreKeys.new(@request.params)
+              else
+                __radriar_old_params
+              end
+            end
+          end
+        end
+      end
+
       class KeyTranslatorHash < Hashie::Mash
         protected
         def convert_key(key)
@@ -33,25 +74,9 @@ module Radriar
       class CamelizeKeys < KeyTranslatorHash
         protected
         def convert_key(key)
-          key.to_s.camelize(:lower)
+          key.to_s.start_with?("_") ? key.to_s : key.to_s.camelize(:lower)
         end
       end
-
-
-      module Representer
-        def from_hash(data, options={}, binding_builder=::Representable::Hash::PropertyBinding)
-          data = filter_wrap(UnderscoreKeys.new(data), options)
-          update_properties_from(data, options, binding_builder)
-        end
-
-        def to_hash(options={}, binding_builder=::Representable::Hash::PropertyBinding)
-          CamelizeKeys.new(super)
-        end
-      end
-      
-      included do
-        ::Representable::Hash.prepend(Representer)
-      end
     end
   end
 end

data/lib/radriar/version.rb

@@ -1,3 +1,3 @@
 module Radriar
-  VERSION = "0.1.0.alpha.1"
+  VERSION = "0.1.0.alpha.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radriar
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.1
+  version: 0.1.0.alpha.2
 platform: ruby
 authors:
 - Adrian Perez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport