sir-trevor-rails 0.2.1 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sir-trevor-rails (0.0.1)
+    sir-trevor-rails (0.2.2)
       activesupport (>= 3.0.7)
       jquery-rails
       rails (>= 3.0.7)
@@ -11,88 +11,92 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
+    hike (1.2.2)
+    i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.0)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.4)
-    mail (2.4.4)
+    jquery-rails (2.2.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.7)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.6)
+    mime-types (1.23)
+    multi_json (1.7.2)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.0.1)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    thor (0.18.1)
+    tilt (1.3.7)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    twitter-text (1.5.0)
-      activesupport
-    tzinfo (0.3.33)
+    twitter-text (1.6.1)
+      unf (~> 0.0.5)
+    tzinfo (0.3.37)
+    unf (0.0.5)
+      unf_ext
+    unf_ext (0.0.6)
 
 PLATFORMS
   ruby

data/app/assets/javascript/sir-trevor/sir-trevor.js

@@ -1,5 +1,3 @@
-// Sir Trevor, v0.2.1
-
 (function ($, _){
   
   var root = this,
@@ -368,7 +366,6 @@
     }
   
   };
-  
   /* 
     SirTrevor.Submittable
     --
@@ -507,7 +504,6 @@
     });
     
   };
-  
   /*
     Underscore helpers
   */
@@ -529,7 +525,6 @@
   
   });
   
-  
   var Block = SirTrevor.Block = function(instance, data) {
     this.instance = instance;
     this.type = this._getBlockType();
@@ -1005,7 +1000,6 @@
   });
   
   Block.extend = extend; // Allow our Block to be extended.
-  
   var Format = SirTrevor.Formatter = function(options){
     this.formatId = _.uniqueId('format-');
     this._configure(options || {});
@@ -1415,7 +1409,6 @@
       this.handleTwitterDropPaste(url);
     }
   });
-  
   /*
     Unordered List
   */
@@ -1465,7 +1458,6 @@
     }
   
   });
-  
   var video_drop_template = '<p>Drop video link here</p><div class="input text"><label>or paste URL:</label><input type="text" class="paste-block"></div>';
   var video_regex = /http[s]?:\/\/(?:www.)?(?:(vimeo).com\/(.*))|(?:(youtu(?:be)?).(?:be|com)\/(?:watch\?v=)?([^&]*)(?:&(?:.))?)/;
   
@@ -1531,7 +1523,6 @@
       this.handleDropPaste(url);
     }
   });
-  
   /* Default Formatters */
   /* Our base formatters */
   
@@ -1693,7 +1684,7 @@
         return this.hide();
       }
       
