restful_json 3.4.2 → 4.0.0

data/lib/restful_json/default_controller.rb

@@ -1,3 +1,11 @@
+# The Rails 3.x "would you like fries with that" module that includes:
+#  * ActionController::Serialization
+#  * ActionController::StrongParameters
+#  * ActionController::Permittance
+#  * RestfulJson::Controller
+#
+# Instead of using this, please consider implementing your own module to include these modules so you have more control over it.
+# And in Rails 4+, don't use this, because ActionController::StrongParameters might already be included.
 module RestfulJson
   module DefaultController
     extend ::ActiveSupport::Concern
@@ -5,7 +13,7 @@ module RestfulJson
     included do
       include ::ActionController::Serialization
       include ::ActionController::StrongParameters
-      include ::TwinTurbo::Controller
+      include ::ActionController::Permittance
       include ::RestfulJson::Controller
     end
   end

data/lib/restful_json/version.rb

@@ -1,3 +1,3 @@
 module RestfulJson
-  VERSION = '3.4.2'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_json
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Gary S. Weaver
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,48 +25,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  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'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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: Develop declarative, featureful JSON RESTful-ish service controllers
   to use with modern Javascript MVC frameworks like AngularJS, Ember, etc. with much
   less code.
@@ -76,15 +34,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/restful_json/base_controller.rb
 - lib/restful_json/config.rb
 - lib/restful_json/controller.rb
 - lib/restful_json/default_controller.rb
-- lib/restful_json/railtie.rb
 - lib/restful_json/version.rb
 - lib/restful_json.rb
-- lib/twinturbo/application_permitter.rb
-- lib/twinturbo/controller.rb
 - Rakefile
 - README.md
 homepage: https://github.com/rubyservices/restful_json

data/lib/restful_json/base_controller.rb

@@ -1,13 +0,0 @@
-module RestfulJson
-  module BaseController
-    extend ::ActiveSupport::Concern
-
-    module ClassMethods
-      # <b>DEPRECATED:</b> Please use <tt>include RestfulJson::DefaultController</tt> instead.
-      def acts_as_restful_json
-        warn "[DEPRECATION] `acts_as_restful_json` is deprecated. Please use `include RestfulJson::DefaultController` or see documentation."
-        include ::RestfulJson::DefaultController
-      end
-    end
-  end
-end

data/lib/restful_json/railtie.rb

@@ -1,19 +0,0 @@
-require 'restful_json'
-
-module RestfulJson
-  class Railtie < ::Rails::Railtie
-    initializer "restful_json.action_controller" do
-      # provide deprecated acts_as_restful_json method on controller
-      ActiveSupport.on_load(:action_controller) do
-        include ::RestfulJson::BaseController
-      end
-    end
-
-    #TODO: split permitters out into their own gem, and then can always add to autoload path if gem loaded
-    initializer "restful_json.autoload_paths", after: :load_config_initializers do
-      if RestfulJson.use_permitters
-        ActiveSupport::Dependencies.autoload_paths << "#{Rails.root}/app/permitters" unless ActiveSupport::Dependencies.autoload_paths.include?("#{Rails.root}/app/permitters")
-      end
-    end
-  end
-end

data/lib/twinturbo/application_permitter.rb

@@ -1,93 +0,0 @@
-# from Adam Hawkins's gist:
-# https://gist.github.com/3150306
-# http://www.broadcastingadam.com/2012/07/parameter_authorization_in_rails_apis/
-class ApplicationPermitter
-  class PermittedAttribute < Struct.new(:name, :options) ; end
-
-  delegate :authorize!, :to => :ability
-  class_attribute :permitted_attributes
-  self.permitted_attributes = []
-
-  class << self
-    def permit(*args)
-      options = args.extract_options!
-
-      args.each do |name|
-        self.permitted_attributes += [PermittedAttribute.new(name, options)]
-      end
-    end
-
-    def scope(name)
-      with_options :scope => name do |nested|
-        yield nested
-      end
-    end
-  end
-
-  def initialize(params, user, ability = nil)
-    @params, @user, @ability = params, user, ability
-  end
-
-  def permitted_params
-    authorize_params!
-    filtered_params
-  end
-
-  def resource_name
-    self.class.to_s.match(/(.+)Permitter/)[1].underscore.to_sym
-  end
-
-
-private
-
-  def authorize_params!
-    needing_authorization = permitted_attributes.select { |a| a.options[:authorize] }
-
-    needing_authorization.each do |attribute|
-      if attribute.options[:scope]
-        values = Array.wrap(filtered_params[attribute.options[:scope]]).collect do |hash|
-          hash[attribute.name]
-        end.compact
-      else
-        values = Array.wrap filtered_params[attribute.name]
-      end
-
-      klass = (attribute.options[:as].try(:to_s) || attribute.name.to_s.split(/(.+)_ids?/)[1]).classify.constantize
-
-      values.each do |record_id|
-        record = klass.find record_id
-        permission = attribute.options[:authorize].to_sym || :read
-        authorize! permission, record
-      end
-    end
-  end
-
-  def filtered_params
-    scopes = {}
-    unscoped_attributes = []
-
-    permitted_attributes.each do |attribute|
-      if attribute.options[:scope]
-        key = attribute.options[:scope]
-        scopes[key] ||= []
-        scopes[key] << attribute.name
-      else
-        unscoped_attributes << attribute.name
-      end
-    end
-
-    @filtered_params ||= params.require(resource_name).permit(*unscoped_attributes, scopes)
-  end
-
-  def params
-    @params
-  end
-
-  def user
-    @user
-  end
-
-  def ability
-    @ability ||= Ability.new user
-  end
-end

data/lib/twinturbo/controller.rb

@@ -1,43 +0,0 @@
-module TwinTurbo
-  module Controller
-
-    # modded from Adam Hawkins's original post:
-    # http://www.broadcastingadam.com/2012/07/parameter_authorization_in_rails_apis/
-    # with modification to only try to call permitted params if is a permitter
-    
-    def permitted_params
-      #TODO: provide way of producing error if params invalid (not as simple as not rescuing- need to rework permitters)
-      @permitted_params ||= safe_permitted_params
-    end
-
-    def permitter
-      return unless permitter_class
-
-      @permitter ||= permitter_class.new params, current_user, current_ability
-    end
-
-    def permitter_class
-      # Try "The::Controller::Namespace::(singular name)Controller".contantize.
-      # If controller in a module, will fall back on "(singular name)Controller".contantize.
-      permitter_class_arr = ["#{self.class.to_s.match(/(.+)Controller/)[1].singularize}Permitter"]
-      if self.class.to_s['::']
-        permitter_class_arr << "#{self.class.to_s.match(/(.*?::)?(?<controller_name>.+)Controller/)[:controller_name].singularize}Permitter"
-      end
-      permitter_class_arr.each do |class_name|
-        begin
-          return class_name.constantize
-        rescue NameError
-        end
-      end
-      logger.debug "Could not find permitter: #{permitter_class_arr.collect{|c|c.to_s}.join(', ')}" if RestfulJson.debug?
-      nil
-    end
-
-    def safe_permitted_params
-      begin
-        permitter.send(:permitted_params)
-      rescue
-      end
-    end
-  end
-end