rescue-dog 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ea1931c553f09ed1cf0e12f65479dbbc0a949d76
+  data.tar.gz: 49b18603085618a2120933598e512d0e9a3c1491
+SHA512:
+  metadata.gz: 27f9b874868af6234c7a1ca9cdb4d7e0b7d597e100303991b554e2ece7d20c0441db504593c2f2b647fea7414caab95d64d22349d9a9c41d577f27798a553a6f
+  data.tar.gz: 788415d867e62f4083d66675aba84476ae5458c3da8024851c3b991b0b9215d56edb66a1e14e89b493f173f52697d26a00342b7d85fc7d5d1f3321a32407feff

data/build_gem.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+LIB_NAME="rescue-dog"
+if [ $# -ne 2 ]
+then
+	echo "Usage: $0 {version} {target}"
+	exit 1
+fi
+GEMSPEC="${LIB_NAME}.gemspec"
+PKG_FILE="${LIB_NAME}-$1.gem"
+
+echo "[RUN] gem install"
+bundle install
+echo "[RUN] rake"
+bundle exec rake
+
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+echo "[RUN] gem build ${GEMSPEC}"
+gem build ${GEMSPEC}
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+
+echo "[RUN] mv ${PKG_FILE} pkg/"
+mv ${PKG_FILE} ./pkg
+
+case "$2" in
+	"install")
+		echo "[RUN] rake install pkg/${PKG_FILE}"
+		bundle exec rake install --trace
+	;;
+	"deploy")
+		echo "[RUN] gem push pkg/${PKG_FILE}"
+		gem push pkg/${PKG_FILE}
+
+		echo "[RUN] git tag -a version-$1"
+		git tag -a version-$1 -m ""
+		git push --tags
+	;;
+	*)
+		echo "FATAL: invalid target"
+		exit 1
+	;;
+esac
+

data/config/locales/rescue.yml

@@ -0,0 +1,24 @@
+en:
+  default:
+    flash:
+      success: "default_controller success"
+      error: "default_controller error"
+
+  views:
+    rescue:
+      action:
+        flash:
+          success: "rescue_controller success"
+          error: "rescue_controller error"
+      dog:
+        action:
+          flash:
+            success: "success"
+            error: "error"
+
+    rescue_dog:
+      action:
+        flash:
+          success: "rescue_dog_controller success"
+          error: "rescue_dog_controller error"
+

data/lib/rescue/config.rb

@@ -12,6 +12,7 @@ module Rescue
 
   class Configuration #:nodoc:
     include ActiveSupport::Configurable
+    config_accessor :primary_key
     config_accessor :respond_name
     config_accessor :suppress_response_codes
 
@@ -26,6 +27,7 @@ module Rescue
   end
 
   configure do |config|
+    config.primary_key             = :id
     config.respond_name            = :respond_status
     config.suppress_response_codes = false
   end

data/lib/rescue/controller.rb

@@ -1,5 +1,4 @@
 # coding: UTF-8
-
 module Rescue
   module Controller
 
@@ -37,6 +36,54 @@ module Rescue
         end
       end
 
+      def rescue_controller clazz, *actions
+        options    = actions.extract_options!
+        name       = clazz.name.downcase
+        var_sym    = :"@#{name}"
+        params_sym = :"#{name}_params"
+
+        Parameter.define(self)
+        Action.define(self, clazz, var_sym, params_sym)
+
+        [:new].each do |type|
+          args = options.delete(type) || (actions.delete(type) ? {} : nil)
+          define_action_method(type, :new_call, args) if args
+        end
+
+        [:show, :edit].each do |type|
+          args = options.delete(type) || (actions.delete(type) ? {} : nil)
+          define_action_method(type, :find_call, args) if args
+        end
+ 
+        [:create, :update, :delete].each do |type|
+          args = options.delete(type) || (actions.delete(type) ? {} : nil)
+          if args
+            args[:flash] ||= true
+            define_action_method(type, :"#{type}_call", args) if args
+          end
+        end
+      end
+
+      def define_action_method name, call_method, options = {}
+        success_message = options[:success]
+        error_message   = options[:error]
+        if options[:flash]
+          success_message ||= Flash.message(self, name, :success)
+          error_message   ||= Flash.message(self, name, :error)
+        end
+
+        define_method name do
+          begin
+            send(call_method)
+            flash[:success] = success_message unless success_message.blank?
+            instance_exec(&options[:render]) if options[:render]
+          rescue
+            flash.now[:error] = error_message unless error_message.blank?
+            instance_exec(&options[:rescue]) if options[:rescue]
+          end
+        end
+      end
+
     end
   end
 end