-      var mouse_enter = (ev) ? ev.originalEvent.pageY - this.instance.$wrapper.offset().top : 0;
+      var mouse_enter = (ev) ? ev.originalEvent.pageY : 0;
     
       // Do we have any sedit blocks?
       if (this.instance.blocks.length > 0) {
@@ -1770,7 +1761,6 @@
   
   
   
-  
   /* FormatBar */
   /*
     Format Bar
@@ -1832,10 +1822,12 @@
       }
   
       if ((viewport_top > 5) && viewport_top >= instance_offset) {
-        this.$el.addClass('fixed');
+        this.$el.addClass('fixed')
+                .css({ 'width': this.instance.$wrapper.width() });
+  
         this.instance.$wrapper.css({ 'padding-top': '104px' });
       } else {
-        this.$el.removeClass('fixed');
+        this.$el.removeClass('fixed').css({ 'width': '100%' });
         this.instance.$wrapper.css({ 'padding-top': '16px' });
       }
     },
@@ -2312,7 +2304,6 @@
     }
   });
   
-  
 
   /* We need a form handler here to handle all the form submits */
   

data/app/views/sir-trevor/blocks/_gallery_block.html.erb

@@ -1,6 +1,6 @@
 <% # Remember, a gallery is just an array of images ;-) %>
 <div class="content-block gallery-block">
   <% block.each do |image| %>
-    <%= render(:partial => "sir-trevor/blocks/image_block", :locals => {:block => image['data'], :image_type => image_type, :protocol => request.protocol}, :formats => formats) if image.has_key?("data") && image['type'] == "image" %>
+    <%= render(:partial => "sir-trevor/blocks/image_block", :locals => {:block => image['data'], :image_type => image_type}, :formats => formats) if image.has_key?("data") && image['type'] == "image" %>
   <% end %>
-</div>
+</div>

data/app/views/sir-trevor/blocks/_tweet_block.html.erb

@@ -1,6 +1,6 @@
 <div class="content-block tweet-block">
-  <%= link_to image_tag("http://twitter.com/api/users/profile_image/#{ block['user']['screen_name'] }?size=bigger", :class => 'img'), "http://twitter.com/#{ block['user']['screen_name'] }" %>
+  <%= link_to image_tag("//twitter.com/api/users/profile_image/#{ block['user']['screen_name'] }?size=bigger", :class => 'img'), "http://twitter.com/#{ block['user']['screen_name'] }" %>
   <p><%= auto_link(block['text']).html_safe %></p>
   <cite>From <%= link_to "@#{ block['user']['screen_name'] }", "http://twitter.com/#{ block['user']['screen_name'] }" %> on Twitter:</cite>
   <time datetime="<%= block['created_at'] %>">(<%= link_to Time.parse(block['created_at']), "http://twitter.com/#{block['user']['screen_name']}/status/#{block['id_str']}" %>)</time>
-</div>
+</div>

data/app/views/sir-trevor/blocks/_video_block.html.erb

@@ -1,7 +1,7 @@
 <div class="content-block video-block">
 	<% if block['source'] == 'vimeo' %>
-	  <iframe src="<%= protocol %>player.vimeo.com/video/<%= block['remote_id'] %>?title=1&amp;byline=1&amp;portrait=1&amp;autoplay=0" width="600" height="400" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+	  <iframe src="//player.vimeo.com/video/<%= block['remote_id'] %>?title=1&amp;byline=1&amp;portrait=1&amp;autoplay=0" width="600" height="400" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
 	<% elsif block['source'] == 'youtube' %>
-	  <iframe width="600" height="400" src="<%= protocol %>www.youtube.com/embed/<%= block['remote_id'] %>" frameborder="0" allowfullscreen></iframe>
+	  <iframe width="600" height="400" src="//www.youtube.com/embed/<%= block['remote_id'] %>" frameborder="0" allowfullscreen></iframe>
 	<% end %>
-</div>
+</div>

data/lib/sir-trevor/helpers/view_helper.rb

@@ -5,18 +5,24 @@ module SirTrevor
       extend ActiveSupport::Concern
       include Twitter::Autolink
   
-      def render_sir_trevor(json, image_type = "large")
-        hash = JSON.parse(json)
-
-        if hash.has_key?("data")
-          hash["data"].map { |object|
-            render(:partial => "sir-trevor/blocks/#{object["type"].to_s.downcase}_block", :locals => { :block => object['data'], :image_type => image_type, :protocol => request.protocol} ) if object.has_key?("data")
+      def render_sir_trevor(json, image_type = 'large')
+        if hash = parse_sir_trevor(json)
+          hash.map { |object|
+            render_sir_trevor_block(object, image_type)
           }.compact.join.html_safe
         else
           ''
         end
       end
 
+      def render_sir_trevor_block(object, image_type = 'large')
+        view_name = "sir-trevor/blocks/#{object['type'].to_s.downcase}_block"
+
+        render(view_name,
+               :block => object['data'],
+               :image_type => image_type) if object.has_key?("data")
+      end
+
       def render_sir_trevor_image(json, image_type = "large")
         image = pluck_sir_trevor_type(json, "image")
     
@@ -54,6 +60,13 @@ module SirTrevor
         markdown.render(text).html_safe
       end
 
+      def parse_sir_trevor(json)
+        hash = JSON.parse(json)
+
+        return false unless hash.has_key?("data")
+        hash["data"]
+      end
+
       private
         # Get's the first instance of a type from the specified JSON
         def pluck_sir_trevor_type(json, type) 
@@ -75,4 +88,4 @@ class CustomMarkdownFormatter < Redcarpet::Render::HTML
   def codespan(code)
     code
   end
-end
+end

data/lib/sir-trevor/version.rb

@@ -1,3 +1,3 @@
 module SirTrevor
-  VERSION = "0.2.1"
-end
+  VERSION = "0.2.4"
+end

data/sir-trevor-rails.gemspec

@@ -1,7 +1,7 @@
 require File.expand_path("../lib/sir-trevor/version", __FILE__)
 
 Gem::Specification.new do |s|
-  
+
   s.name        = 'sir-trevor-rails'
   s.version     = SirTrevor::VERSION
   s.platform    = Gem::Platform::RUBY

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sir-trevor-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -170,5 +170,5 @@ rubyforge_project: sir-trevor-rails
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: sir-trevor-rails-0.2.1
+summary: sir-trevor-rails-0.2.4
 test_files: []