simple_rest 0.0.3 → 0.0.4

data/Rakefile

@@ -24,16 +24,16 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 PKG_FILES = FileList[ '[a-zA-Z]*', 'lib/**/*', 'test/**/*' ]
-require 'lib/simple_rest.rb'
+require './lib/simple_rest.rb'
 spec = Gem::Specification.new do |s|
   s.name = "simple_rest"
   s.version = SimpleRest::VERSION
-  s.author = "niquola,smecsia"
-  s.email = "niquola@gmail.com,smecsia@gmail.com"
+  s.author = "niquola,smecsia,mirasrael"
+  s.email = "niquola@gmail.com,smecsia@gmail.com,alexander.i.bondarev@gmail.com"
   #s.homepage = ""
   s.platform = Gem::Platform::RUBY
   s.summary = "ActionControllers helpers for restful rails"
-  s.add_dependency('rails', '>= 2.3.5')
+  s.add_dependency('rails', '>= 3.0')
   s.files = PKG_FILES.to_a 
   s.require_path = "lib"
   s.has_rdoc = false

data/lib/simple_rest/action_controller_methods.rb

@@ -3,6 +3,7 @@ module SimpleRest
     def self.included(base)
       base.extend(ClassMethods)
       base.before_filter :json_request_handling_filter
+      base.respond_to :js, :xml, :jsonp, :pdf, :yaml, :html
     end
 
     module ClassMethods
@@ -22,40 +23,9 @@ module SimpleRest
       end
     end
 
-    def simple_rest(data, opts={})
-      status= opts[:status] || :ok
-      serial_opts= opts[:serialize_opts] || {}
-      respond_to do |format|
-        format.js { render :json => data.to_json(serial_opts),:status=>status}
-        format.html { render opts}
-        format.yaml { render :partial=> 'shared/inspect',:content_type =>'text/html',:locals => { :data => data } ,:status=>status }
-        format.xml  { render :xml => data.to_xml(serial_opts),:status=>status}
-        format.pdf  { render (opts[:pdf_opts] || {}).merge(:layout=>false) }
-        format.jsonp { render_jsonp(data,opts) }
-      end
-    end
-
-    def render_jsonp(data, options={})
-      text = build_jsonp_message(data,options)
-      render({:content_type => :js, :text => text}.merge(options.merge(:status=>:ok)))
-    end
-
-    def build_jsonp_message(data,options)
-      message = {:status=>options[:status] || 200, :data=>data}
-      json=message.to_json(options)
-      callback, variable = params[:callback], params[:variable]
-      response =
-      begin
-        if callback && variable
-          "var #{variable} = #{json};\n#{callback}(#{variable});"
-        elsif variable
-          "var #{variable} = #{json};"
-        elsif callback
-          "#{callback}(#{json});"
-        else
-          json
-        end
-      end
+    def simple_rest(data, opts = {})
+      ::ActiveSupport::Deprecation.warn("simple_rest is deprecated. Please use respond_with instead")
+      respond_with data, opts
     end
 
     def store_location

data/lib/simple_rest/action_controller_responder_methods.rb

@@ -0,0 +1,45 @@
+module SimpleRest
+  module ActionControllerResponderMethods
+    def to_js
+      status = options[:status] || :ok
+      render :json => resource.to_json(options[:serialize_opts] || {}), :status => status
+    end
+
+    def to_yaml
+      status = options[:status] || :ok
+      render :partial=> 'shared/inspect', :content_type =>'text/html', :locals => {:data => resource}, :status=> status
+    end
+
+    def to_pdf
+      render (options[:pdf_opts] || {}).merge(:layout=>false)
+    end
+
+    def to_xml
+      status = options[:status] || :ok
+      render :xml => resource.to_xml(options[:serialize_opts] || {}), :status => status
+    end
+
+    def to_jsonp
+      text = build_jsonp_message(resource, options)
+      render ({:content_type => :js, :text => text}.merge(options.merge(:status=>:ok)))
+    end
+
+    def build_jsonp_message(data, options)
+      message = {:status=>options[:status] || 200, :data=>data}
+      json    = message.to_json(options)
+      callback, variable = controller.params[:callback], controller.params[:variable]
+      response =
+          begin
+            if callback && variable
+              "var #{variable} = #{json};\n#{callback}(#{variable});"
+            elsif variable
+              "var #{variable} = #{json};"
+            elsif callback
+              "#{callback}(#{json});"
+            else
+              json
+            end
+          end
+    end
+  end
+end

data/lib/simple_rest.rb

@@ -1,11 +1,13 @@
 $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 module SimpleRest
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   autoload :ActionControllerMethods, 'simple_rest/action_controller_methods'
+  autoload :ActionControllerResponderMethods, 'simple_rest/action_controller_responder_methods'
   class << self
     def enable
       ActionController::Base.send :include, ActionControllerMethods
+      ActionController::Responder.send :include, ActionControllerResponderMethods
       enable_mime_types
     end
 

data/test/simple_rest_test.rb

@@ -1,10 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-ActionController::Routing::Routes.draw do |map|
-  map.connect ':controller/:action/:id.:format'
-  map.connect ':controller/:action.:format'
-  map.connect ':controller/:action/:id'
-end
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
 
 class MyController < ActionController::Base
   rescue_exceptions_restfully
@@ -13,7 +7,7 @@ class MyController < ActionController::Base
   end
 
   rescue_from MyException do |exception|
-    simple_rest({:message=>exception.to_s},{:status=>500})
+    simple_rest({:message=>exception.to_s}, {:status=>500})
   end
 
   def echo
@@ -32,10 +26,25 @@ class MyController < ActionController::Base
   def action_with_uncatched_error
     raise Exception.new("Some error")
   end
+end
+
+class TestApp < Rails::Application
 
 end
 
+TestApp.initialize!
+
 class MyControllerTest < ActionController::TestCase
+  def setup
+    @routes = ActionDispatch::Routing::RouteSet.new
+    @routes.draw do
+      match ':controller/:action/:id.:format', :to => MyController
+      match ':controller/:action.:format', :to => MyController
+      match ':controller/:action/:id', :to => MyController
+    end
+    MyController.send :include, @routes.url_helpers
+  end
+
   def test_methods_mixed
     assert(MyController.new.respond_to?(:simple_rest))
   end
@@ -67,8 +76,8 @@ class MyControllerTest < ActionController::TestCase
     get :index, :format => 'jsonp'
     resp_obj = parse_json_responce
     assert_not_nil(resp_obj['status'])
-    assert_equal(200,resp_obj['status'])
-    assert_equal('value',resp_obj['data']['field'])
+    assert_equal(200, resp_obj['status'])
+    assert_equal('value', resp_obj['data']['field'])
   end
 
   def test_xml_format
@@ -85,15 +94,15 @@ class MyControllerTest < ActionController::TestCase
     get :action_with_error, :format => 'jsonp'
     resp_obj = parse_json_responce
     assert_not_nil(resp_obj['data']['message'])
-    assert_equal(500,resp_obj['status'])
+    assert_equal(500, resp_obj['status'])
   end
 
   def test_rescue_exceptions_restfully
     get :action_with_uncatched_error, :format => 'jsonp'
-    resp = @response.body
+    resp     = @response.body
     resp_obj = parse_json_responce
     assert_not_nil(resp_obj['data']['message'])
-    assert_equal(500,resp_obj['status'])
+    assert_equal(500, resp_obj['status'])
     assert_response(:ok)
 
     get :action_with_uncatched_error, :format => 'js'
@@ -102,7 +111,7 @@ class MyControllerTest < ActionController::TestCase
   end
 
   def test_json_request_support
-    get :echo, :format => 'jsonp',:_json=>'{suboject:{field:[1,2,3]}}'
+    get :echo, :format => 'jsonp', :_json=>'{suboject:{field:[1,2,3]}}'
     resp_obj = nil
     resp_obj = parse_json_responce
     assert_not_nil(resp_obj['data'])

data/test/test_helper.rb

@@ -5,8 +5,9 @@ end
 $:.unshift(path('../lib'))
 require 'rubygems'
 require "test/unit"
-require 'active_support'
-require 'active_support/test_case'
-require 'action_controller'
+require 'rails'
+require "action_controller"
+require "action_dispatch/routing"
+#require 'rails/application/configuration'
 require 'simple_rest'
 

metadata

@@ -1,21 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: simple_rest
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
-- niquola,smecsia
+- niquola,smecsia,mirasrael
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +04:00
+date: 2011-01-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,16 +25,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 description: 
-email: niquola@gmail.com,smecsia@gmail.com
+email: niquola@gmail.com,smecsia@gmail.com,alexander.i.bondarev@gmail.com
 executables: []
 
 extensions: []
@@ -43,9 +40,10 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- Rakefile
 - README.rdoc
+- Rakefile
 - lib/simple_rest/action_controller_methods.rb
+- lib/simple_rest/action_controller_responder_methods.rb
 - lib/simple_rest.rb
 - test/simple_rest_test.rb
 - test/test_helper.rb
@@ -63,7 +61,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -72,7 +69,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"