data/lib/rescue/controllers/action.rb

@@ -0,0 +1,32 @@
+# coding: UTF-8
+module Rescue
+  module Controller
+    class Action
+
+      def self.define object, clazz, var_sym, params_sym
+        object.send(:define_method, :new_call) do
+          instance_variable_set(var_sym, clazz.new)
+        end
+        object.send(:define_method, :find_call) do
+          id = find_params[Rescue.config.primary_key]
+          instance_variable_set(var_sym, clazz.find(id))
+        end
+        object.send(:define_method, :create_call) do
+          instance_variable_set(var_sym, clazz.new(send(params_sym)))
+          instance_variable_get(var_sym).save!
+        end
+        object.send(:define_method, :update_call) do
+          find_call
+          instance_variable_get(var_sym).attributes = send(params_sym)
+          instance_variable_get(var_sym).save!
+        end
+        object.send(:define_method, :delete_call) do
+          find_call
+          instance_variable_get(var_sym).destroy!
+        end
+        object.send(:private, :new_call, :find_call, :create_call, :update_call, :delete_call)
+      end
+
+    end
+  end
+end

data/lib/rescue/controllers/flash.rb

@@ -0,0 +1,24 @@
+# coding: UTF-8
+module Rescue
+  module Controller
+    class Flash
+
+      def self.message object, action, key 
+        controllers = object.class.name.gsub('Controller', '').split('::').map {|e| e.underscore }
+        scope = ([:views] + controllers) << action << :flash
+        text(key, scope)
+      end
+
+      def self.default key
+        s = I18n.t(key, scope: [:default, :flash], default: '')
+        s.blank? ? nil : s
+      end
+
+      def self.text key, scope = []
+        s = I18n.t(key, scope: scope, default: '')
+        s.blank? ? default(key) : s
+      end
+      private_class_method :default, :text
+    end
+  end
+end

data/lib/rescue/controllers/parameter.rb

@@ -0,0 +1,17 @@
+# coding: UTF-8
+module Rescue
+  module Controller
+    class Parameter
+
+      def self.define object
+        id = Rescue.config.primary_key
+        object.send(:define_method, :find_params) do
+          params.require(id)
+          params.permit(id)
+        end
+        object.send(:private, :find_params)
+      end
+
+    end
+  end
+end

data/lib/rescue/version.rb

@@ -1,3 +1,3 @@
 module Rescue
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/rescue-dog.rb

@@ -2,6 +2,9 @@ require 'rescue/config.rb'
 require 'rescue/controller.rb'
 require "rescue/controllers/static.rb"
 require "rescue/controllers/dynamic.rb"
+require "rescue/controllers/action.rb"
+require "rescue/controllers/parameter.rb"
+require "rescue/controllers/flash.rb"
 require 'rescue/exceptions/application_error.rb'
 require 'rescue/exceptions/respond_error.rb'
 

data/rescue-dog.gemspec

@@ -11,11 +11,12 @@ Gem::Specification.new do |gem|
   gem.description   = %q{respond to an exception raised in Rails}
   gem.summary       = %q{define respond methods}
   gem.homepage      = "https://github.com/yulii/rescue-dog"
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'rails', '>= 3.2.11'
+  gem.add_dependency 'rails', '>= 4.0.0'
 end

data/spec/{rails_spec_app.rb → fake_rails.rb}

@@ -38,8 +38,8 @@ app.initialize!
 # routing
 app.routes.draw do
   STATUSES.each do |name, code|
