Merge branch 'cleanup_codes'

sunteya · Mar 20, 2014 · 2b90cf1 · 2b90cf1
2 parents 731a6ef + 987f118
commit 2b90cf1
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 161 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@
 /tmp/*
 /gem_graph.png
 /Gemfile.lock
+/gemfiles/*.lock
+/tags
 /spec/internal/db/*.sqlite
diff --git a/README.md b/README.md
@@ -1,5 +1,8 @@
 # Fume
 
+[![Build Status](https://travis-ci.org/sunteya/fume.svg?branch=master)](https://travis-ci.org/sunteya/fume)
+[![Coverage Status](https://coveralls.io/repos/sunteya/fume/badge.png)](https://coveralls.io/r/sunteya/fume)
+
 ## Installation
 
 Add this line to your application's Gemfile:

diff --git a/fume.gemspec b/fume.gemspec
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_development_dependency "rspec-rails", "~> 2.14.1"
+  spec.add_development_dependency "coveralls"
 
   spec.add_development_dependency "pry-nav"
   spec.add_development_dependency "sqlite3"

diff --git a/lib/fume/rails_ext.rb b/lib/fume/rails_ext.rb
@@ -25,19 +25,6 @@ module ControllerExtensions
       end
 
       module ClassMethods
-        def action_attr_accessor(*args)
-          options = args.extract_options!
-          [ args ].flatten.compact.each do |sym|
-            class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-              def self.#{sym}(obj)
-                before_filter { |c| c.send(:#{sym}=, obj) }
-              end
-              
-              attr_accessor :#{sym}
-              helper_method :#{sym}, :#{sym}=
-            EOS
-          end
-        end
       end
 
     protected

diff --git a/lib/fume/render_cache.rb b/lib/fume/render_cache.rb
@@ -74,7 +74,7 @@ def key_to_string(obj)
     end
 
     class RenderCacheFilter
-      def filter(controller)
+      def around(controller)
         controller.render_cache_params ||= {
           options: {},
           cache: nil

diff --git a/lib/generators/fume/simple_scaffold/USAGE b/lib/generators/fume/simple_scaffold/USAGE
diff --git a/lib/generators/fume/simple_scaffold/simple_scaffold_generator.rb b/lib/generators/fume/simple_scaffold/simple_scaffold_generator.rb
diff --git a/lib/generators/fume/simple_scaffold/templates/_form.html.erb b/lib/generators/fume/simple_scaffold/templates/_form.html.erb
diff --git a/lib/generators/fume/simple_scaffold/templates/controller.rb b/lib/generators/fume/simple_scaffold/templates/controller.rb
diff --git a/lib/generators/fume/simple_scaffold/templates/edit.html.erb b/lib/generators/fume/simple_scaffold/templates/edit.html.erb
diff --git a/lib/generators/fume/simple_scaffold/templates/index.html.erb b/lib/generators/fume/simple_scaffold/templates/index.html.erb
diff --git a/lib/generators/fume/simple_scaffold/templates/new.html.erb b/lib/generators/fume/simple_scaffold/templates/new.html.erb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -7,6 +7,9 @@
 require "fume"
 require "pry-nav"
 
+require 'coveralls'
+Coveralls.wear!
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true