charcoal 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. data/charcoal.gemspec +1 -1
  2. data/gemfiles/rails_2.3.gemfile +1 -1
  3. data/gemfiles/rails_2.3.gemfile.lock +1 -1
  4. data/gemfiles/rails_3.1.gemfile +1 -1
  5. data/gemfiles/rails_3.1.gemfile.lock +5 -5
  6. data/gemfiles/rails_3.2.gemfile +1 -1
  7. data/gemfiles/rails_3.2.gemfile.lock +5 -5
  8. data/lib/charcoal/controller_filter.rb +0 -2
  9. data/lib/charcoal/cors.rb +2 -2
  10. data/lib/charcoal/jsonp.rb +2 -2
  11. data/lib/charcoal/version.rb +1 -1
  12. data/test/cors_test.rb +1 -1
  13. metadata +2 -2
data/charcoal.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "charcoal"
8
- s.version = "0.1.1"
8
+ s.version = "0.1.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Steven Davidovitz"]
data/gemfiles/rails_2.3.gemfile CHANGED
@@ -11,6 +11,6 @@ gem "jeweler", "~> 1.8.4", :group=>:development
11
11
  gem "appraisal", ">= 0.5.0", :group=>:test
12
12
  gem "shoulda", ">= 0", :group=>:test
13
13
  gem "shoulda-context", ">= 0", :group=>:test
14
- gem "mocha", :require=>false, :group=>:test
14
+ gem "mocha", :group=>:test, :require=>false
15
15
  gem "rails", "~> 2.3.5"
16
16
 
data/gemfiles/rails_2.3.gemfile.lock CHANGED
@@ -38,7 +38,7 @@ GEM
38
38
  shoulda (3.0.1)
39
39
  shoulda-context (~> 1.0.0)
40
40
  shoulda-matchers (~> 1.0.0)
41
- shoulda-context (1.0.1)
41
+ shoulda-context (1.0.0)
42
42
  shoulda-matchers (1.0.0)
43
43
  yard (0.8.3)
44
44
 
data/gemfiles/rails_3.1.gemfile CHANGED
@@ -11,6 +11,6 @@ gem "jeweler", "~> 1.8.4", :group=>:development
11
11
  gem "appraisal", ">= 0.5.0", :group=>:test
12
12
  gem "shoulda", ">= 0", :group=>:test
13
13
  gem "shoulda-context", ">= 0", :group=>:test
14
- gem "mocha", :require=>false, :group=>:test
14
+ gem "mocha", :group=>:test, :require=>false
15
15
  gem "rails", "~> 3.1.0"
16
16
 
data/gemfiles/rails_3.1.gemfile.lock CHANGED
@@ -81,11 +81,11 @@ GEM
81
81
  rake (10.0.2)
82
82
  rdoc (3.12)
83
83
  json (~> 1.4)
84
- shoulda (3.3.2)
85
- shoulda-context (~> 1.0.1)
86
- shoulda-matchers (~> 1.4.1)
87
- shoulda-context (1.0.1)
88
- shoulda-matchers (1.4.1)
84
+ shoulda (3.1.1)
85
+ shoulda-context (~> 1.0)
86
+ shoulda-matchers (~> 1.2)
87
+ shoulda-context (1.0.0)
88
+ shoulda-matchers (1.3.0)
89
89
  activesupport (>= 3.0.0)
90
90
  sprockets (2.0.4)
91
91
  hike (~> 1.2)
data/gemfiles/rails_3.2.gemfile CHANGED
@@ -11,6 +11,6 @@ gem "jeweler", "~> 1.8.4", :group=>:development
11
11
  gem "appraisal", ">= 0.5.0", :group=>:test
12
12
  gem "shoulda", ">= 0", :group=>:test
13
13
  gem "shoulda-context", ">= 0", :group=>:test
14
- gem "mocha", :require=>false, :group=>:test
14
+ gem "mocha", :group=>:test, :require=>false
15
15
  gem "rails", "~> 3.2.0"
16
16
 
data/gemfiles/rails_3.2.gemfile.lock CHANGED
@@ -79,11 +79,11 @@ GEM
79
79
  rake (10.0.2)
80
80
  rdoc (3.12)
81
81
  json (~> 1.4)
82
- shoulda (3.3.2)
83
- shoulda-context (~> 1.0.1)
84
- shoulda-matchers (~> 1.4.1)
85
- shoulda-context (1.0.1)
86
- shoulda-matchers (1.4.1)
82
+ shoulda (3.1.1)
83
+ shoulda-context (~> 1.0)
84
+ shoulda-matchers (~> 1.2)
85
+ shoulda-context (1.0.0)
86
+ shoulda-matchers (1.3.0)
87
87
  activesupport (>= 3.0.0)
88
88
  sprockets (2.1.3)
89
89
  hike (~> 1.2)
data/lib/charcoal/controller_filter.rb CHANGED
@@ -25,8 +25,6 @@ module Charcoal
25
25
  instance_exec(method, directive, &block)
26
26
  end
27
27
  end
28
-
29
- hide_action action if respond_to?(:hide_action)
30
28
  end
31
29
  end
32
30
 
data/lib/charcoal/cors.rb CHANGED
@@ -24,12 +24,12 @@ module Charcoal
24
24
  end
25
25
  end
26
26
 
27
+ protected
28
+
27
29
  def cors_allowed?
28
30
  self.class.cors_allowed?(self, params[:action])
29
31
  end
30
32
 
31
- protected
32
-
33
33
  def set_cors_headers
34
34
  headers["Access-Control-Allow-Origin"] = Charcoal.configuration["allow-origin"].to_s
35
35
  headers["Access-Control-Allow-Credentials"] = Charcoal.configuration["credentials"].to_s
data/lib/charcoal/jsonp.rb CHANGED
@@ -24,6 +24,8 @@ module Charcoal
24
24
  end
25
25
  end
26
26
 
27
+ protected
28
+
27
29
  def jsonp_allowed?
28
30
  self.class.jsonp_allowed?(self, params[:action])
29
31
  end
@@ -32,8 +34,6 @@ module Charcoal
32
34
  params[:callback].present? && jsonp_allowed?
33
35
  end
34
36
 
35
- protected
36
-
37
37
  def add_jsonp_callback
38
38
  yield
39
39
 
data/lib/charcoal/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Charcoal
2
- VERSION = "0.1.1"
2
+ VERSION = "0.1.2"
3
3
  end
data/test/cors_test.rb CHANGED
@@ -20,7 +20,7 @@ class TestCorsControllerTest < ActionController::TestCase
20
20
  end
21
21
 
22
22
  should "allow cors" do
23
- assert subject.cors_allowed?
23
+ assert subject.send(:cors_allowed?)
24
24
  end
25
25
  end
26
26
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: charcoal
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
155
155
  version: '0'
156
156
  segments:
157
157
  - 0
158
- hash: -2919837306301132765
158
+ hash: 1049804046287482941
159
159
  required_rubygems_version: !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements: