easymarklet 0.0.8 → 0.0.9

data/README.md

@@ -3,6 +3,10 @@ Easymarklet
 
 The easiest way to create bookmarklets for your rails app.
 
+[Visit "Foo vs Baz" for demos and explanations of several types of bookmarklets.](http://foo-vs-baz.herokuapp.com/)
+
+[Also, see the source code for "Foo vs Baz".](https://github.com/Octo-Labs/foo_vs_baz)
+
 Installation
 -------------------
 
@@ -14,15 +18,42 @@ Then run:
 
     bundle install
 
-
 Types of bookmarklets
 ----------------------------------
 
-Easymarklet supports two types of bookmarklets, simple bookmarklets and
-xdm bookmarklets.  Simple bookmarklets allow new functionality to be
-injected into a page, but they are restricted in the amount of
-communication that can go back to your app.  Xdm bookmarklets use
-[easyXDM](http://easyxdm.net/wp/) to allow cross domain communication.
+Easymarklet supports several types of bookmarklets. 
+
+* **Bare Bookmarklets** Bare bookmarklets are very simple and best
+suited for just redirecting the browser back to your app.  They
+generally don't have any UI.
+* **Simple Bookmarklets** Simple bookmarklets allow for a basic UI and
+easy stylesheet inclusion into the consumer page.  Communication back to
+your app is limited.
+* **XDM Bookmarklets** XDM Bookmarklets use
+[easyXDM](http://easyxdm.net/wp/) to allow cross domain communication
+between your bookmarklet and your app.  The UI is still fairly basic.
+* **Iframe Bookmarklets** Iframe  bookmarklets allow for cross domain
+communication and enchanced UI by displaying the UI is an iframe so that
+additional CSS and JS can be used safely.  Note : If the iframe is
+directed to a new page (such as by clicking on a link) the XDM
+communication channel will be lost.
+* **DLux Bookmarklets** DLux bookmarklets include a 'buffer' iframe that
+will keep the communication channel open but still allow your UI to
+navigate to a new page.  This is the easiest way to take advantage of
+existing page flows within a pop-over bookmarklet.
+
+
+## Examples
+[Foo vs Baz](http://foo-vs-baz.herokuapp.com/) is a collection of working demos with walk throughs.
+
+* [Bare Bookmarklets](http://foo-vs-baz.herokuapp.com/bare)
+* [Simple Bookmarklets](http://foo-vs-baz.herokuapp.com/simple)
+* [XDM Bookmarklets](http://foo-vs-baz.herokuapp.com/xdm)
+* [Iframe Bookmarklets](http://foo-vs-baz.herokuapp.com/iframe)
+* [DLux Bookmarklets](http://foo-vs-baz.herokuapp.com/dlux)
+
+
+
 
 Generating a new simple bookmarklet
 ---------------------------------
@@ -65,4 +96,9 @@ Then link to the consumer in a view:
 [See the XDM Bookmarklets wiki page for more info](https://github.com/Octo-Labs/easymarklet/wiki/XDM-Bookmarklets)
 
 
+Generating other bookmarklets
+---------------------------------
+
+See [Foo vs Baz](http://foo-vs-baz.herokuapp.com/) for more examples.
+
 This project rocks and uses MIT-LICENSE.

data/app/assets/javascripts/easymarklet/consumer.js.erb

@@ -15,7 +15,7 @@
     var easymarkletDiv = null;
 
     var consumer_url = encodeURIComponent(document.location);
-    var protocol = 'http://'
+    var protocol = (document.location.href.substring(0,8) === 'https://') ? 'https://' : 'http://'
     var host = '<%= Rails.application.config.action_controller.default_url_options[:host] %>';
     var port = '<%= Rails.application.config.action_controller.default_url_options[:port] %>';
     port = port === '' ? '' : ':' + port;

data/app/assets/javascripts/easymarklet/producer.js.erb

@@ -57,7 +57,7 @@
           //swf: "/assets/easyxdm.swf",
           onReady: function(){
             if(bookmarklet.producer.init){
-              bookmarklet.producer.init(easymarklet_consumer_url,_this.consumer);
+              bookmarklet.producer.init(null,_this.consumer);
             }
             var oldHeight = 0;
             setInterval(function(){

data/lib/easymarklet/version.rb

@@ -1,3 +1,3 @@
 module Easymarklet
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easymarklet
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 137451879451655284
+      hash: -4761417595461597
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 137451879451655284
+      hash: -4761417595461597
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24