-    get "/static/#{name}"  =>"static##{name}"  ,as: name
-    get "/dynamic/#{name}" =>"dynamic##{name}" ,as: name
+    get "/static/#{name}"  =>"static##{name}"  ,as: "static_#{name}"
+    get "/dynamic/#{name}" =>"dynamic##{name}" ,as: "dynamic_#{name}"
   end
 
   Rescue::ApplicationError::STATUS_CODES.each do |code, e|
@@ -91,4 +91,7 @@ class StatusController < ApplicationController
   end
 end
 
+# models
+class RescueModel ; end
+
 Object.const_set(:ApplicationHelper,Module.new)

data/spec/rescue/controller_spec.rb

@@ -3,16 +3,74 @@ require 'spec_helper'
 
 describe Rescue::Controller do
 
-  let(:object) do
-    clazz = Class.new ApplicationController do
-      include Rescue::Controller::ClassMethods
+  describe Rescue::Controller::ClassMethods do
+    let(:object) do
+      Class.new ApplicationController do
+        extend Rescue::Controller::ClassMethods
+      end
+    end
+
+    [:rescue_associate, :rescue_controller, :define_action_method].each do |name|
+      it "should be able to call method `#{name}`" do
+        expect(object.public_methods.include? name).to be_true
+      end
     end
-    clazz.new
   end
 
-  describe "include ClassMethods module" do
-    it "expects to be call `rescue_associate` method" do
-      expect(object.methods.include? :rescue_associate).to be_true
+  describe "Rescue::Controller#rescue_controller" do
+    let(:object) do
+      Class.new ApplicationController do
+        extend Rescue::Controller::ClassMethods
+        rescue_controller RescueModel, :show, :new, :edit, { create: {}, update: {}, delete: {} }
+      end
+    end
+
+    it "should be defined private method `find_params`" do
+      expect(object.private_instance_methods.include? :find_params).to be_true
+    end
+
+    [:find_call, :new_call, :create_call, :update_call, :delete_call].each do |name|
+      it "should be defined private method `#{name}`" do
+        expect(object.private_instance_methods.include? name).to be_true
+      end
+    end
+
+    [:new, :edit, :show, :create, :update, :delete].each do |name|
+      it "should be defined public method `#{name}`" do
+        expect(object.public_instance_methods.include? name).to be_true
+      end
+    end
+
+    TestCase::Controller::RESCUE_OPTIONS.each do |args|
+      context "when `rescue_controller` is called #{args}" do
+        options = args.extract_options!
+        methods = args + options.keys
+
+        let(:object) do
+          Class.new ApplicationController do
+            extend Rescue::Controller::ClassMethods
+            rescue_controller RescueModel, *args.dup, options.dup
+          end
+        end
+
+        [:find_call, :new_call, :create_call, :update_call, :delete_call].each do |name|
+          it "should be defined private method `#{name}`" do
+            expect(object.private_instance_methods.include? name).to be_true
+          end
+        end
+
+        [:index, :new, :edit, :show, :create, :update, :delete].each do |name|
+          if methods.include? name
+            it "should be defined public method `#{name}`" do
+              expect(object.public_instance_methods.include? name).to be_true
+            end
+          else
+            it "should not be defined method `#{name}`" do
+              expect(object.instance_methods.include? name).to be_false
+            end
+          end
+        end
+      end
     end
   end
 

data/spec/rescue/controllers/flash_spec.rb

@@ -0,0 +1,30 @@
+# coding: UTF-8
+require 'spec_helper'
+
+describe Rescue::Controller::Flash do
+
+  before(:all) do
+    TestCase::Controller::FLASHS.each do |name|
+      Object.const_set name, Class.new {}
+    end
+
+    Rescue.const_set :DogController, Class.new {}
+  end
+
+  describe "Rescue::Controller::Flash#message" do
+    TestCase::Controller::FLASHS.each do |name|
+      [:success, :error].each do |status|
+        it do
+          expect(Rescue::Controller::Flash.message(Object.const_get(name).new, :action, status)).to eq("#{name.to_s.underscore} #{status}")
+        end
+      end
+    end
+
+    [:success, :error].each do |status|
+      it do
+        expect(Rescue::Controller::Flash.message(Rescue::DogController.new, :action, status)).to eq(status.to_s)
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rescue-dog'
 require 'coveralls'
 
