Permalink
Browse files

no longer making render protected

  • Loading branch information...
1 parent 71b2166 commit ae0d8914c56bbb9239b82cfba408eff3d56b8b12 @adamhunter committed May 28, 2013
Showing with 88 additions and 71 deletions.
  1. +3 −1 .gitignore
  2. +4 −2 Gemfile
  3. +78 −63 Gemfile.lock
  4. +1 −3 lib/flash_render.rb
  5. +2 −2 lib/flash_render/version.rb
View
@@ -1,5 +1,7 @@
+.ruby-version
+.ruby-gemset
pkg/*
*.gem
test/dummy/db/*.sqlite3
test/dummy/log/*.log
-test/dummy/tmp/
+test/dummy/tmp/
View
@@ -1,4 +1,6 @@
-source :gemcutter
+source 'https://rubygems.org'
# Specify your gem's dependencies in flash_render.gemspec
-gemspec
+gemspec
+
+gem 'sqlite3'
View
@@ -1,81 +1,96 @@
PATH
remote: .
specs:
- flash_render (1.0.0)
+ flash_render (1.1.0)
rails (>= 2.3.8)
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.0.rc)
- actionpack (= 3.0.0.rc)
- mail (~> 2.2.5)
- actionpack (3.0.0.rc)
- activemodel (= 3.0.0.rc)
- activesupport (= 3.0.0.rc)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.4.1)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.9)
- rack-test (~> 0.5.4)
- tzinfo (~> 0.3.22)
- activemodel (3.0.0.rc)
- activesupport (= 3.0.0.rc)
- builder (~> 2.1.2)
- i18n (~> 0.4.1)
- activerecord (3.0.0.rc)
- activemodel (= 3.0.0.rc)
- activesupport (= 3.0.0.rc)
- arel (~> 0.4.0)
- tzinfo (~> 0.3.22)
- activeresource (3.0.0.rc)
- activemodel (= 3.0.0.rc)
- activesupport (= 3.0.0.rc)
- activesupport (3.0.0.rc)
- arel (0.4.0)
- activesupport (>= 3.0.0.beta)
- builder (2.1.2)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- i18n (0.4.1)
- mail (2.2.5)
- activesupport (>= 2.3.6)
- mime-types
- treetop (>= 1.4.5)
- mime-types (1.16)
- polyglot (0.3.1)
- rack (1.2.1)
- rack-mount (0.6.9)
- rack (>= 1.0.0)
- rack-test (0.5.4)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ journey (~> 1.0.4)
+ rack (~> 1.4.5)
+ rack-cache (~> 1.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
+ builder (~> 3.0.0)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ arel (~> 3.0.2)
+ tzinfo (~> 0.3.29)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
+ multi_json (~> 1.0)
+ arel (3.0.2)
+ builder (3.0.4)
+ erubis (2.7.0)
+ hike (1.2.2)
+ i18n (0.6.1)
+ journey (1.0.4)
+ json (1.8.0)
+ mail (2.5.4)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
+ mime-types (1.23)
+ multi_json (1.7.4)
+ polyglot (0.3.3)
+ rack (1.4.5)
+ rack-cache (1.2)
+ rack (>= 0.4)
+ rack-ssl (1.3.3)
+ rack
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.0.0.rc)
- actionmailer (= 3.0.0.rc)
- actionpack (= 3.0.0.rc)
- activerecord (= 3.0.0.rc)
- activeresource (= 3.0.0.rc)
- activesupport (= 3.0.0.rc)
- bundler (>= 1.0.0.rc.1)
- railties (= 3.0.0.rc)
- railties (3.0.0.rc)
- actionpack (= 3.0.0.rc)
- activesupport (= 3.0.0.rc)
- rake (>= 0.8.3)
- thor (~> 0.14.0)
- rake (0.8.7)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
+ bundler (~> 1.0)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (>= 0.14.6, < 2.0)
+ rake (10.0.4)
+ rdoc (3.12.2)
+ json (~> 1.4)
redgreen (1.2.2)
- thor (0.14.0)
- treetop (1.4.8)
+ sprockets (2.2.2)
+ hike (~> 1.2)
+ multi_json (~> 1.0)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.7)
+ thor (0.18.1)
+ tilt (1.4.1)
+ treetop (1.4.12)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.22)
+ tzinfo (0.3.37)
PLATFORMS
ruby
DEPENDENCIES
bundler (>= 1.0.0.rc.5)
flash_render!
- rails (>= 2.3.8)
redgreen
+ sqlite3
View
@@ -1,7 +1,5 @@
module FlashRender
- protected
-
def render(*args)
options = args.extract_options!
@@ -29,4 +27,4 @@ def render(*args)
require 'flash_render/railtie'
else
ActionController::Base.send :include, FlashRender
-end
+end
@@ -1,3 +1,3 @@
module FlashRender
- VERSION = "1.0.1"
-end
+ VERSION = "1.1.0"
+end

0 comments on commit ae0d891

Please sign in to comment.