charcoal 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e8998af772ef41fcf01ce20bdfba50310f77cae
-  data.tar.gz: 25019fe15c3c29209b2f084ac052788817a58077
+  metadata.gz: b7622da23541be07303b649835824b230e39533a
+  data.tar.gz: d483edf4d2f4a76e590cdd7c5e0fb71dd3b809fa
 SHA512:
-  metadata.gz: 2d8541b0db4bb762e5bc81c3429a472e2fc2462f9e7eea023246286921213b3bad94fe9f7a8d1a2b85ad22d8a2f7a7e36375cc83fca0b835aa195ce2a72051b9
-  data.tar.gz: ab75aa0690fd0ee5155c291261a8c2609803b52978b75f254d7664df8fe4db2ceabdb77b9bd68695059a84dbd44a73f61ed009b7662d090c47f3e5ed8e8df5f9
+  metadata.gz: 12e4efbd993a3ca883123a61266d9e726a3516f48451dc589177f3a3b41dcbd54eb5230cdb9424043f0f48660c0a2e4179b29dd352472fbc90c373f4af1bc279
+  data.tar.gz: b136b61fad42a87a3b391529eadf38b328a2f54adc1df2a1386f39f9a07d323a75dbc6459914fdf987eaa2c389ab9ec4c6e5177fcddfc57bd9cd3a4a7ee4a583

data/lib/charcoal/cross_origin_controller.rb

@@ -50,24 +50,20 @@ class Charcoal::CrossOriginController < ActionController::Base
   end
 
   def find_route(path, env)
-    if ActiveSupport::VERSION::MAJOR >= 3
-      routes = [Rails.application.routes]
-
-      railties = Rails.application.railties
-      railties = railties.respond_to?(:all) ? railties.all : railties._all
-      routes += railties.select {|tie| tie.is_a?(Rails::Engine)}.map(&:routes)
-
-      routes.each do |route_set|
-        begin
-          return route_set.recognize_path(path, env)
-        rescue ActionController::RoutingError
-        end
-      end
+    routes = [Rails.application.routes]
+
+    railties = Rails.application.railties
+    railties = railties.respond_to?(:all) ? railties.all : railties._all
+    routes += railties.select {|tie| tie.is_a?(Rails::Engine)}.map(&:routes)
 
-      nil
-    else
-      ActionController::Routing::Routes.routes.find {|r| r.recognize(path, env)}.try(:requirements)
+    routes.each do |route_set|
+      begin
+        return route_set.recognize_path(path, env)
+      rescue ActionController::RoutingError
+      end
     end
+
+    nil
   rescue ActionController::RoutingError
     nil
   end

data/lib/charcoal/version.rb

@@ -1,3 +1,3 @@
 module Charcoal
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Steven Davidovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -46,27 +46,121 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helps you support JSONP and CORS in your Rails app
 email: sdavidovitz@zendesk.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
+extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
 - lib/charcoal.rb
 - lib/charcoal/controller_filter.rb
 - lib/charcoal/cross_origin.rb
 - lib/charcoal/cross_origin_controller.rb
 - lib/charcoal/jsonp.rb
 - lib/charcoal/version.rb
-homepage: https://github.com/steved555/charcoal
+homepage: https://github.com/steved/charcoal
 licenses:
 - MIT
 metadata: {}
@@ -86,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Cross-Origin helper for Rails

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2012 Steven Davidovitz
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,126 +0,0 @@
-# charcoal
-
-JSONP ("JSON with padding") and CORS (Cross-Origin Resource Sharing) filtration for Rails versions 2 and above.
-
-## Usage
-
-### JSONP
-
-Include the module `Charcoal::JSONP` in the controller you'd like to allow JSONP.
-You may then use `allow_jsonp` class method with the following options:
-
-```ruby
-# directive is a method (symbol) or block (taking one argument, the controller instance)
-allow_jsonp method [method2 ...], :if => directive, :unless => directive
-```
-
-`:all` is also a valid argument that applies to all methods. The default (with no arguments) is the same as `:all`.
-
-Requests that come in with a callback parameter (e.g. `http://test.com/users.json?callback=hello`)
-will have the response body wrapped in that callback and the content type changed to `application/javascript`
-
-### CORS
-
-Please familiarize yourself with the [documentation](https://developer.mozilla.org/En/HTTP_access_control) ([wikipedia](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing)) before proceeding.
-
-Include the module `Charcoal::CrossOrigin` in the controller you'd like to allow CORS.
-`allow_cors` accepts the same arguments as `allow_jsonp`
-
-Included is a CORS pre-flight controller that must be hooked up to the Rails router:
-
-Rails 2:
-```ruby
-map.connect "*path.:format", :conditions => { :method => :options }, :action => "preflight", :controller => "cross_origin", :namespace => "charcoal/"
-```
-
-Rails 3 / 4:
-```ruby
-match '*path.:format' => 'charcoal/cross_origin#preflight', :via => :options
-```
-
-#### Configuration
-
-The configuration options and defaults for CORS are as follows:
-
-```ruby
-# Access-Control-Allow-Origin
-Charcoal.configuration["allow-origin"] # => "*"
-# Can be set to a string
-Charcoal.configuration["allow-origin"] = "https://google.com"
-# Or a block
-Charcoal.configuration["allow-origin"] = lambda do |controller|
-  controller.request.host
-end
-
-# Access-Control-Allow-Headers
-"allow-headers" => ["X-Requested-With", "X-Prototype-Version"]
-
-# Sets Access-Control-Allow-Credentials
-"credentials" => true
-
-# Access-Control-Allow-Headers
-"expose-headers" => []
-
-# Access-Control-Max-Age
-"max-age" => 86400
-```
-
-### Creating Your Own Filter
-
-It's possible to create your own controller filter like so:
-
-```ruby
-require 'charcoal/controller_filter'
-
-module MyFilter
-  def self.included(klass)
-    klass.extend(ClassMethods)
-    klass.before_filter :quack, :if => :animals_allowed?
-  end
-
-  module ClassMethods
-    include Charcoal::ControllerFilter
-
-    def animals_allowed
-      @animals_allowed ||= Hash.new(lambda {|_| false})
-    end
-
-    allow :animals do |method, directive|
-      animals_allowed[method] = directive
-    end
-  end
-
-  def animals_allowed?
-    self.class.animals_allowed[params[:action]].call(self)
-  end
-
-  protected
-
-  def quack
-    Rails.logger.info("QUACK!")
-  end
-end
-```
-
-This example adds the `allow_animals` directive that logs "QUACK!" if an applicable request is received.
-
-## Supported Versions
-
-Tested with Ruby 1.9.3, 2.0 and 2.1.1 and Rails 2.3, 3.2, 4.0 and 4.1.
-[![Build Status](https://secure.travis-ci.org/steved555/charcoal.png?branch=master)](http://travis-ci.org/steved555/charcoal)
-
-## Contributing to charcoal
-
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-## Copyright
-
-Copyright (c) 2012 Steven Davidovitz. See LICENSE for
-further details.
-