cyrax 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU2Yjk4MDY1NjM4YzEyZDRlYTUzNWEwOTc0MWI3MmUzMzk0YTA1Mw==
+    YzRmM2U4Y2E4NDA2Y2E3YWQ5ZTFkZGEzZmQ3ZWZhMjdmYTY4NWM2Yw==
   data.tar.gz: !binary |-
-    YTBkY2Q5MDljMGEwMmYzZWFjNzJjNTdjNjM4MDI0MzIzOTg2ODAwZQ==
+    NjcyODNjMjYwZDJlNzI5MzBlMWNkNTAwNTM0OGEwYmNhNjg2OTlmZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTMwNjQ5MDljODVjMzA5YjM0NWExYzBhNjZmZDcwMTZhMTRjOWMyZGFhNzYy
-    ZmFkNTY0YzBiMDhhMjllZGIxODI5MzVhOGExNzZkNGNhZDgyN2U0YjQwNjYy
-    MDExNDQ3NGUzY2IzNjcyY2Q5Nzk3MWJiMDE5MWUyMzUyOTU3ODA=
+    ZDZkMDFhNThmYTBhYTQ5YWVkYTBjYzdmZmQ4MDc1ZDYzMmU3MGI3YWQ4NWQ2
+    ZWJiNWI5MTc1MTAwZjNkZjIyMDMxMTFhN2RmMmE0M2ZmYmFjZmExMWNhNGNh
+    MjcwOWM4NTM4ZmNjOGJiMWQyNTVlNGI3NmEwZmJjOTE0MWIwYTk=
   data.tar.gz: !binary |-
-    MDc4MWM2ZDFmNWEyNWQ4YjE0MDEwMzkyODdlMjliN2JlZGVkZGZlMjkyMjI0
-    YTk5YjIzYzFmMWEwN2VkMWU3ODU0OGRhYTQ1MTE5ZDJjNjVhYTJkMjAwYzJk
-    ZmIxOGFlYTRiMzkwNGE4ZTFhOWRmNzVmNDhjZGM4MDYxZDAyNzI=
+    MmIxNjFkMzM0ZWU2MWQ4NjBlOWQzYjRiYjRmYTk1OTVmYjlhNDZiNTI2NTEy
+    ZDNlNmNmZGUwM2M3OTczYWU4MmRjZWQwYmQ4NDI0MDExNjcwNGE2MDRkY2Ni
+    NmMyOTI4ZThjN2M2OWU2NGVjZWRmMWY5OWI0YzM0MDFlN2I1Mzc=

data/lib/cyrax.rb

@@ -11,6 +11,13 @@ require "cyrax/callbacks.rb"
 require "cyrax/decorator.rb"
 
 module Cyrax
-  mattr_accessor :strong_parameters
   @@strong_parameters = false
+
+  def self.strong_parameters
+    @@strong_parameters
+  end
+
+  def self.strong_parameters=(value)
+    @@strong_parameters = value
+  end
 end

data/lib/cyrax/extensions/has_resource.rb

@@ -64,7 +64,7 @@ module Cyrax::Extensions
 
     private
       def dirty_resource_attributes
-        if params.respond_to?(:require)
+        if Cyrax.strong_parameters
           params.require(resource_name)
         else
           params[resource_name] || {}
@@ -76,16 +76,12 @@ module Cyrax::Extensions
       end
 
       def filter_attributes(attributes)
-        if attributes.respond_to?(:permit)
+        if Cyrax.strong_parameters
           attributes.permit(self.class.accessible_attributes)
+        elsif self.class.accessible_attributes.blank?
+          attributes
         else
-          if !Cyrax.strong_parameters && self.class.accessible_attributes.blank?
-            attributes
-          else
-            attributes.select do |key, value|
-              self.class.accessible_attributes.include?(key.to_sym)
-            end
-          end
+          attributes.slice(*self.class.accessible_attributes)
         end
       end
   end

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/cyrax/extensions/has_resource_spec.rb

@@ -1,5 +1,11 @@
 require 'spec_helper'
 
+class StrongParameters < Hash
+  def permit(attrs)
+    self.slice(*attrs)
+  end
+end
+
 class Bar; end
 class Foo; end
 
@@ -133,10 +139,10 @@ module Cyrax
         end
         it 'should return blank attributes by default for strong_paramters=true' do
           Cyrax.strong_parameters = true
-          subject.send(:filter_attributes, {foo: 'bar'}).should eq({})
+          params =  StrongParameters.new(foo: 'bar')
+          subject.send(:filter_attributes, params).should eq({})
         end
       end
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Droidlabs