better_frame 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca2a5a2b680fd7fc7cc8f20b80f448eb3ddc73a
-  data.tar.gz: 9f1d0b763260b8fe87a81bf2480a811bd79e34dc
+  metadata.gz: a284a29f6540f0ab795406fb8f7ed4a04e7ac405
+  data.tar.gz: 2152deb3b71b6c033c5b8429bc1fdf5be30a1700
 SHA512:
-  metadata.gz: ebbf6c3a0b10c197041142822f81098d8f824600f1b4d69740640f271ca0a2cc73aa7e0ebc82cdadb049b9a25798b46d49f87419f02ece303d37116408730244
-  data.tar.gz: b7e8ff458b56c66c986fd5a17413d15b5e5358c80ec2660f866497fa1942df28c8c65816a337978674e01669f240b0a49dea70914a4b9b8e8fe5ae876acc6be1
+  metadata.gz: 3fa3be6000eacae23242d67fdff36df095ade930a94f0fc91cf689f4eb8e80303c121756b9c353f972f06934255e779656318412ce173d619f03cd6e18d80e04
+  data.tar.gz: fea9054d3c45b76fa319b2c6eba22e8da8c318b9e60c2314966f3b3f861b71e524ff43b4748aac6f0fbfc0c3ecf1caeb63bcc8f234909782b0a62052c47536ad

data/README.md

@@ -28,8 +28,6 @@ And then execute:
 
 **NOTE: you need to make all your forms `remote: true` as this should not
   redirect to the rails app if you're submitting a form.
-  You also need to link your routes always with the url helper.
-  (`products_path` -> `products_url`)**
 
 To start, you need to mount the engine in your rails routes:
 

data/app/assets/javascripts/better_frame/better_frame.js

@@ -20,7 +20,13 @@
 
   function handleLinks(event) {
     event.preventDefault();
-    fill(event.currentTarget.href).then(storeURLInHistory);
+    url_or_path = event.currentTarget.getAttribute("href");
+    var expression = /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/;
+    var url_regex = new RegExp(expression);
+    if (!url_or_path.match(url_regex)) {
+      url_or_path = railsURL + url_or_path;
+    }
+    fill(url_or_path).then(storeURLInHistory);
   }
 
   $(document).on("click", "#app-content a:not([target=\"_blank\"])", handleLinks);

data/app/assets/javascripts/better_frame/jquery-ujs.js

@@ -1,6 +1,9 @@
 (function($, undefined) {
 
 /**
+ * PATCHED VERSION FOR BETTER_FRAME!!!
+ *
+ *
  * Unobtrusive scripting adapter for jQuery
  * https://github.com/rails/jquery-ujs
  *
@@ -114,7 +117,15 @@
 
         if (element.is('form')) {
           method = element.data('ujs:submit-button-formmethod') || element.attr('method');
-          url = element.data('ujs:submit-button-formaction') || element.attr('action');
+          url_or_path = element.data('ujs:submit-button-formaction') || element.attr('action');
+          var expression = /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/;
+          var url_regex = new RegExp(expression);
+          var railsURL = $("#app-content").data("railsurl");
+          if (!url_or_path.match(url_regex) && railsURL !== undefined) {
+            url = railsURL + url_or_path;
+          } else {
+            url = url_or_path;
+          }
           data = $(element[0]).serializeArray();
           // memoized value from clicked submit button
           var button = element.data('ujs:submit-button');

data/lib/better_frame/better_frameable.rb

@@ -9,6 +9,7 @@ module BetterFrameable
   private
   def set_headers
     headers['Access-Control-Allow-Origin'] = ENV.fetch("BETTER_FRAME_ORIGIN", "*")
+    headers['Access-Control-Allow-Credentials'] = ENV.fetch("BETTER_FRAME_CREDENTIALS", "false")
     headers['Access-Control-Allow-Methods'] = 'POST, GET, PUT, DELETE, OPTIONS'
     headers['Access-Control-Allow-Headers'] = 'Origin, Content-Type, Accept, Authorization, Token'
     headers['Access-Control-Max-Age'] = "1728000"

data/lib/better_frame/version.rb

@@ -1,3 +1,3 @@
 module BetterFrame
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/test/dummy/app/controllers/foreign_website_controller.rb

@@ -1,8 +1,7 @@
 class ForeignWebsiteController < ApplicationController
   def show
-    @current_url = "#{request.protocol}#{request.host_with_port}"
-    @rails_url = @current_url
+    @rails_url = "http://lvh.me:#{request.port}"
+    @include_url = @rails_url + "/better_frame"
     @base_url = request.original_url
-    @include_url = @current_url + "/better_frame"
   end
 end

data/test/dummy/app/views/products/index.html.erb

@@ -26,4 +26,4 @@
 
 <br>
 
-<%= link_to 'New Product', new_product_url %>
+<%= link_to 'New Product', new_product_path %>

data/test/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+ENV["BETTER_FRAME_ORIGIN"] = "http://localhost:3000"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.