-require File.join(File.dirname(__FILE__), 'rails_spec_app')
+require File.join(File.dirname(__FILE__), 'fake_rails')
 require File.join(File.dirname(__FILE__), 'test_case')
 require 'capybara/rails'
 

data/spec/test_case.rb

@@ -3,6 +3,16 @@ class TestCase
   class Controller
     ERRORS = { BadRequest: 400, Unauthorized: 401, NotFound: 404, ServerError: 500 }
     FORMATS = [Mime::Type.new("text/html", :html), Mime::Type.new("application/json", :json)]
+
+    RESCUE_OPTIONS = [
+      [],
+      [:show],
+      [:new, :show, :create],
+      [:new, :show, :edit, :create, :update],
+      [:new, :show, :edit, { create: {}, update: {}, delete: {} }],
+    ]
+
+    FLASHS = [:DefaultController, :RescueController, :RescueDogController]
   end 
 
 end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rescue-dog
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - yulii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 4.0.0
 description: respond to an exception raised in Rails
 email:
 - yuliinfo@gmail.com
@@ -46,11 +43,15 @@ files:
 - app/views/errors/404.html.erb
 - app/views/errors/500.html.erb
 - app/views/layouts/application.html.erb
-- deploy_gem.sh
+- build_gem.sh
+- config/locales/rescue.yml
 - lib/rescue-dog.rb
 - lib/rescue/config.rb
 - lib/rescue/controller.rb
+- lib/rescue/controllers/action.rb
 - lib/rescue/controllers/dynamic.rb
+- lib/rescue/controllers/flash.rb
+- lib/rescue/controllers/parameter.rb
 - lib/rescue/controllers/static.rb
 - lib/rescue/exceptions/application_error.rb
 - lib/rescue/exceptions/respond_error.rb
@@ -64,42 +65,44 @@ files:
 - public/500.html
 - public/500.json
 - rescue-dog.gemspec
-- spec/rails_spec_app.rb
+- spec/fake_rails.rb
 - spec/rescue/controller_spec.rb
 - spec/rescue/controllers/dynamic_spec.rb
+- spec/rescue/controllers/flash_spec.rb
 - spec/rescue/controllers/static_spec.rb
 - spec/rescue/exceptions/respond_error_spec.rb
 - spec/rescue_spec.rb
 - spec/spec_helper.rb
 - spec/test_case.rb
 homepage: https://github.com/yulii/rescue-dog
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: define respond methods
 test_files:
-- spec/rails_spec_app.rb
+- spec/fake_rails.rb
 - spec/rescue/controller_spec.rb
 - spec/rescue/controllers/dynamic_spec.rb
+- spec/rescue/controllers/flash_spec.rb
 - spec/rescue/controllers/static_spec.rb
 - spec/rescue/exceptions/respond_error_spec.rb
 - spec/rescue_spec.rb

data/deploy_gem.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-LIB_NAME="rescue-dog"
-if [ $# -ne 1 ]
-then
-	echo "invalid VERSION"
-	exit 1
-fi
-GEMSPEC="${LIB_NAME}.gemspec"
-PKG_FILE="${LIB_NAME}-$1.gem"
-
-echo "[RUN] gem install"
-bundle install
-echo "[RUN] rake"
-bundle exec rake
-
-if [ $? -eq 1 ]
-then
-	exit 1
-fi
-echo "[RUN] gem build ${GEMSPEC}"
-gem build ${GEMSPEC}
-if [ $? -eq 1 ]
-then
-	exit 1
-fi
-
-echo "[RUN] mv ${PKG_FILE} pkg/"
-mv ${PKG_FILE} ./pkg
-echo "[RUN] gem push pkg/${PKG_FILE}"
-gem push pkg/${PKG_FILE}
-
-echo "[RUN] git tag -a version-$1"
-git tag -a version-$1 -m ""
-git push --tags