restful_json 3.2.1 → 3.2.2

data/Rakefile

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'appraisal'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec')
-task :default => :spec

data/lib/restful_json/controller.rb

@@ -1,8 +1,8 @@
-require 'restful_json/config'
-require 'twinturbo/controller'
-require 'active_model_serializers'
-require 'strong_parameters'
-require 'cancan'
+#require 'restful_json/config'
+#require 'twinturbo/controller'
+#require 'active_model_serializers'
+#require 'strong_parameters'
+#require 'cancan'
 
 # The restful_json controller module. This module (RestfulJson::Controller) is included on ActionController
 # and then each individual controller should call acts_as_restful_json.
@@ -20,7 +20,7 @@ require 'cancan'
 #
 module RestfulJson
   module Controller
-    extend ActiveSupport::Concern
+    extend ::ActiveSupport::Concern
 
     module ClassMethods
 
@@ -43,13 +43,13 @@ module RestfulJson
     end
     
     module ActsAsRestfulJson
-      extend ActiveSupport::Concern
+      extend ::ActiveSupport::Concern
 
       NILS = ['NULL','null','nil']
 
       included do
         # this can be overriden in the controller via defining respond_to
-        formats = RestfulJson.formats || Mime::EXTENSION_LOOKUP.keys.collect{|m|m.to_sym}
+        formats = RestfulJson.formats || ::Mime::EXTENSION_LOOKUP.keys.collect{|m|m.to_sym}
         respond_to *formats
 
         # create class attributes for each controller option and set the value to the value in the app configuration
@@ -262,7 +262,9 @@ module RestfulJson
 
         self.param_to_attr_and_arel_predicate.keys.each do |param_name|
           options = param_to_attr_and_arel_predicate[param_name][2]
-          param = params[param_name] || options[:with_default]
+          # to_s as safety measure for vulnerabilities similar to CVE-2013-1854 
+          param = params[param_name].to_s || options[:with_default]
+
           if param.present? && param_to_attr_and_arel_predicate[param_name]
             attr_sym = param_to_attr_and_arel_predicate[param_name][0]
             predicate_sym = param_to_attr_and_arel_predicate[param_name][1]
@@ -306,7 +308,7 @@ module RestfulJson
         else
           self.ordered_by.each do |attr_to_direction|
             # this looks nasty, but makes no sense to iterate keys if only single of each
-            value = value.order(t[attr_to_direction.keys[0]].call(attr_to_direction.values[0]))
+            value = value.order(t[attr_to_direction.keys[0]].send(attr_to_direction.values[0]))
           end
           value = value.to_a
         end

data/lib/restful_json/model.rb

@@ -1,4 +1,4 @@
-require 'cancan'
+#require 'cancan'
 
 module RestfulJson
   module Model

data/lib/restful_json/railtie.rb

@@ -1,18 +1,18 @@
 require 'restful_json'
 
 module RestfulJson
-  class Railtie < Rails::Railtie
+  class Railtie < ::Rails::Railtie
     initializer "restful_json.action_controller" do
       ActiveSupport.on_load(:action_controller) do
-        puts "Extending #{self} with RestfulJson::Controller" if RestfulJson.debug?
-        include RestfulJson::Controller
+        puts "Extending #{self} with RestfulJson::Controller" if ::RestfulJson.debug?
+        include ::RestfulJson::Controller
       end
     end
 
     initializer "restful_json.active_record" do
       ActiveSupport.on_load(:active_record) do
-        puts "Extending #{self} with RestfulJson::Model" if RestfulJson.debug?
-        include RestfulJson::Model
+        puts "Extending #{self} with RestfulJson::Model" if ::RestfulJson.debug?
+        include ::RestfulJson::Model
       end
     end
   end

data/lib/restful_json/version.rb

@@ -1,3 +1,3 @@
 module RestfulJson
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
 end

data/lib/restful_json.rb

@@ -1,7 +1,11 @@
 require 'restful_json/version'
 require 'restful_json/config'
-require 'application_permitter'
-require 'twinturbo/controller'
-require 'restful_json/model'
-require 'restful_json/controller'
-require 'restful_json/railtie' if defined?(Rails)
+#if defined?(::Rails)
+  if defined?(::ActionController::StrongParameters) && defined?(::CanCan::ModelAdditions)
+    require 'application_permitter'
+    require 'twinturbo/controller'
+  end
+  require 'restful_json/model'
+  require 'restful_json/controller'
+  require 'restful_json/railtie'
+#end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_json
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,40 +10,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
+        version: 1.2.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 description: Develop declarative, featureful JSON RESTful-ish service controllers
   to use with modern Javascript MVC frameworks like AngularJS, Ember, etc. with much
   less code.