easymarklet 0.0.2 → 0.0.3

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

@@ -8,6 +8,7 @@
     if(bookmarklet.producer == null){ alert('Your bookmarklet definition is missing a producer.'); return; }
 
     var _this = this;
+    _this.producer = null;
     //console.log('Easymarklet.Consumer : init');
     var bookmarklet = bookmarklet
     var s1, s2, isLoaded = false, xhr, head = document.getElementsByTagName('head')[0];
@@ -42,10 +43,13 @@
         var dest = full_host + bookmarklet.producer.path
         
         // here we put the main code, in this case we expose an ajax endpoint
-        xhr = new easyXDM.Rpc({
+        _this.producer = new easyXDM.Rpc({
           remote: dest,
           container: easymarkletDiv,
-            onReady: function(){
+          onReady: function(){
+            if(bookmarklet.consumer.init){
+              bookmarklet.consumer.init();
+            }
                 //xhr.post("example/glossary.php", {
                 //    param1: "a",
                 //    param2: "b"

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

@@ -9,7 +9,6 @@
 
     var _this = this;
     _this.consumer = null;
-    //console.log('Easymarklet.Producert : init');
 
     this.init = function(){
       _this.createRpcChannel();
@@ -22,8 +21,8 @@
       for (var key in bookmarklet.consumer.methods) {
         if (bookmarklet.consumer.methods.hasOwnProperty(key)) {
           //console.log(key);
-          rpcConfig.remote[key] = bookmarklet.consumer.methods[key];
-          _this[key]
+          rpcConfig.remote[key] = {}; //bookmarklet.consumer.methods[key];
+          //_this[key]
         }
       }
       rpcConfig.remote.closeFrame = {};
@@ -33,7 +32,7 @@
       for (var key in bookmarklet.producer.methods) {
         if (bookmarklet.producer.methods.hasOwnProperty(key)) {
           //console.log(key);
-          rpcConfig.local[key] = {}; //We just stub these since they're not called on this side
+          rpcConfig.local[key] = bookmarklet.producer.methods[key]; //We just stub these since they're not called on this side
         }
       }
 
@@ -41,12 +40,16 @@
     }
 
     this.createRpcChannel = function(){
+
       _this.consumer = new easyXDM.Rpc(
         /** The channel configuration*/
         {
-          local: "/assets/cors/index.html",
-          swf: "/assets/easyxdm.swf",
+          //local: "/assets/cors/index.html",
+          //swf: "/assets/easyxdm.swf",
           onReady: function(){
+            if(bookmarklet.producer.init){
+              bookmarklet.producer.init();
+            }
             //console.log("calling the remote test....");
             //Cicero.EasymarkletFrame.remote.alertMessage("just a test...");
           }

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

@@ -0,0 +1,52 @@
+(function(){
+
+  var Easymarklet = window.Easymarklet || {}
+
+  Easymarklet.Simple = function(bookmarklet){
+    if(bookmarklet == null){ alert('You must pass some bookmarklet to Easymarklet.Simple.'); return;}
+    if(bookmarklet.init == null){ alert('Your bookmarklet is missing an init function.'); return; }
+    //if(bookmarklet.consumer == null){ alert('Your bookmarklet definition is missing a consumer.'); return; }
+    //if(bookmarklet.producer == null){ alert('Your bookmarklet definition is missing a producer.'); return; }
+
+    var _this = this;
+    var bookmarklet = bookmarklet
+    var head = document.getElementsByTagName('head')[0];
+
+    var consumer_url = encodeURIComponent(document.location);
+    var protocol = '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;
+    var full_host = protocol + host + port;
+
+    this.loadCss = function(){
+      //Load the css   
+      bookmarklet.css = [].concat(bookmarklet.css)
+      for(var i = 0; i<bookmarklet.css.length; i++){
+        var src = bookmarklet.css[i]
+        var css = document.createElement('LINK');
+        css.href = full_host + src;
+        css.type = 'text/css';
+        css.media = 'screen';
+        css.rel = 'stylesheet';
+        head.appendChild(css); 
+      }
+    }
+
+    this.init = function(){
+      this.loadCss();
+      if(bookmarklet.init){
+        bookmarklet.init();
+      }
+    }
+
+  } // Easymarklet.Simple = function(){
+
+
+  // Now expose the Easymarklet to the global object
+  window.Easymarklet = Easymarklet;
+
+
+})();
+
+

data/lib/easymarklet/version.rb

@@ -1,3 +1,3 @@
 module Easymarklet
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/generators/easymarklet/bare/USAGE

@@ -0,0 +1,12 @@
+Description:
+    Generate a simple (non-xdm) bookmarklet.
+
+Example:
+    rails generate easymarklet:simple foobaz
+
+    This will create:
+        app/assets/javascripts/foobaz_bookmarklet.js
+
+    Then you could link to it with:
+        <%= link_to "FooBaz Simple", easymarklet_js('foobaz_bookmarklet.js') %>
+

data/lib/generators/easymarklet/bare/bare_generator.rb

@@ -0,0 +1,19 @@
+module Easymarklet
+  class BareGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+    
+    def copy_js_file
+      template "bare_bookmarklet.js", "app/assets/javascripts/#{file_name}_bookmarklet.js"
+    end
+
+    def display_msg
+      puts ""
+      puts "You can link to your new bookmarklet with this :"
+      puts ""
+      puts "<%= link_to '#{file_name.titleize}', easymarklet_js('#{file_name}_bookmarklet.js') %>"
+      puts ""
+    end
+
+  end
+end
+

data/lib/generators/easymarklet/bare/templates/bare_bookmarklet.js

@@ -0,0 +1,7 @@
+(function(){
+
+  // Your simple bookmarklet code goes here.
+  // For instance
+  alert('You just clicked the <%= name %> bookmarklet.');
+
+})();

data/lib/generators/easymarklet/iframe/USAGE

@@ -0,0 +1,15 @@
+Description:
+    Generate a new xdm bookmarklet.
+
+Example:
+    rails generate easymarklet:xdm foobaz
+
+    This will create:
+        app/assets/javascripts/foobaz_bookmarklet.js
+        app/assets/javascripts/foobaz_consumer.js
+        app/assets/javascripts/foobaz_producer.js
+
+
+    Then you could link to it with:
+        <%= link_to "FooBaz XDM", easymarklet_js('foobaz_consumer.js') %>
+

data/lib/generators/easymarklet/iframe/iframe_generator.rb

@@ -0,0 +1,27 @@
+module Easymarklet
+  class IframeGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+
+    def copy_files
+      template "iframe_bookmarklet.js", "app/assets/javascripts/#{file_name}_bookmarklet.js"
+      template "iframe_consumer.js", "app/assets/javascripts/#{file_name}_consumer.js"
+      template "iframe_producer.js", "app/assets/javascripts/#{file_name}_producer.js"
+      template "iframe_producer_controller.rb", "app/controllers/#{file_name}_producer_controller.rb"
+      template "iframe_producer_index.html.erb", "app/views/#{file_name}_producer/index.html.erb"
+      template "views/easymarklet_layout.html.erb", "app/views/layouts/#{file_name}_producer.html.erb"
+    end
+
+    def create_routes
+      route("match '#{file_name}_producer' => '#{file_name}_producer#index'")
+    end
+
+    def display_msg
+      puts ""
+      puts "You can link to your new bookmarklet with this :"
+      puts ""
+      puts "<%= link_to '#{file_name.titleize}', easymarklet_js('#{file_name}_consumer.js') %>"
+      puts ""
+    end
+
+  end
+end

data/lib/generators/easymarklet/iframe/templates/iframe_bookmarklet.js

@@ -0,0 +1,23 @@
+(function(){
+  
+  var <%= name.camelize %>Bookmarklet = {
+
+    visible : true,
+    consumer : {
+      css : [], // could be an array or a string
+      methods : { // The methods that the producer can call
+      
+      }
+    },
+    producer : {
+      path : "/<%= name %>_producer", // The path on your app that provides your data service
+      methods : { // The methods that the consumer can call
+      
+      }
+    }
+  }
+  
+  window.<%= name.camelize %>Bookmarklet = <%= name.camelize %>Bookmarklet;
+
+})();
+

data/lib/generators/easymarklet/iframe/templates/iframe_consumer.js

@@ -0,0 +1,5 @@
+//= require easymarklet/consumer
+//= require <%= name %>_bookmarklet
+//
+var <%= name %>_consumer = new Easymarklet.Consumer(<%= name.camelize %>Bookmarklet);
+<%= name %>_consumer.init();

data/lib/generators/easymarklet/iframe/templates/iframe_producer.js

@@ -0,0 +1,6 @@
+//= require easyXDM
+//= require easymarklet/producer
+//= require <%= name %>_bookmarklet
+
+var <%= name %>_producer = new Easymarklet.Producer(<%= name.camelize %>Bookmarklet);
+<%= name %>_producer.init();

data/lib/generators/easymarklet/iframe/templates/iframe_producer_controller.rb

@@ -0,0 +1,8 @@
+class <%= name.camelize %>ProducerController < ApplicationController
+
+  layout '<%= name %>_producer'
+
+  def index
+  end
+
+end

data/lib/generators/easymarklet/iframe/templates/iframe_producer_index.html.erb

@@ -0,0 +1,3 @@
+This is the <%= name %> producer.
+
+<%%= link_to_function "Close", "<%= name %>_producer.closeFrame()" %>

data/lib/generators/easymarklet/iframe/templates/views/easymarklet_layout.html.erb

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title><%= name.titleize %> Producer</title>
+  <%%= stylesheet_link_tag    "application", :media => "all" %>
+  <%%= javascript_include_tag "application" %>
+  <%%= csrf_meta_tags %>
+</head>
+<body>
+
+<%%= yield %>
+
+<%%= javascript_include_tag "<%= name %>_producer" %>
+
+</body>
+</html>

data/lib/generators/easymarklet/simple/simple_generator.rb

@@ -3,7 +3,8 @@ module Easymarklet
     source_root File.expand_path('../templates', __FILE__)
     
     def copy_js_file
-      copy_file "simple_bookmarklet.js", "app/assets/javascripts/#{file_name}_bookmarklet.js"
+      template "simple_bookmarklet.js", "app/assets/javascripts/#{file_name}_bookmarklet.js"
+      template "simple_bookmarklet.css", "app/assets/stylesheets/#{file_name}_bookmarklet.css"
     end
 
     def display_msg

data/lib/generators/easymarklet/simple/templates/simple_bookmarklet.css

@@ -0,0 +1,12 @@
+#<%= name %>_insert{
+  position:absolute;
+  top:10px;
+  left:10px;
+  background:black;
+  border:3px double white;
+  color:white;
+  padding:10px;
+  -webkit-box-shadow: 7px 7px 5px rgba(50, 50, 50, 0.75);
+  -moz-box-shadow:    7px 7px 5px rgba(50, 50, 50, 0.75);
+  box-shadow:         7px 7px 5px rgba(50, 50, 50, 0.75);
+}

data/lib/generators/easymarklet/simple/templates/simple_bookmarklet.js

@@ -1,6 +1,24 @@
+//= require easymarklet/simple
+
 (function(){
+  
+  var <%= name.camelize %>Bookmarklet = {
+    css : ['/assets/<%= name %>_bookmarklet.css'], // could be an array or a single string
+    init : function(){
+      var div = document.createElement('div')
+      div.id = '<%= name %>_insert'
+      div.appendChild(document.createTextNode('<%= name.camelize %> Insert'))
+      div.onclick = function(){
+        document.body.removeChild(div);
+      }
+      document.body.appendChild(div);
+    }
+  }
+  
+  window.<%= name.camelize %>Bookmarklet = <%= name.camelize %>Bookmarklet;
 
-  // Your simple bookmarklet code goes here.
+})();
 
+var <%= name %>_simple = new Easymarklet.Simple(<%= name.camelize %>Bookmarklet);
+<%= name %>_simple.init();
 
-})();

data/lib/generators/easymarklet/xdm/templates/xdm_bookmarklet.js

@@ -2,7 +2,7 @@
   
   var <%= name.camelize %>Bookmarklet = {
 
-    visible : true,
+    visible : false,
     consumer : {
       css : [], // could be an array or a string
       methods : { // The methods that the producer can call

data/lib/generators/easymarklet/xdm/xdm_generator.rb

@@ -12,14 +12,14 @@ module Easymarklet
     end
 
     def create_routes
-      route("match '#{file_name}' => '#{file_name}_producer#index'")
+      route("match '#{file_name}_producer' => '#{file_name}_producer#index'")
     end
 
     def display_msg
       puts ""
       puts "You can link to your new bookmarklet with this :"
       puts ""
-      puts "<%= link_to '#{file_name.titleize}', bookmarklet_js('#{file_name}_consumer.js') %>"
+      puts "<%= link_to '#{file_name.titleize}', easymarklet_js('#{file_name}_consumer.js') %>"
       puts ""
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easymarklet
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,13 +164,26 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/easymarklet/consumer.js.erb
 - app/assets/javascripts/easymarklet/producer.js.erb
+- app/assets/javascripts/easymarklet/simple.js.erb
 - app/helpers/easymarklet/link_helper.rb
 - config/initializers/jasminerice.rb
 - config/routes.rb
 - lib/easymarklet/engine.rb
 - lib/easymarklet/version.rb
 - lib/easymarklet.rb
+- lib/generators/easymarklet/bare/bare_generator.rb
+- lib/generators/easymarklet/bare/templates/bare_bookmarklet.js
+- lib/generators/easymarklet/bare/USAGE
+- lib/generators/easymarklet/iframe/iframe_generator.rb
+- lib/generators/easymarklet/iframe/templates/iframe_bookmarklet.js
+- lib/generators/easymarklet/iframe/templates/iframe_consumer.js
+- lib/generators/easymarklet/iframe/templates/iframe_producer.js
+- lib/generators/easymarklet/iframe/templates/iframe_producer_controller.rb
+- lib/generators/easymarklet/iframe/templates/iframe_producer_index.html.erb
+- lib/generators/easymarklet/iframe/templates/views/easymarklet_layout.html.erb
+- lib/generators/easymarklet/iframe/USAGE
 - lib/generators/easymarklet/simple/simple_generator.rb
+- lib/generators/easymarklet/simple/templates/simple_bookmarklet.css
 - lib/generators/easymarklet/simple/templates/simple_bookmarklet.js
 - lib/generators/easymarklet/simple/USAGE
 - lib/generators/easymarklet/xdm/templates/views/easymarklet_layout.html.erb
@@ -199,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1957519611268656497
+      hash: -4191531238921313582
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1957519611268656497
+      hash: -4191531238921313582
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24