charcoal 0.1.1 → 0.1.2

data/charcoal.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "charcoal"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Davidovitz"]

data/gemfiles/rails_2.3.gemfile

@@ -11,6 +11,6 @@ gem "jeweler", "~> 1.8.4", :group=>:development
 gem "appraisal", ">= 0.5.0", :group=>:test
 gem "shoulda", ">= 0", :group=>:test
 gem "shoulda-context", ">= 0", :group=>:test
-gem "mocha", :require=>false, :group=>:test
+gem "mocha", :group=>:test, :require=>false
 gem "rails", "~> 2.3.5"
 

data/gemfiles/rails_2.3.gemfile.lock

@@ -38,7 +38,7 @@ GEM
     shoulda (3.0.1)
       shoulda-context (~> 1.0.0)
       shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.1)
+    shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
     yard (0.8.3)
 

data/gemfiles/rails_3.1.gemfile

@@ -11,6 +11,6 @@ gem "jeweler", "~> 1.8.4", :group=>:development
 gem "appraisal", ">= 0.5.0", :group=>:test
 gem "shoulda", ">= 0", :group=>:test
 gem "shoulda-context", ">= 0", :group=>:test
-gem "mocha", :require=>false, :group=>:test
+gem "mocha", :group=>:test, :require=>false
 gem "rails", "~> 3.1.0"
 

data/gemfiles/rails_3.1.gemfile.lock

@@ -81,11 +81,11 @@ GEM
     rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.1)
-    shoulda-matchers (1.4.1)
+    shoulda (3.1.1)
+      shoulda-context (~> 1.0)
+      shoulda-matchers (~> 1.2)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
     sprockets (2.0.4)
       hike (~> 1.2)

data/gemfiles/rails_3.2.gemfile

@@ -11,6 +11,6 @@ gem "jeweler", "~> 1.8.4", :group=>:development
 gem "appraisal", ">= 0.5.0", :group=>:test
 gem "shoulda", ">= 0", :group=>:test
 gem "shoulda-context", ">= 0", :group=>:test
-gem "mocha", :require=>false, :group=>:test
+gem "mocha", :group=>:test, :require=>false
 gem "rails", "~> 3.2.0"
 

data/gemfiles/rails_3.2.gemfile.lock

@@ -79,11 +79,11 @@ GEM
     rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.1)
-    shoulda-matchers (1.4.1)
+    shoulda (3.1.1)
+      shoulda-context (~> 1.0)
+      shoulda-matchers (~> 1.2)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
     sprockets (2.1.3)
       hike (~> 1.2)

data/lib/charcoal/controller_filter.rb

@@ -25,8 +25,6 @@ module Charcoal
             instance_exec(method, directive, &block)
           end
         end
-
-        hide_action action if respond_to?(:hide_action)
       end
     end
 

data/lib/charcoal/cors.rb

@@ -24,12 +24,12 @@ module Charcoal
       end
     end
 
+    protected
+
     def cors_allowed?
       self.class.cors_allowed?(self, params[:action])
     end
 
-    protected
-
     def set_cors_headers
       headers["Access-Control-Allow-Origin"] = Charcoal.configuration["allow-origin"].to_s
       headers["Access-Control-Allow-Credentials"] = Charcoal.configuration["credentials"].to_s

data/lib/charcoal/jsonp.rb

@@ -24,6 +24,8 @@ module Charcoal
       end
     end
 
+    protected
+
     def jsonp_allowed?
       self.class.jsonp_allowed?(self, params[:action])
     end
@@ -32,8 +34,6 @@ module Charcoal
       params[:callback].present? && jsonp_allowed?
     end
 
-    protected
-
     def add_jsonp_callback
       yield
 

data/lib/charcoal/version.rb

@@ -1,3 +1,3 @@
 module Charcoal
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/cors_test.rb

@@ -20,7 +20,7 @@ class TestCorsControllerTest < ActionController::TestCase
       end
 
       should "allow cors" do
-        assert subject.cors_allowed?
+        assert subject.send(:cors_allowed?)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2919837306301132765
+      hash: 1049804046287482941
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: